Commit Graph

827 Commits

Author SHA1 Message Date
phyusin
afcf7725f5 change UI for all settings module 2017-11-22 16:28:17 +06:30
phyusin
dde553ebe2 change total card query 2017-11-22 13:27:22 +06:30
Yan
1fd4108ac0 change all sale item 2017-11-22 12:12:27 +06:30
Aung Myo
5b7ba0c144 update supervisor wrong spelling 2017-11-22 10:40:43 +06:30
Aung Myo
749e271879 update saleitem rb syntax err 2017-11-22 09:59:13 +06:30
Yan
6ce3f8e044 add sale items in sale item model 2017-11-21 19:33:20 +06:30
Yan
ad66a6570b add popper.js.map and remove .idea 2017-11-21 16:30:56 +06:30
Yan
861e554d63 fix for dining charges taxable price and ui modified 2017-11-21 12:10:53 +06:30
Yan
22b5421603 dev done license 2017-11-20 19:15:32 +06:30
Yan
b046086ea4 Merge branch 'master' into license 2017-11-20 13:54:54 +06:30
Yan
6c03d0249c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-17 15:51:40 +06:30
Yan
e7cd8deb8e fix tester bugs 2017-11-17 15:51:20 +06:30
Aung Myo
73da4841c6 update salepayment for puts 2017-11-17 13:50:27 +06:30
Yan
68a0f7eca3 license sym config 2017-11-17 13:32:49 +06:30
Yan
34fd7a80d6 Merge branch 'master' into license 2017-11-17 10:25:32 +06:30
phyusin
f333aa9a66 add top10 and bottom10 products in dashboard 2017-11-17 10:22:04 +06:30
phyusin
e5831f92f9 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-17 10:03:59 +06:30
phyusin
4899e624ef change dashboard ui 2017-11-17 09:56:40 +06:30
Yan
a175ce3aeb temp fix get current booking 2017-11-16 21:14:59 +06:30
Yan
f18947789c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-16 20:48:58 +06:30
Yan
29322d952e license cloud done 2017-11-16 20:46:03 +06:30
phyusin
b09061d9c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-16 18:19:05 +06:30
phyusin
d648bbf100 dashboard ui and checkin checkout process 2017-11-16 18:17:40 +06:30
Yan
178b3484be added license 2017-11-16 16:13:26 +06:30
Aung Myo
d107577ea7 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-16 10:20:45 +06:30
Aung Myo
ccbdd5b2c8 update shift sale detail 2017-11-16 10:03:01 +06:30
Yan
b1f98df4e0 add activation in license 2017-11-15 19:10:56 +06:30
Yan
50aca66abe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 17:56:16 +06:30
Yan
c2095b4a61 adding license activation 2017-11-15 17:55:51 +06:30
Aung Myo
bf0a8135f6 update rebate for credit and redeem 2017-11-15 17:54:59 +06:30
Yan
d1765ca32c fix for oqs and add instance code to assign order item 2017-11-15 16:19:44 +06:30
Aung Myo
ef253cd1dc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-15 13:40:35 +06:30
Aung Myo
308d9eefde update booking search 2017-11-15 13:40:09 +06:30
Yan
71a4b9b7e3 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 13:28:46 +06:30
phyusin
37b509474f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-15 13:28:18 +06:30
phyusin
9647a28f91 dashboard chart UI 2017-11-15 13:27:42 +06:30
Yan
e263ba2433 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 12:06:55 +06:30
Aung Myo
1c0a93d56d update pagination and booking and rebate redeem 2017-11-15 12:02:02 +06:30
Yan
12f75ff403 licensing 2017-11-15 12:01:49 +06:30
Yan
7c6153f16f licensing 2017-11-15 12:01:35 +06:30
Yan
5ec45593de licensing 2017-11-14 18:35:25 +06:30
Yan
93769bacb7 licensing 2017-11-14 18:35:14 +06:30
Aung Myo
28dbb75774 update rebate and update api 2017-11-14 18:30:57 +06:30
Yan
222114a3c3 licensing 2017-11-14 16:06:17 +06:30
Yan
36275b55c6 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-14 15:54:17 +06:30
Yan
683982d4f5 adding license 2017-11-14 15:11:16 +06:30
Yan
54f68bdfc5 remove byebun in license rb 2017-11-14 13:46:24 +06:30
Aung Myo
6f06e7a9d7 add booking list in transaction 2017-11-14 13:42:00 +06:30
Yan
a6252923f1 test license 2017-11-10 19:03:10 +06:30
Yan
97fd7619ce license test 2017-11-10 18:08:48 +06:30