San Wai Lwin
|
a009f359fa
|
update puma production
|
2018-04-18 14:44:25 +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 |
|
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 |
|
San Wai Lwin
|
c53276f21c
|
Add survey's fieldset
|
2018-04-02 18:09:36 +06:30 |
|
Yan
|
c1aa8467d6
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2018-04-02 16:13:46 +06:30 |
|
Yan
|
c176b41e79
|
menu import and exp update
|
2018-04-02 15:59:36 +06:30 |
|
phyusin
|
ac5987fbb5
|
Merge branch 'topup_payment' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-03-30 16:38:00 +06:30 |
|
phyusin
|
c2063b06a0
|
add route for display image
|
2018-03-30 16:37:48 +06:30 |
|
phyusin
|
298fc9a3f0
|
merge with second display
|
2018-03-30 15:48:55 +06:30 |
|
phyusin
|
40175d64cd
|
remove puma backup
|
2018-03-30 15:38:48 +06:30 |
|
phyusin
|
8e14d93c4c
|
merge with master
|
2018-03-30 15:36:41 +06:30 |
|
phyusin
|
df93563e6f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into ui_ux_changes
|
2018-03-30 15:29:26 +06:30 |
|
phyusin
|
996392a041
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-03-30 15:25:15 +06:30 |
|
phyusin
|
6a9fd67bff
|
check payment method
|
2018-03-30 15:24:51 +06:30 |
|
Aung Myo
|
5588f40753
|
update waste and spoilage
|
2018-03-30 14:20:47 +06:30 |
|
San Wai Lwin
|
3ced0f2590
|
Pull from master
|
2018-03-29 18:17:10 +06:30 |
|