Commit Graph

450 Commits

Author SHA1 Message Date
Aung Myo
b9b7d963ae Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-06 13:44:08 +06:30
Aung Myo
7aa1627e90 update call waiter and sale item 2017-12-06 13:43:22 +06:30
phyusin
3a5dab50b5 add localization for dashboard page 2017-12-05 09:39:06 +06:30
Yan
765e08fd15 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-04 19:36:23 +06:30
Aung Myo
3354733e41 update call waiter 2017-12-04 19:23:37 +06:30
Yan
840e260c28 add for ygn bbq 2017-12-04 18:44:18 +06:30
Yan
4548813bfd license verify 2017-12-01 17:35:56 +06:30
Yan
a50b49d2ac license activate 2017-12-01 16:24:51 +06:30
Yan
4b7cced87c license acti 2017-12-01 15:19:24 +06:30
Yan
7db4ace7b6 license 2017-12-01 14:15:06 +06:30
Yan
6fc3cdae06 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-01 14:07:38 +06:30
Yan
bef09018b5 license activation 2017-12-01 14:07:00 +06:30
Yan
b1217c19a2 add order for subcat 2017-12-01 13:57:56 +06:30
phyusin
e25be9e459 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-01 12:04:00 +06:30
phyusin
a52a671e12 remove foc for other payment and show foc payment in shift sale report 2017-12-01 12:03:39 +06:30
Yan
281ea9910a license 2017-11-30 20:03:12 +06:30
Yan
2343210980 license activate test 2017-11-30 18:50:42 +06:30
Yan
f4116fe9fb oqs edit 2017-11-30 18:12:48 +06:30
Yan
aa1d2e4f59 cloud change 2017-11-30 17:29:56 +06:30
Yan
d826e375b7 change license 2017-11-29 18:01:51 +06:30
Yan
e2aa1527ca license activate 2017-11-29 18:00:13 +06:30
Yan
29fa95d229 license activate 2017-11-29 17:59:46 +06:30
Yan
b1d9027d5b subdomain + domain 2017-11-29 11:21:26 +06:30
Yan
f33be9e707 Merge branch 'master' into license 2017-11-28 17:07:58 +06:30
Aung Myo
b49f46a5c2 update sale item report 2017-11-24 18:57:01 +06:30
Yan
a5a33b269a Merge branch 'master' into license 2017-11-24 10:15:37 +06:30
Yan
6beb32348d major fix taxable price for sale and other sale and oqs 2017-11-22 18:39:35 +06:30
Yan
2cc8b820db puma to gitignore 2017-11-22 13:42:19 +06:30
Yan
fb235f0b1c puma update 2017-11-21 19:53:17 +06:30
Yan
6ce3f8e044 add sale items in sale item model 2017-11-21 19:33:20 +06:30
Yan
0fdc22b981 puma config 2017-11-21 17:31:40 +06:30
Yan
9e1b82ffea puma config 2017-11-21 17:20:24 +06:30
Yan
68937617f9 puma config 2017-11-21 17:14:08 +06:30
Yan
ad66a6570b add popper.js.map and remove .idea 2017-11-21 16:30:56 +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
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
Aung Myo
c0733d7c48 update queue view 2017-11-16 19:26:52 +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
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
c2095b4a61 adding license activation 2017-11-15 17:55:51 +06:30
Yan
e263ba2433 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 12:06:55 +06:30
Yan
b8dc74f517 merge with license but not complete 2017-11-15 12:06:06 +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
93769bacb7 licensing 2017-11-14 18:35:14 +06:30