Commit Graph

2893 Commits

Author SHA1 Message Date
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
Aung Myo
924f8b03cd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 14:18:14 +06:30
Aung Myo
cbb7a14621 update action cable for cloud 2018-04-23 14:17:56 +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
8806027793 update bugs for demo 2018-04-22 16:38:52 +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
Yan
268cae09f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 20:27:31 +06:30
Yan
835231bd61 edit api cntr 2018-04-20 20:27:08 +06:30
Aung Myo
0dea849d46 update ability account and suvisor and manager 2018-04-20 18:22:36 +06:30
Aung Myo
cc4fdf2384 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 17:03:34 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Yan
0aa080573c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 13:53:56 +06:30
Aung Myo
983baa88c9 update discount member message 2018-04-20 13:00:48 +06:30
Yan
223404a3b0 fix childplay code and qr code 2018-04-20 11:51:33 +06:30
Aung Myo
8720ffd195 update discuount view 2018-04-20 10:36:34 +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
Aung Myo
095a62f143 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 16:55:58 +06:30
Aung Myo
ed025800c4 update addor for set instance api for addorder and paymal paymant 2018-04-19 16:55:49 +06:30
Yan
1187ddba37 move check license to action controler 2018-04-19 16:40:59 +06:30
Yan
f8a247c61a print pdf btn ui change 2018-04-19 15:41:22 +06:30
Yan
46f572e2ae merge with ui ux and add public menus in gitignore 2018-04-19 15:26:57 +06:30
Yan
527cafc772 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 15:18:11 +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
Aung Myo
4837d27964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 10:17:29 +06:30
Aung Myo
ed8e9836fe check and update qrcode payment 2018-04-19 10:16:38 +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
a5cb5a67f4 update order reservation 2018-04-18 17:55:32 +06:30
San Wai Lwin
70ec80a1d5 Manager level can not edit Administrator's password and id 2018-04-18 16:57:02 +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
Yan
fc523ca390 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-18 14:17:52 +06:30
Yan
c22fc3e86e add pdf viewer and test doemal 2018-04-18 14:17:37 +06:30
phyusin
de5bbb27f7 Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-12 16:19:27 +06:30
phyusin
bf38beb066 change status 2018-04-12 16:18:32 +06:30
San Wai Lwin
859080d4a1 Edit MoveTablePdf for cloud 2018-04-12 15:28:10 +06:30
phyusin
b12d4b8bf8 token checked for doemal 2018-04-12 14:30:25 +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
926ce2f259 Edit in Printer 2018-04-12 10:42:43 +06:30
San Wai Lwin
4a0995c7ba Pull from master 2018-04-12 10:04:28 +06:30
San Wai Lwin
36eab44f8b edit Total Customer in survey 2018-04-12 09:59:34 +06:30