Commit Graph

3268 Commits

Author SHA1 Message Date
San Wai Lwin
36eab44f8b edit Total Customer in survey 2018-04-12 09:59:34 +06:30
phyusin
2ac629f6e0 conflict 2018-04-11 18:01:46 +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
phyusin
590ee16aa4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-11 09:34:23 +06:30
phyusin
5b0e1ce040 add qr codeဓ 2018-04-11 09:34:08 +06:30
San Wai Lwin
41d897d5c2 Edit Move Table Pdf 2018-04-10 18:18:08 +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
7a9fe91fa3 open liscen for master 2018-04-10 17:42:07 +06:30
Aung Myo
8e243564ac Merge branch 'doemal_ordering' 2018-04-10 17:30:54 +06:30
Aung Myo
a886cb63ba Merge branch 'adminbsb_material_ui' 2018-04-10 17:29:48 +06:30
Aung Myo
0e5269c66f update request bill msg box error 2018-04-10 17:29:02 +06:30
Yan
4c047550ce Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-10 16:22:00 +06:30
Yan
e8c0899a9d menu import export update 2018-04-10 16:21:43 +06:30
phyusin
c7e5ae8ab0 order reservation api 2018-04-10 15:21:49 +06:30
Aung Myo
77adad2417 update order_reservaiotn ui fishe 2018-04-10 15:19:46 +06:30
Aung Myo
0e39e4577f update request bill check from quick service 2018-04-10 10:51:33 +06:30
Aung Myo
4810628930 udate ui 2018-04-10 09:56:31 +06:30
phyusin
57be26be77 check customer 2018-04-09 16:59:59 +06:30
phyusin
4b19afd948 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 16:23:27 +06:30
phyusin
4bc56a31b8 check time 2018-04-09 16:23:16 +06:30
Aung Myo
6f6e6f0405 update order 2018-04-09 16:03:34 +06:30
Yan
9b054d5d79 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-09 15:51:44 +06:30
Yan
c2ea0e2515 remove validate brand name and check jade mobile 2018-04-09 15:51:23 +06:30
Aung Myo
b9d0881913 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into doemal_ordering 2018-04-09 15:34:20 +06:30
phyusin
b5016edb0d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 13:56:11 +06:30
phyusin
f6ba7403c5 add customer api for order reservation 2018-04-09 13:55:54 +06:30
Aung Myo
308ecf9491 update ordersummarysetPdf and slim for print setting to printer_setting 2018-04-09 13:49:42 +06:30
Aung Myo
18292d2cc1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-09 13:20:47 +06:30
Aung Myo
46a20dc006 update order & reservation 2018-04-09 13:19:47 +06:30
Aung Myo
66df760323 update order & reservation 2018-04-09 11:51:39 +06:30
phyusin
85b0378b6b change redeem payment process for dinga 2018-04-09 11:33:36 +06:30
Aung Myo
83aeb2eb90 update api authenticate 2018-04-09 10:53:16 +06:30
phyusin
b194cd6a28 remove waste and spoil in origami 2018-04-09 10:32:34 +06:30