Commit Graph

642 Commits

Author SHA1 Message Date
phyusin
bd06e80b37 remove conflict data 2018-03-05 16:24:45 +06:30
Aung Myo
01d217fd0f update conflix split pull 2018-02-28 17:04:35 +06:30
San Wai Lwin
07c3bcd7a7 Change Dashboard, Account in login, Shop name, Reference no for other charges 2018-02-28 15:31:55 +06:30
Aung Myo
1d70a9f178 update fixed issues for quickservice from sqa 2018-02-28 14:20:22 +06:30
Aung Myo
0acd533bfe update add oredr 2018-02-28 10:14:18 +06:30
phyusin
adefd8c034 remove conflict data 2018-02-27 14:35:21 +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
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
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
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
8b064a4428 change assigned item id to order item id 2018-02-26 10:01:35 +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
Aung Myo
f4f5915532 update waiter view add order 2018-02-26 09:19:14 +06:30
phyusin
3bb6649d39 add edit for rooms and check inventory link 2018-02-23 15:45:59 +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
phyusin
ffbfd71330 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-22 18:52:55 +06:30
phyusin
7cbb67fd30 add link for oqs in origami 2018-02-22 18:51:57 +06:30
Aung Myo
c7b77aebfa update taday list and addorder 2018-02-22 18:48:59 +06:30
phyusin
8d03fab703 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-22 09:43:13 +06:30
Aung Myo
0e70f3b763 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-22 09:39:54 +06:30
Aung Myo
7d144b0307 update edit sale for qs 2018-02-22 09:37:14 +06:30
phyusin
e2903075b2 change split bill equal person flow 2018-02-21 18:24:04 +06:30
phyusin
1385c2c842 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-21 17:09:32 +06:30
phyusin
bc1007f193 check booking order delete for order 2018-02-21 17:09:18 +06:30
Aung Myo
5e6b096111 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-21 16:12:46 +06:30
Aung Myo
0302bb408b update no table oqs print 2018-02-21 16:11:05 +06:30
phyusin
0392854f90 change create order 2018-02-21 14:18:37 +06:30
phyusin
3534a887fc remove Job for bill_channel 2018-02-21 14:01:29 +06:30
phyusin
2849a47171 check shift sale process 2018-02-21 13:59:55 +06:30
phyusin
75a774b6fa Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-21 13:41:50 +06:30
phyusin
c9780ebffc split bill process 2018-02-21 13:41:37 +06:30
Aung Myo
4455b03e8a update print pay in qs 2018-02-21 12:34:03 +06:30
phyusin
317a79446f add precision in payment page 2018-02-21 11:17:25 +06:30
phyusin
28252e9e87 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-21 09:17:12 +06:30
phyusin
76ccc36208 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-02-21 09:15:53 +06:30
San Wai Lwin
51a243ea7c To update close cashier 2018-02-20 17:35:54 +06:30
Aung Myo
4ebe353182 update conflix for request bill 2018-02-20 16:24:06 +06:30
Aung Myo
98c4737a2a fixed minor issuse 2018-02-20 16:09:11 +06:30
Aung Myo
b0cc934625 update quick service for split bill 2018-02-20 15:29:19 +06:30
phyusin
c4c57680a1 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-20 13:34:48 +06:30