Commit Graph

694 Commits

Author SHA1 Message Date
phyusin
d77d774a6f check token 2018-05-12 12:25:11 +06:30
Aung Myo
329af02a0a add cable .yml 2018-05-11 14:36:40 +06:30
phyusin
9daf8235a7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes 2018-05-11 13:06:13 +06:30
San Wai Lwin
f52537b509 Edit Photo name in commissioner,customers,employee,menu,product and shop 2018-05-10 15:08:57 +06:30
Aung Myo
7aada60807 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-10 14:33:51 +06:30
Aung Myo
6f8cae303e update route conflict for addorder 2018-05-10 14:31:24 +06:30
Aung Myo
7b5c04c797 update add order cache menu 2018-05-10 14:28:28 +06:30
phyusin
1e24eedac0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-10 12:49:30 +06:30
phyusin
d1baaaa78f remove comment 2018-05-10 12:48:00 +06:30
phyusin
0d89cf0291 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-10 12:40:11 +06:30
phyusin
abbff492e8 add API for order reservation 2018-05-10 12:37:17 +06:30
phyusin
4d2e872c7d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-10 09:13:29 +06:30
phyusin
58513dc08a change report 2018-05-09 15:07:19 +06:30
Aung Myo
2cdb18d338 menu cache for menu category 2018-05-09 13:56:37 +06:30
phyusin
c448ad8235 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-09 11:29:17 +06:30
phyusin
4faee913f3 change order reservation -not finished 2018-05-09 11:28:01 +06:30
phyusin
313f1b2909 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-08 17:28:19 +06:30
phyusin
1716d14df3 change order reservation 2018-05-08 17:28:09 +06:30
Aung Myo
42a15d3023 update cache menu 2018-05-08 15:54:15 +06:30
Aung Myo
2d73e63e7b update cache menu 2018-05-08 15:47:11 +06:30
phyusin
391cc19117 check order reservation 2018-05-07 13:32:58 +06:30
San Wai Lwin
2f398bcfeb Pull from master 2018-05-04 16:08:45 +06:30
phyusin
8341b8c357 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-04 11:20:41 +06:30
phyusin
62636cc8c9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-04 11:19:11 +06:30
phyusin
135ccae8a6 change js file 2018-05-04 11:18:53 +06:30
Yan
fc69efff16 merged master 2018-05-04 11:16:44 +06:30
phyusin
de82924227 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-04 10:43:36 +06:30
Aung Myo
5099ec6b8f Merge branch 'adminbsb_material_ui' 2018-05-03 18:09:28 +06:30
Aung Myo
69eeede474 update access code 2018-05-03 18:08:27 +06:30
Yan
57b9c44349 merge with master 2018-05-03 17:57:49 +06:30
phyusin
70c2d0a05d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-05-03 17:23:11 +06:30
phyusin
9ff3018323 add alert for new,send_to_kitchen and ready_to_delivery 2018-05-03 17:22:59 +06:30
Aung Myo
28dc5faada update complete tab and other issuse 2018-05-03 09:52:53 +06:30
Yan
02fe2e57cc no changes 2018-05-03 09:29:18 +06:30
phyusin
bf0dc3fecf Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-05-02 13:48:32 +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
phyusin
631c94a63a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-04-25 15:11:25 +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
phyusin
bb206a700d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-04-23 14:42:43 +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
924edd823a update shift_sale migration file and secret yml 2018-04-19 10:49:58 +06:30