Commit Graph

775 Commits

Author SHA1 Message Date
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
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
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
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
phyusin
f73f7cd965 Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-23 15:29:36 +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
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
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
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
phyusin
38bedf6129 change split bill btn 2018-02-22 09:42:55 +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
950f479da6 check qty update in edit 2018-02-21 18:42:00 +06:30
phyusin
e2903075b2 change split bill equal person flow 2018-02-21 18:24:04 +06:30
phyusin
d991a9f0ee Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-21 17:23:29 +06:30
phyusin
ac2b1d76c7 change split bill btn 2018-02-21 17:23:15 +06:30
Aung Myo
e3c54f6841 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-21 17:16:14 +06:30
Aung Myo
a07d46facc update addorder details 2018-02-21 17:15:29 +06:30
phyusin
bc1007f193 check booking order delete for order 2018-02-21 17:09:18 +06:30
phyusin
75a774b6fa Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-21 13:41:50 +06:30
Aung Myo
c3af21d71c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-21 13:28:43 +06:30
Aung Myo
f206df7c38 update edit form 2018-02-21 13:16:47 +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
Aung Myo
098ea8e931 update edit form 2018-02-20 18:15:55 +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
phyusin
4bfb5842bf split bill process 2018-02-20 13:33:59 +06:30
Aung Myo
24c5b17fd6 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-20 09:38:14 +06:30
phyusin
8ccf45d06f check some function 2018-02-19 18:05:30 +06:30
Aung Myo
a15025c8a0 update add orderjs and origami js 2018-02-19 17:45:30 +06:30
Aung Myo
48c33f68c2 fixed for survey for cashier and quick_ser 2018-02-19 14:50:38 +06:30
Aung Myo
c064f9d6f5 fixed conflix after pull split bill 2018-02-19 14:21:26 +06:30
Aung Myo
476f7425a2 update add order for menu and void foc for no table 2018-02-19 13:53:36 +06:30