Commit Graph

3410 Commits

Author SHA1 Message Date
Aung Myo
5ea950f5aa update addore cable for second display closed 2018-04-23 14:43:27 +06:30
phyusin
bb206a700d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001 2018-04-23 14:42:43 +06:30
phyusin
9b12ed0254 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2018-04-23 14:41:18 +06:30
phyusin
b92889fb23 change base url settings 2018-04-23 14:41:07 +06:30
Aung Myo
924f8b03cd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 14:18:14 +06:30
Aung Myo
cbb7a14621 update action cable for cloud 2018-04-23 14:17:56 +06:30
Yan
6ce1fbf8a9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-23 11:49:58 +06:30
Yan
509d3a2b18 add mysql config option wait timeout 2018-04-23 11:49:36 +06:30
Aung Myo
39c7cec32b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 16:42:52 +06:30
Aung Myo
8806027793 update bugs for demo 2018-04-22 16:38:52 +06:30
Aung Myo
b949020153 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 15:07:56 +06:30
Aung Myo
def208bc75 update requestBill 2018-04-22 14:43:32 +06:30
Aung Myo
5f95bf5f4d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-22 14:12:33 +06:30
Aung Myo
1fe48b57d0 update action cable for order resservation 2018-04-22 14:11:04 +06:30
Aung Myo
cc89a35ece update rake receipt 2018-04-22 10:45:29 +06:30
Yan
268cae09f5 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 20:27:31 +06:30
Yan
835231bd61 edit api cntr 2018-04-20 20:27:08 +06:30
Aung Myo
276c776cfb Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 18:23:38 +06:30
Aung Myo
0dea849d46 update ability account and suvisor and manager 2018-04-20 18:22:36 +06:30
Aung Myo
ba1b7a1d9c update receipt rake 2018-04-20 18:11:32 +06:30
Aung Myo
e1cf95ea60 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 17:04:18 +06:30
Aung Myo
cc4fdf2384 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 17:03:34 +06:30
Aung Myo
97ec370a8f update order and reserve and receipt rake 2018-04-20 17:03:18 +06:30
Yan
0aa080573c Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-20 13:53:56 +06:30
Aung Myo
983baa88c9 update discount member message 2018-04-20 13:00:48 +06:30
Yan
223404a3b0 fix childplay code and qr code 2018-04-20 11:51:33 +06:30
Aung Myo
ed958b622d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 10:37:24 +06:30
Aung Myo
8720ffd195 update discuount view 2018-04-20 10:36:34 +06:30
Aung Myo
dac69f18e1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 09:34:07 +06:30
Aung Myo
85bee857a4 merge with adminbsb_ma_ui 2018-04-20 09:32:27 +06:30
Aung Myo
e9bc846865 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 09:30:19 +06:30
Aung Myo
6a63390da6 update receipt migrate 2018-04-20 09:29:39 +06:30
Aung Myo
7509362d45 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-20 09:25:22 +06:30
Aung Myo
f8687b5010 update cloud mode off for order and queue 2018-04-20 09:23:11 +06:30
Aung Myo
830dc1b4d2 udpate order 2018-04-19 19:02:21 +06:30
Aung Myo
e75a276326 udpate order 2018-04-19 18:57:03 +06:30
Aung Myo
86e3b8ee34 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-19 18:39:07 +06:30
Aung Myo
82d2e73912 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 18:38:19 +06:30
Aung Myo
c957ef7423 update order for cloud process order 2018-04-19 18:38:08 +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
e640f4b0a0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-19 16:56:30 +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
8d3946fede update dinga and paymal view for tabcap 2018-04-19 15:49:38 +06:30
Aung Myo
f638837f81 update dinga and paymal view for tabcap 2018-04-19 15:48:39 +06:30
Yan
f8a247c61a print pdf btn ui change 2018-04-19 15:41:22 +06:30
Yan
46f572e2ae merge with ui ux and add public menus in gitignore 2018-04-19 15:26:57 +06:30
Aung Myo
6540e93cfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-19 15:23:46 +06:30