Commit Graph

3299 Commits

Author SHA1 Message Date
Aung Myo
ed025800c4 update addor for set instance api for addorder and paymal paymant 2018-04-19 16:55:49 +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
e468bc65af update shift_sale migration file and secret yml 2018-04-19 10:32:59 +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
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
phyusin
dab00151ef Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-11 18:02:23 +06:30
phyusin
2ac629f6e0 conflict 2018-04-11 18:01:46 +06:30
phyusin
ba06be7822 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-11 17:59:48 +06:30
phyusin
a0fca242d4 add sale id in order reservations 2018-04-11 17:59:37 +06:30
San Wai Lwin
b11480a90c Add Total Customer 2018-04-11 17:53:57 +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
San Wai Lwin
f159673c60 Remove Discount button in cashier of waiter role 2018-04-11 14:47:50 +06:30
phyusin
8261a3453a remove # in action controller 2018-04-11 14:40:28 +06:30
phyusin
98bd0073c1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-11 14:38:29 +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
5801a48f4b cannot add action_cntr in ignore 2018-04-11 11:49:36 +06:30
Yan
5e2d8a6d3a add action_cntr in ignore 2018-04-11 11:37:43 +06:30
Yan
fc91fe51af add action_cntr in ignore 2018-04-11 11:36:34 +06:30
Yan
b2d302b846 add action_cntr in ignore 2018-04-11 11:36:26 +06:30
Yan
ace2853cf4 add config/initializer/* in ignore 2018-04-11 11:30:34 +06:30
Yan
04ae741462 cloud for api and doemal 2018-04-11 11:27:05 +06:30
Julian
8b2f36fbc5 Docker Setup 2018-04-11 11:24:34 +06:30
phyusin
27e70f1a86 modify api and change rounding adj 2018-04-11 10:28:33 +06:30