Commit Graph

752 Commits

Author SHA1 Message Date
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
phyusin
9594689f1c add survey update function 2018-02-19 10:23:15 +06:30
Aung Myo
0504a9505b update menu category 2018-02-19 09:12:51 +06:30
Aung Myo
8291a0a992 update addorder view 2018-02-16 17:20:32 +06:30
phyusin
80729e686f change survey update function 2018-02-16 16:58:55 +06:30
phyusin
d459a6e2a3 check order item split process 2018-02-16 15:11:16 +06:30
Aung Myo
941204afc1 update add order 2018-02-16 14:30:53 +06:30
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
Aung Myo
2f7f412150 update addorder move + and box 2018-02-16 09:46:55 +06:30
Aung Myo
cf644892c9 update pending and quick service 2018-02-15 15:26:34 +06:30
phyusin
d31c936547 for all items 2018-02-15 13:24:29 +06:30
Aung Myo
a2bd8795cc update discount for qs 2018-02-15 11:23:40 +06:30
Aung Myo
47ffc5fa51 update no table quick srevice 2018-02-14 18:21:10 +06:30
phyusin
8898ba597a change split bill 2018-02-14 17:07:33 +06:30
Aung Myo
a2e7ebd27a update payment show 2018-02-14 15:00:16 +06:30
Aung Myo
a5c72b6540 test no table 2018-02-14 14:40:28 +06:30
phyusin
f19fb769f6 change split bill process 2018-02-14 14:14:53 +06:30
Aung Myo
a844b51b39 Merge branch 'split_bill' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 15:08:07 +06:30
Aung Myo
7c07cd0118 update dashbord 2018-02-09 15:07:39 +06:30
phyusin
1b1ffa1146 check receipt 2018-02-09 15:07:01 +06:30
Aung Myo
974dde54c0 update shop.name 2018-02-09 14:58:08 +06:30
Aung Myo
aeafbb4fae update pull split bill 2018-02-09 14:31:34 +06:30
phyusin
9f6505fd95 remove conflict data in ability.rb 2018-02-09 14:06:16 +06:30
Aung Myo
54cb5b0c87 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-09 11:32:49 +06:30