Commit Graph

305 Commits

Author SHA1 Message Date
phyusin
8898ba597a change split bill 2018-02-14 17:07:33 +06:30
phyusin
f19fb769f6 change split bill process 2018-02-14 14:14:53 +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
San Wai Lwin
860e8db202 conflic data 2018-02-09 10:17:56 +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
8e2ec90ee6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into quick_service 2018-02-08 11:09:21 +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
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
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
1cbcab75b4 update for first bill 2018-02-06 10:43:59 +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
1324f381d1 update quick service payment view 2018-02-05 11:21:52 +06:30
phyusin
991bc48505 order item split bill process 2018-02-06 09:46:30 +06:30
Aung Myo
1d9164aaf0 update quick service for payment 2018-02-02 18:03:43 +06:30
phyusin
d1fd92bfd3 split bill ui 2018-02-02 13:41:38 +06:30
phyusin
b553dd0661 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-01 18:04:17 +06:30
phyusin
48ce8e4809 split bill 2018-02-01 18:12:59 +06:30
phyusin
ae4746acfc change checkin time checked 2018-02-01 16:34:18 +06:30
phyusin
6c33040173 remove checkin if checkin not used 2018-02-01 16:25:11 +06:30
Aung Myo
2f024e8691 update qurick raw 2018-02-01 10:29:24 +06:30
Aung Myo
f4effe8dde update rom and table show 2018-01-27 13:16:42 +06:30
phyusin
8b99c8bcc6 cahnge empty json to NIL 2018-01-22 22:13:17 +06:30
phyusin
951d64d761 cahnge room ui 2018-01-19 16:20:02 +06:30
phyusin
3a21d85a4b add set_menu_item in origami and oqs 2018-01-19 16:06:58 +06:30
Aung Myo
7fadeeed2e update suppervisor ability and room & table first bill 2018-01-16 14:32:24 +06:30
Aung Myo
fb989572b1 update room for first bill 2018-01-15 17:48:35 +06:30
Aung Myo
5060d8caaf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-01-15 15:15:18 +06:30
Aung Myo
9ab9f3b002 update cloud and master 2018-01-15 15:08:52 +06:30
phyusin
9095dd46d9 change move table UI 2018-01-15 15:04:17 +06:30
Aung Myo
f214be8847 update cloud for print and first bill 2018-01-12 16:41:28 +06:30
Aung Myo
0b517807f9 update check server mode 2018-01-12 15:46:40 +06:30
Aung Myo
6ff3b04454 fixed confiixed for print 2018-01-12 15:19:22 +06:30
Aung Myo
cc710a992f update other multiple payments 2018-01-12 14:33:30 +06:30
Yan
bac1309f1f remove frt bill 2018-01-09 16:56:34 +06:30
Yan
2b50ae5fb9 merge with master 2018-01-09 16:40:45 +06:30
Aung Myo
b1fa5f1518 update add extra time 2018-01-02 12:30:57 +06:30
Aung Myo
ecb9a5f010 update void foc and credit for member discount 2017-12-28 18:02:25 +06:30
Aung Myo
7b0c504900 Merge branch 'adminbsb_material_ui' 2017-12-28 11:01:28 +06:30
Aung Myo
23e7c8db97 update payment control with first bill 2017-12-28 10:59:23 +06:30
phyusin
3d235f9d69 add alert_time_min in api/checkin and check for waiter login 2017-12-27 10:30:22 +06:30
phyusin
d969f3d3eb change js format for localStorage 2017-12-26 15:10:18 +06:30
Aung Myo
5bd1daa152 update payment and memberdiscoun 2017-12-22 17:51:02 +06:30