Commit Graph

1519 Commits

Author SHA1 Message Date
Aung Myo
830dc1b4d2 udpate order 2018-04-19 19:02:21 +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
3db2db093b menu export import update and print setting update 2018-04-19 15:17:59 +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
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
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
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