Commit Graph

653 Commits

Author SHA1 Message Date
phyusin
9ff3018323 add alert for new,send_to_kitchen and ready_to_delivery 2018-05-03 17:22:59 +06:30
Aung Myo
ff4cdfa158 update member discount and tax 2018-04-30 15:16:07 +06:30
Aung Myo
36f097d4cf Merge branch 'adminbsb_material_ui' 2018-04-27 10:40:17 +06:30
Aung Myo
9aabed8ad5 update screte..yml 2018-04-26 17:36:59 +06:30
Yan
32fb28660e add pool zine in adapter 2018-04-25 14:15:04 +06:30
Yan
403f70480d api cloud update 2018-04-23 16:23:00 +06:30
Yan
509d3a2b18 add mysql config option wait timeout 2018-04-23 11:49:36 +06:30
Yan
223404a3b0 fix childplay code and qr code 2018-04-20 11:51:33 +06:30
Yan
d0293a762a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 17:26:30 +06:30
Yan
7d5d070e0d fix action contorller 2018-04-19 17:25:58 +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
Aung Myo
e468bc65af update shift_sale migration file and secret yml 2018-04-19 10:32:59 +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
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
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
Julian
8b2f36fbc5 Docker Setup 2018-04-11 11:24:34 +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
phyusin
c7e5ae8ab0 order reservation api 2018-04-10 15:21:49 +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
f6ba7403c5 add customer api for order reservation 2018-04-09 13:55:54 +06:30
Aung Myo
66df760323 update order & reservation 2018-04-09 11:51:39 +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
2e19d34ced add dinga payment and new payment type in report 2018-04-09 09:40:08 +06:30
San Wai Lwin
460ed991af Edit Addorder.js and Shop name 2018-04-06 18:16:20 +06:30
phyusin
2acbade789 remove conflict in secret 2018-04-05 17:50:13 +06:30
Yan
76da718a78 merge master 2018-04-05 16:10:59 +06:30
phyusin
55e2a06422 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-06 09:40:49 +06:30
phyusin
7c15dac2aa webview 2018-04-05 17:30:44 +06:30
Yan
09594f83f2 print setting for jade print 2018-04-05 16:08:20 +06:30
phyusin
686a980a9e Merge branch 'ui_ux_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-05 15:24:17 +06:30
phyusin
1fd6414886 add api for survey 2018-04-05 15:06:55 +06:30
Aung Myo
00c23b38df update merge with admibbsb-materi for multiple set item and report 2018-04-04 17:55:27 +06:30
Aung Myo
8c9b0f756d update sale item report 2018-04-04 14:09:35 +06:30
Aung Myo
17562f6fcf update license and login dashboard 2018-04-04 09:43:02 +06:30
Aung Myo
2cb6427aa1 update license check 2018-04-03 10:54:06 +06:30
San Wai Lwin
650eb53f51 Pull from master 2018-04-02 18:10:47 +06:30