Commit Graph

2836 Commits

Author SHA1 Message Date
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
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
phyusin
2dda29c5cc add shop detail info in inventory 2018-02-23 15:29:22 +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
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
phyusin
ed12897986 oqs js 2018-02-23 10:15:55 +06:30
phyusin
06abf1c744 check oqs edit in origami 2018-02-22 19:18:24 +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
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
Yan
643a9d71be remove skip before action in home controller 2018-02-21 17:04:45 +06:30
Yan
4552a4a9ac license update, base controllers extends app controller 2018-02-21 16:42:19 +06:30
Yan
3d6da8fc66 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-21 16:30:37 +06:30
Yan
3d2d304654 license update for token 2018-02-21 16:30:14 +06:30
Aung Myo
5f67a91fd6 update all pdf for no table 2018-02-21 16:25:01 +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
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
ebdf838b52 update request sale for another role 2018-02-21 13:12:41 +06:30