Commit Graph

3841 Commits

Author SHA1 Message Date
phyusin
db26ec6d3f add void for quick service completed 2018-06-06 15:12:36 +06:30
phyusin
2cc52bd888 change saleitem query and js for order reservation 2018-06-06 11:47:21 +06:30
phyusin
4b7881b14e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-06 09:31:24 +06:30
phyusin
77f251a181 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-05 17:06:34 +06:30
phyusin
f670a6152e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-05 17:06:07 +06:30
phyusin
84eb657f90 change route for junction pay 2018-06-05 17:05:25 +06:30
Aung Myo
7f249feda2 update origami dashboard 2018-06-05 15:50:06 +06:30
phyusin
f0501d5f8a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-05 15:42:47 +06:30
phyusin
1a7524cdbe Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-05 15:39:43 +06:30
phyusin
e5895d3565 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-05 15:39:00 +06:30
phyusin
dd58daa056 check customer 2018-06-05 15:38:42 +06:30
phyusin
1cbfb67b4c Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-05 13:30:28 +06:30
phyusin
8d4f85ff0c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-05 13:28:57 +06:30
phyusin
7f04c284c6 customer update from doemal order 2018-06-05 13:28:36 +06:30
phyusin
78101d28c8 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-06-05 11:54:13 +06:30
Aung Myo
c87c6816ac Merge branch 'adminbsb_material_ui' 2018-06-05 11:53:23 +06:30
phyusin
13357e529f check customer contact noဓ 2018-06-05 11:52:32 +06:30
Aung Myo
1401b322a3 update addorder product 2018-06-05 11:51:59 +06:30
phyusin
d28d62a937 check customer contact no 2018-06-05 10:49:12 +06:30
phyusin
7ef461beee check quick service 2018-06-04 17:18:03 +06:30
phyusin
985e6ce74b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-04 14:39:54 +06:30
Aung Myo
86d3b60e9a Merge branch 'adminbsb_material_ui' 2018-06-04 14:29:59 +06:30
Aung Myo
4f37a2c57e update payment foc err 2018-06-04 14:27:55 +06:30
phyusin
4881ed6145 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-04 13:47:45 +06:30
phyusin
866301200c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-04 13:47:00 +06:30
phyusin
6ee8192cde change js func: 2018-06-04 13:46:26 +06:30
Aung Myo
a141a3336b Merge branch 'adminbsb_material_ui' 2018-06-04 13:14:07 +06:30
Aung Myo
e18cba27c4 update order api action cable 2018-06-04 13:11:58 +06:30
phyusin
5ad58f5095 check js for order reservation 2018-06-04 11:17:16 +06:30
phyusin
65bb223514 change order reservation first-click 2018-06-04 11:01:12 +06:30
phyusin
9f24c56e61 add audio for order reservation 2018-06-01 17:38:59 +06:30
phyusin
7c35fa48e0 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-01 17:19:54 +06:30
San Wai Lwin
8f9d5665ca Condition in shop 2018-06-01 17:18:31 +06:30
EikhantMon
73947229a7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-06-01 17:14:12 +06:30
EikhantMon
767386e750 change item_width in customise pdf 2018-06-01 17:13:40 +06:30
Aung Myo
2bb27011c9 Merge branch 'adminbsb_material_ui' 2018-06-01 17:01:18 +06:30
Aung Myo
bb62d69289 update api survey 2018-06-01 17:00:33 +06:30
phyusin
2cc6a98137 check contact no for order and reservation 2018-06-01 16:56:25 +06:30
phyusin
2115753861 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-01 16:46:40 +06:30
San Wai Lwin
b7f8d05a95 Remove action_controller.rb 2018-06-01 16:44:33 +06:30
phyusin
250db4db87 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-01 16:43:28 +06:30
phyusin
4a94620346 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-01 16:43:14 +06:30
San Wai Lwin
794ff7c26f pull from master 2018-06-01 16:43:13 +06:30
San Wai Lwin
e0785c5cad Add Order Audio 2018-06-01 16:41:22 +06:30
phyusin
494d95ad43 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2018-06-01 16:31:18 +06:30
phyusin
a7c8b409e0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-06-01 16:30:53 +06:30
phyusin
5dd12ecf1b check customer info 2018-06-01 16:30:32 +06:30
Aung Myo
cba404665c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-06-01 16:19:58 +06:30
Aung Myo
b1adb9810f update promotio for netprice and percentage 2018-06-01 16:19:41 +06:30
phyusin
75e98fbae1 clickable check 2018-06-01 15:33:01 +06:30