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 |
|
Aung Myo
|
4ea6474dc1
|
Merge branch 'sqa-1804-001' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-19 10:43:59 +06:30 |
|
Aung Myo
|
e468bc65af
|
update shift_sale migration file and secret yml
|
2018-04-19 10:32:59 +06:30 |
|
San Wai Lwin
|
a009f359fa
|
update puma production
|
2018-04-18 14:44:25 +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
|
4d95ceed75
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into sqa-1804-001
|
2018-04-12 16:25:36 +06:30 |
|
phyusin
|
4137026c16
|
order reservation updated
|
2018-04-12 14:28:44 +06:30 |
|
phyusin
|
d800a5d28d
|
license
|
2018-04-12 11:11:51 +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 |
|