Commit Graph

1517 Commits

Author SHA1 Message Date
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
Aung Myo
9757c34a09 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-14 15:01:57 +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
Aung Myo
839fb14436 update inventory 2018-02-13 11:34:06 +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
4c563e23bf add shop info in split bill 2018-02-09 14:19:53 +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
8f96249c21 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-08 18:11:50 +06:30
phyusin
d42fc485ae change ui for left sidebar 2018-02-08 18:10:11 +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
18eb7677c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-07 15:50:57 +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
Aung Myo
2101089f00 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-02-07 10:52:06 +06:30
Aung Myo
0517d66d48 update oqs 2018-02-07 10:51:49 +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
Aung Myo
4440f16559 update oqs for loading 2018-02-06 17:44:10 +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
Aung Myo
90e30440c1 update discount for first bill 2018-02-06 11:06:30 +06:30
Aung Myo
aaec4778f2 update table box 2018-02-06 11:04:50 +06:30
Aung Myo
1cbcab75b4 update for first bill 2018-02-06 10:43:59 +06:30
Aung Myo
5543b64b27 update table box 2018-02-06 10:30:16 +06:30
Aung Myo
85020d91bf update table box 2018-02-06 09:52:27 +06:30
San Wai Lwin
3f247f731e Shop name in navbar,linke to shop info 2018-02-05 18:11:45 +06:30
Aung Myo
76a094972e update payment 2018-02-05 15:10:35 +06:30
Aung Myo
3ac6871a89 update show payment 2018-02-05 14:03:30 +06:30
phyusin
65d9f0fb6f order update 2018-02-05 13:07:30 +06:30
Aung Myo
1324f381d1 update quick service payment view 2018-02-05 11:21:52 +06:30
phyusin
8fed8d701a add booking 2018-02-05 11:05:58 +06:30