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 |
|
Aung Myo
|
386c5291a1
|
update waste and spoile
|
2018-03-29 16:16:19 +06:30 |
|
phyusin
|
6bb833aff3
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-03-23 19:41:38 +06:30 |
|
phyusin
|
e0fe0ee8ab
|
dashboard update
|
2018-03-23 18:06:53 +06:30 |
|
Jueli Moon Aung
|
2412fe8462
|
.database.yml.swp deleted online with Bitbucket
|
2018-03-23 07:40:30 +00:00 |
|
Jueli Moon Aung
|
65d33a9ba7
|
secrets.yml edited online with Bitbucket
|
2018-03-23 07:39:39 +00:00 |
|
Jueli Moon Aung
|
fe8a923c22
|
secrets.yml edited online with Bitbucket
|
2018-03-23 07:39:10 +00:00 |
|
Jueli Moon Aung
|
15d8588e63
|
sidekiq.yml edited online with Bitbucket
|
2018-03-23 07:38:39 +00:00 |
|
phyusin
|
7063d937e3
|
latest Aston req from OPT team
|
2018-03-21 17:45:55 +06:30 |
|
phyusin
|
16d60add22
|
add FOC,VOID remark in Transaction/Sale and new Transaction/Survey
|
2018-03-21 15:07:57 +06:30 |
|
Aung Myo
|
a30abfb30c
|
Merge branch 'adminbsb_material_ui'
|
2018-03-21 13:10:59 +06:30 |
|
Aung Myo
|
e6719462d1
|
update route
|
2018-03-21 13:10:12 +06:30 |
|
phyusin
|
9c8cf6d748
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-03-21 11:53:38 +06:30 |
|
phyusin
|
0977363518
|
check tax profile process
|
2018-03-21 11:53:27 +06:30 |
|
Aung Myo
|
a0d27bd1d1
|
update route for print setting and addorder
|
2018-03-21 11:18:49 +06:30 |
|
Aung Myo
|
9db3ec07cc
|
update menu import/export ui
|
2018-03-21 10:30:28 +06:30 |
|
phyusin
|
26765111fa
|
add edit order item api and second display route
|
2018-03-20 17:04:52 +06:30 |
|
phyusin
|
25b6458450
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2018-03-19 18:41:50 +06:30 |
|
San Wai Lwin
|
110dc80f0c
|
Add multiple photo upload
|
2018-03-19 18:35:59 +06:30 |
|
Aung Myo
|
8f2aa994b5
|
update addorder sytle
|
2018-03-19 18:22:15 +06:30 |
|