Commit Graph

1202 Commits

Author SHA1 Message Date
phyusin
0ddaee7444 equal split and order split in order tab' 2018-02-16 12:13:35 +06:30
phyusin
d31c936547 for all items 2018-02-15 13:24:29 +06:30
phyusin
4f1a6fefe7 check void for table status update 2018-02-14 17:32:34 +06:30
phyusin
8898ba597a change split bill 2018-02-14 17:07:33 +06:30
phyusin
75cadc7ed3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-14 14:46:44 +06:30
phyusin
50948be8bf sym_master 2018-02-14 14:37:28 +06:30
phyusin
4203aa995e conflict data 2018-02-14 14:24:01 +06:30
phyusin
91aa216666 check booking sale id is null for all order 2018-02-14 14:20:20 +06:30
phyusin
f19fb769f6 change split bill process 2018-02-14 14:14:53 +06:30
Aung Myo
22a9e75efa update license and sym_master 2018-02-13 15:12:09 +06:30
Aung Myo
5854bd88e1 update liscense file 2018-02-13 10:53:29 +06:30
phyusin
c902e2ea1b check one condition in order item 2018-02-09 14:56:33 +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
phyusin
c124a5fb77 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-09 14:04:36 +06:30
phyusin
19e9a941c8 show set item price in origami 2018-02-09 12:07:53 +06:30
San Wai Lwin
a59d692569 remove conflict data in oqs/home_controller.rb 2018-02-09 10:20:43 +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
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
Aung Myo
7c3cab4109 update origami order 2018-02-07 11:13:18 +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
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
Aung Myo
313bcd5db9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2018-02-06 17:02:44 +06:30
phyusin
d416f788cb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-06 16:41:37 +06:30
Aung Myo
6503ca9a48 update home for oqs 2018-02-06 16:24:00 +06:30
Aung Myo
ee5abb65f8 update home for order 2018-02-06 16:21:47 +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
1cbcab75b4 update for first bill 2018-02-06 10:43:59 +06:30
San Wai Lwin
3f247f731e Shop name in navbar,linke to shop info 2018-02-05 18:11:45 +06:30
phyusin
0780744377 check booking with order item split 2018-02-05 16:57:46 +06:30
phyusin
2ebfdbe8bc add updated qty text in oqs 2018-02-05 15:29:31 +06:30
phyusin
65d9f0fb6f order update 2018-02-05 13:07:30 +06:30
phyusin
8fed8d701a add booking 2018-02-05 11:05:58 +06:30
phyusin
991bc48505 order item split bill process 2018-02-06 09:46:30 +06:30
phyusin
3dc6f42bd5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into split_bill 2018-02-02 14:04:20 +06:30
phyusin
2821f4bb1c change booking_id 2018-02-02 13:42:37 +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
f608aa8516 check checkin time is available or valid time 2018-02-01 17:00:57 +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