Commit Graph

1295 Commits

Author SHA1 Message Date
Aung Myo
36f097d4cf Merge branch 'adminbsb_material_ui' 2018-04-27 10:40:17 +06:30
Aung Myo
eb61e94909 update addorder get menu and sub menu 2018-04-27 10:39:29 +06:30
Aung Myo
390c9b2dca Merge branch 'adminbsb_material_ui' 2018-04-26 13:35:41 +06:30
Aung Myo
3a85481dcd update dinga and paymal 2018-04-26 13:07:31 +06:30
phyusin
c14960fc96 remove conflict data 2018-04-25 15:10:10 +06:30
phyusin
b41c85132d add order and reservation, quick service in lookups and add date and order by in order reservation 2018-04-25 15:07:43 +06:30
Aung Myo
9b0a564b9a update cable for cloud 2018-04-25 13:18:54 +06:30
phyusin
d0ad95c8d6 change name 2018-04-23 19:32:32 +06:30
phyusin
3f13bb6c74 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-23 19:21:20 +06:30
phyusin
e62ba4d6c2 change params 2018-04-23 19:20:03 +06:30
Yan
86199ab4b4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 16:23:35 +06:30
Yan
403f70480d api cloud update 2018-04-23 16:23:00 +06:30
Aung Myo
6e3a5300a6 close cable in cloud mode 2018-04-23 15:39:56 +06:30
phyusin
2255fcd2d4 add token in lookups 2018-04-23 15:09:04 +06:30
phyusin
9b12ed0254 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-23 14:41:18 +06:30
phyusin
b92889fb23 change base url settings 2018-04-23 14:41:07 +06:30
Yan
6ce1fbf8a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 11:49:58 +06:30
Yan
509d3a2b18 add mysql config option wait timeout 2018-04-23 11:49:36 +06:30
Aung Myo
def208bc75 update requestBill 2018-04-22 14:43:32 +06:30
Aung Myo
1fe48b57d0 update action cable for order resservation 2018-04-22 14:11:04 +06:30
Aung Myo
0dea849d46 update ability account and suvisor and manager 2018-04-20 18:22:36 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Aung Myo
f8687b5010 update cloud mode off for order and queue 2018-04-20 09:23:11 +06:30
Aung Myo
830dc1b4d2 udpate order 2018-04-19 19:02:21 +06:30
Aung Myo
e75a276326 udpate order 2018-04-19 18:57:03 +06:30
Aung Myo
c957ef7423 update order for cloud process order 2018-04-19 18:38:08 +06:30
Yan
46f572e2ae merge with ui ux and add public menus in gitignore 2018-04-19 15:26:57 +06:30
Yan
3db2db093b menu export import update and print setting update 2018-04-19 15:17:59 +06:30
San Wai Lwin
0241d209ac Pull from master 2018-04-19 10:49:25 +06:30
Yan
458da62c66 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-18 18:12:16 +06:30
Yan
28a79fe60f pdf viewer add and menu export testing 2018-04-18 18:12:01 +06:30
Aung Myo
2a26abff9a finished dinga and paymal payment 2018-04-18 16:47:38 +06:30
Aung Myo
5816a48d32 update dinga and paymal 2018-04-18 14:40:53 +06:30
phyusin
bf38beb066 change status 2018-04-12 16:18:32 +06:30
phyusin
4137026c16 order reservation updated 2018-04-12 14:28:44 +06:30
phyusin
b4ccd02fc2 change order reservation 2018-04-12 11:05:10 +06:30
phyusin
49ebc6c0dc order reservation 2018-04-12 11:01:13 +06:30
San Wai Lwin
4a0995c7ba Pull from master 2018-04-12 10:04:28 +06:30
Aung Myo
c1a6ff7230 Merge branch 'doemal_ordering' 2018-04-11 18:06:55 +06:30
Aung Myo
4d92d71b5c update doemal ordering 2018-04-11 18:05:49 +06:30
Yan
6889c879ec Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-11 17:20:29 +06:30
Yan
b730c78afe doemal or other api token added 2018-04-11 17:20:17 +06:30
phyusin
0413d56a83 add paymal and dinga with account no 2018-04-11 16:18:42 +06:30
phyusin
9b2312d3ba change ordr reservation api 2018-04-11 14:38:16 +06:30
Yan
53388248e9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-11 13:15:09 +06:30
Yan
04ae741462 cloud for api and doemal 2018-04-11 11:27:05 +06:30
phyusin
27e70f1a86 modify api and change rounding adj 2018-04-11 10:28:33 +06:30
Yan
70cd6576b1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-10 18:10:53 +06:30
Yan
0ff340cac2 shop upate for 20 files 2018-04-10 18:10:40 +06:30
Aung Myo
a886cb63ba Merge branch 'adminbsb_material_ui' 2018-04-10 17:29:48 +06:30