Commit Graph

3339 Commits

Author SHA1 Message Date
Aung Myo
cc89a35ece update rake receipt 2018-04-22 10:45:29 +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
Aung Myo
1913ada8e5 update 2018-04-19 15:23:08 +06:30
Yan
527cafc772 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 15:18:11 +06:30
Yan
3db2db093b menu export import update and print setting update 2018-04-19 15:17:59 +06:30
Aung Myo
652251f243 update rake file 2018-04-19 15:00:48 +06:30
Aung Myo
635db2e011 update rake receipt file 2018-04-19 13:59:50 +06:30
San Wai Lwin
0241d209ac Pull from master 2018-04-19 10:49:25 +06:30
Aung Myo
e468bc65af update shift_sale migration file and secret yml 2018-04-19 10:32:59 +06:30
Aung Myo
99e000e000 update shift_sale migration file 2018-04-19 10:31:02 +06:30
Aung Myo
61e8d6e2b5 update shift_sale migration file 2018-04-19 10:28:31 +06:30
Aung Myo
0b97d2a457 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into r-1804001-01 2018-04-19 10:18:45 +06:30
Aung Myo
4837d27964 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2018-04-19 10:17:29 +06:30
Aung Myo
ed8e9836fe check and update qrcode payment 2018-04-19 10:16:38 +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
a5cb5a67f4 update order reservation 2018-04-18 17:55:32 +06:30
San Wai Lwin
70ec80a1d5 Manager level can not edit Administrator's password and id 2018-04-18 16:57:02 +06:30