Aung Myo
|
f908c8e036
|
update add subcategory in addorder
|
2017-12-13 11:04:54 +06:30 |
|
Aung Myo
|
15bfe11fc0
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-12-12 18:06:52 +06:30 |
|
Aung Myo
|
fa5a9053ac
|
update discount by card payment 5%
|
2017-12-12 17:56:46 +06:30 |
|
Aung Myo
|
0b46206b62
|
update rebate double and old balance
|
2017-12-12 17:52:05 +06:30 |
|
phyusin
|
5ba010c1e6
|
change card sale data
|
2017-12-12 16:46:14 +06:30 |
|
phyusin
|
112c4d9228
|
change dashboard data
|
2017-12-12 16:24:31 +06:30 |
|
phyusin
|
3ef122b8f3
|
check card in dashboard
|
2017-12-12 16:11:32 +06:30 |
|
phyusin
|
0ade612b97
|
change dashboard data
|
2017-12-12 16:06:04 +06:30 |
|
phyusin
|
450a27b4f0
|
change redeem amt for nett
|
2017-12-12 15:46:53 +06:30 |
|
phyusin
|
8611489ecb
|
change dashboard data
|
2017-12-12 15:43:56 +06:30 |
|
phyusin
|
f8b2cd90ba
|
add localization for MM
|
2017-12-12 11:31:58 +06:30 |
|
phyusin
|
685fbf1e83
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-12 11:06:18 +06:30 |
|
phyusin
|
59fbe1ed17
|
change customer UI
|
2017-12-12 10:51:58 +06:30 |
|
Yan
|
196746bd4f
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-12 10:45:02 +06:30 |
|
Yan
|
8298b1aebe
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-12 10:40:22 +06:30 |
|
Yan
|
f11145cbd1
|
disable no rebate if credit note
|
2017-12-12 10:35:26 +06:30 |
|
Aung Myo
|
66964a6926
|
update crm addore
|
2017-12-11 18:01:19 +06:30 |
|
phyusin
|
e727b8b22e
|
check table status for late data and check pending showing when there is no item in origami
|
2017-12-11 17:39:19 +06:30 |
|
Aung Myo
|
a48ace07da
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui
|
2017-12-11 10:40:22 +06:30 |
|
Aung Myo
|
0dce6e4329
|
udate add order controller
|
2017-12-11 10:39:19 +06:30 |
|
phyusin
|
01ead63d19
|
change UI for report filter
|
2017-12-11 10:16:56 +06:30 |
|
phyusin
|
394249c16a
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 18:30:16 +06:30 |
|
phyusin
|
4f7a6b0825
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 18:29:50 +06:30 |
|
phyusin
|
c4c5ac5eab
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 18:29:11 +06:30 |
|
phyusin
|
863349092f
|
add localization for membership actions and settings
|
2017-12-08 18:28:51 +06:30 |
|
Yan
|
d80c7840cc
|
remove card pay for member dis
|
2017-12-08 17:37:30 +06:30 |
|
phyusin
|
725daaf7d4
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 17:03:56 +06:30 |
|
Yan
|
2d2b7ecb4c
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 16:46:01 +06:30 |
|
phyusin
|
9310baa81a
|
add checkin checkout time in origami
|
2017-12-08 16:42:53 +06:30 |
|
Yan
|
e04ef1e223
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 16:31:39 +06:30 |
|
Yan
|
dd5936b991
|
license cloud finished
|
2017-12-08 16:26:41 +06:30 |
|
phyusin
|
2415adff98
|
check min for api checkin process
|
2017-12-08 16:09:37 +06:30 |
|
Aung Myo
|
e4a4c7aba4
|
update receipt no report
|
2017-12-08 16:07:10 +06:30 |
|
phyusin
|
fefa8da5d6
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 15:11:17 +06:30 |
|
phyusin
|
e787974aa8
|
change update btn UI in settings/OQS
|
2017-12-08 15:11:05 +06:30 |
|
Yan
|
33326931e2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 14:59:49 +06:30 |
|
Yan
|
c8767dae99
|
Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 14:59:01 +06:30 |
|
Yan
|
f57dd8ba38
|
license updating
|
2017-12-08 14:58:35 +06:30 |
|
phyusin
|
3dce4ccd10
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 14:39:31 +06:30 |
|
phyusin
|
5bfe9ef31e
|
change checkin api
|
2017-12-08 14:39:14 +06:30 |
|
Yan
|
1ff1ddeacd
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 14:27:28 +06:30 |
|
Yan
|
5310e3e534
|
license updating
|
2017-12-08 14:27:10 +06:30 |
|
phyusin
|
d7fa976298
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 14:26:34 +06:30 |
|
phyusin
|
41971dae81
|
change report filter for shift and checkin api
|
2017-12-08 14:26:13 +06:30 |
|
Aung Myo
|
e8626e78f5
|
update paymal response record and show double payment
|
2017-12-08 13:59:05 +06:30 |
|
Yan
|
681b5afebc
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 12:06:37 +06:30 |
|
Yan
|
ffb829fbc3
|
license updating
|
2017-12-08 12:06:21 +06:30 |
|
phyusin
|
4e5a99eee2
|
Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes
|
2017-12-08 12:05:47 +06:30 |
|
phyusin
|
495dcf1dcf
|
change login user
|
2017-12-08 12:05:36 +06:30 |
|
Yan
|
0591e4449e
|
Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant
|
2017-12-08 11:51:53 +06:30 |
|