Commit Graph

1555 Commits

Author SHA1 Message Date
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
phyusin
2ac629f6e0 conflict 2018-04-11 18:01:46 +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
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
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
phyusin
57be26be77 check customer 2018-04-09 16:59:59 +06:30
phyusin
4bc56a31b8 check time 2018-04-09 16:23:16 +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
18292d2cc1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-09 13:20: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
c5c6fdd6ac Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 10:12:33 +06:30
phyusin
ed6f2b6385 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 10:10:45 +06:30
phyusin
a258a77c46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-09 10:09:52 +06:30
Yan
f933c9615a merged 2018-04-09 10:09:24 +06:30
Yan
cb3f9c4cd7 remove skip auth from api and check user modified 2018-04-09 09:58:22 +06:30
phyusin
b3e17f6936 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-09 09:48:35 +06:30
phyusin
2e19d34ced add dinga payment and new payment type in report 2018-04-09 09:40:08 +06:30
Aung Myo
a9b9342f42 Merge branch 'adminbsb_material_ui' 2018-04-07 16:45:45 +06:30
Aung Myo
14b33a6f8d add kitchen role for oqs 2018-04-07 15:53:24 +06:30
phyusin
edaef54b0e Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-06 17:54:03 +06:30
San Wai Lwin
57ff3e8a65 Edit Print_setting 2018-04-06 13:47:59 +06:30
San Wai Lwin
ee3121b7c2 Pull From Master 2018-04-06 13:42:11 +06:30
phyusin
818f441529 check mobile 2018-04-06 13:15:32 +06:30
phyusin
0b869ccb89 cehck mobile 2018-04-06 12:00:45 +06:30
phyusin
8217b7c2f2 check mobile user 2018-04-05 19:22:52 +06:30
phyusin
a44e86ed21 check orgami js 2018-04-05 19:00:13 +06:30
San Wai Lwin
769698e09e Add MoveTablePdf and FOC update error 2018-04-05 18:23:29 +06:30
Yan
76da718a78 merge master 2018-04-05 16:10:59 +06:30
phyusin
a2e4863c9d check user agent and token when webview is loaded 2018-04-06 15:36:08 +06:30
phyusin
55e2a06422 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 09:40:49 +06:30