Commit Graph

1266 Commits

Author SHA1 Message Date
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
phyusin
bf38beb066 change status 2018-04-12 16:18:32 +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
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
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
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
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
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
phyusin
85b0378b6b change redeem payment process for dinga 2018-04-09 11:33:36 +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
a258a77c46 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-04-09 10:09:52 +06:30
phyusin
ee65189b05 change sale.rb file 2018-04-09 10:09:35 +06:30
phyusin
0901add832 change time format in query 2018-04-09 10:07:03 +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
Aung Myo
2c7ef1e73b Merge branch 'adminbsb_material_ui' 2018-04-06 16:56:08 +06:30
San Wai Lwin
3c1be9a185 Edit From_time & To_time filter in dashboard 2018-04-06 15:19:08 +06:30
Aung Myo
38a5ec2bd4 update self.print for cloud 2018-04-06 14:07:43 +06:30
San Wai Lwin
ee3121b7c2 Pull From Master 2018-04-06 13:42:11 +06:30
San Wai Lwin
769698e09e Add MoveTablePdf and FOC update error 2018-04-05 18:23:29 +06:30
phyusin
fe01948dd3 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 15:36:21 +06:30
phyusin
dac1a58b64 print settings 2018-04-06 10:45:14 +06:30
San Wai Lwin
39e887c7a5 Pull from master 2018-04-05 14:30:43 +06:30
Jueli Moon Aung
866746db70 license.rb edited by Julian (Enabled Rest API for SymmetricDS) 2018-04-05 07:01:40 +00:00
San Wai Lwin
fc8b2d3b73 Pull from master 2018-04-05 11:49:42 +06:30