phyusin
|
adefd8c034
|
remove conflict data
|
2018-02-27 14:35:21 +06:30 |
|
Yan
|
4d556cff43
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-27 11:44:11 +06:30 |
|
Yan
|
ac470c5747
|
license and local move to base action and update other base
|
2018-02-27 11:41:24 +06:30 |
|
phyusin
|
3e0943275f
|
check bacck btn
|
2018-02-27 11:35:26 +06:30 |
|
phyusin
|
fc3cd1e72d
|
check order item
|
2018-02-27 11:33:51 +06:30 |
|
phyusin
|
28a8b863aa
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-27 11:09:40 +06:30 |
|
phyusin
|
d8243afaab
|
check = split btn
|
2018-02-27 11:09:28 +06:30 |
|
phyusin
|
1e95105247
|
change product sale process
|
2018-02-27 10:34:30 +06:30 |
|
phyusin
|
700ff91127
|
product sale
|
2018-02-27 10:27:52 +06:30 |
|
phyusin
|
90b7a7f201
|
change stock check for dashboard query
|
2018-02-27 10:04:48 +06:30 |
|
phyusin
|
1b1206d735
|
add Old Town req:
|
2018-02-27 10:02:14 +06:30 |
|
phyusin
|
1110dc8d7b
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-27 09:42:44 +06:30 |
|
phyusin
|
3cb8484f72
|
conflict changes
|
2018-02-27 09:40:53 +06:30 |
|
phyusin
|
4696f65725
|
Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-26 18:47:17 +06:30 |
|
phyusin
|
a44c6c097c
|
conflict remove
|
2018-02-26 18:47:03 +06:30 |
|
San Wai Lwin
|
72b5701ec9
|
To add the condition for CloseCashierCustmisePdf
|
2018-02-26 18:29:58 +06:30 |
|
phyusin
|
760c204044
|
Merge branch 'r-1802001-01-c1' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-26 17:52:25 +06:30 |
|
San Wai Lwin
|
7d8442fd09
|
To add the condition for CloseCashierCustmisePdf
|
2018-02-26 17:49:19 +06:30 |
|
Yan
|
13b7b1f800
|
add action base and update base ctrls
|
2018-02-26 17:42:54 +06:30 |
|
Aung Myo
|
ce8581f892
|
fixed conflic when pull master item remark
|
2018-02-26 17:02:46 +06:30 |
|
Aung Myo
|
b38e98a22a
|
update edit with remark
|
2018-02-26 16:56:57 +06:30 |
|
phyusin
|
e43aaa915b
|
customize close cashier
|
2018-02-26 11:36:13 +06:30 |
|
phyusin
|
0f36e44d1c
|
check route in product sale
|
2018-02-26 11:33:51 +06:30 |
|
phyusin
|
5523ff6fc1
|
check product sale report
|
2018-02-26 11:24:47 +06:30 |
|
phyusin
|
a76d0ddbcd
|
change assigned order item id to order item id in Origami/Room
|
2018-02-26 10:09:33 +06:30 |
|
phyusin
|
da7dad05e4
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-26 10:01:49 +06:30 |
|
phyusin
|
8b064a4428
|
change assigned item id to order item id
|
2018-02-26 10:01:35 +06:30 |
|
Aung Myo
|
a0b34e8084
|
update scroll for order
|
2018-02-26 09:33:38 +06:30 |
|
phyusin
|
d287ab267d
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-26 09:21:46 +06:30 |
|
phyusin
|
7043eccb73
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-02-26 09:21:08 +06:30 |
|
phyusin
|
f559aa0f14
|
product sale query
|
2018-02-26 09:20:57 +06:30 |
|
Aung Myo
|
f4f5915532
|
update waiter view add order
|
2018-02-26 09:19:14 +06:30 |
|
Yan
|
07e208a457
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-02-23 15:49:55 +06:30 |
|
Yan
|
a6abfb2f49
|
update token mismatch
|
2018-02-23 15:49:29 +06:30 |
|
phyusin
|
3bb6649d39
|
add edit for rooms and check inventory link
|
2018-02-23 15:45:59 +06:30 |
|
phyusin
|
f73f7cd965
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-23 15:29:36 +06:30 |
|
phyusin
|
2dda29c5cc
|
add shop detail info in inventory
|
2018-02-23 15:29:22 +06:30 |
|
phyusin
|
970a9bb430
|
sale
|
2018-02-23 15:26:24 +06:30 |
|
Aung Myo
|
ac47501e01
|
update conflic for pull master
|
2018-02-23 14:58:35 +06:30 |
|
Aung Myo
|
77a66d726b
|
update foc and void overall add remark
|
2018-02-23 14:53:08 +06:30 |
|
Yan
|
25a212bb70
|
update base controllers
|
2018-02-23 14:45:53 +06:30 |
|
phyusin
|
970814be94
|
Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill
|
2018-02-23 14:06:47 +06:30 |
|
phyusin
|
3f9d491cc4
|
check role for = split
|
2018-02-23 14:06:35 +06:30 |
|
phyusin
|
7c171057d1
|
product sale
|
2018-02-23 14:03:25 +06:30 |
|
phyusin
|
23548dffa6
|
check report error precision
|
2018-02-23 11:34:53 +06:30 |
|
Aung Myo
|
8069ac15ca
|
Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service
|
2018-02-23 11:13:30 +06:30 |
|
Aung Myo
|
31c7048075
|
update oqs js
|
2018-02-23 11:12:58 +06:30 |
|
phyusin
|
3ae604b4ce
|
check user role
|
2018-02-23 10:57:50 +06:30 |
|
phyusin
|
ce217e1e0b
|
check waiter role
|
2018-02-23 10:53:12 +06:30 |
|
phyusin
|
a1906ed555
|
check table type in oqs
|
2018-02-23 10:42:12 +06:30 |
|