Commit Graph

733 Commits

Author SHA1 Message Date
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
Aung Myo
edade3662b update quickservice 2018-02-09 11:32:29 +06:30
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +06:30
phyusin
88a3deca30 change ui for split bill 2018-02-08 18:17:17 +06:30
phyusin
00d3397834 conflict data remove for order/show.index.html.erb 2018-02-08 18:04:36 +06:30
phyusin
e445b3e88e add order count and change orders UI for table and room 2018-02-08 17:56:41 +06:30
Aung Myo
d052fed803 update pay first and print later 2018-02-08 14:13:58 +06:30
Aung Myo
8e2ec90ee6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-08 11:09:21 +06:30
Aung Myo
38dc13ecf7 update pending order 2018-02-08 11:08:52 +06:30
phyusin
c71ece4327 change sale id for add to existing in room 2018-02-07 15:58:19 +06:30
phyusin
492bf93185 change split bill ui 2018-02-07 15:50:36 +06:30
San Wai Lwin
625ee9bd34 For add alert box for Close Cashier 2018-02-07 13:23:01 +06:30
phyusin
41aa840eb2 conflict data 2018-02-06 18:12:59 +06:30
phyusin
21538f38f8 order query changed 2018-02-06 18:06:40 +06:30
phyusin
503f1df0ab change order data 2018-02-06 18:05:02 +06:30
phyusin
7a055470e8 add split bill for order item in room 2018-02-06 17:46:58 +06:30
phyusin
9387703862 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-06 16:17:27 +06:30
phyusin
f093f1f0a7 split bill for order item 2018-02-06 16:17:08 +06:30
Aung Myo
3fcd09f8ef update update ddetail for table 2018-02-06 14:19:00 +06:30
Aung Myo
76b1cda530 update discount for first bill 2018-02-06 11:15:43 +06:30