Commit Graph

425 Commits

Author SHA1 Message Date
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
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
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
Yan
a70f9a43e6 license 2017-11-10 14:11:10 +06:30
Yan
9c50e1486f activation form 2017-11-09 18:30:33 +06:30
Yan
053a8dbf8a activation form 2017-11-09 18:30:20 +06:30
Yan
02f3c0d253 license 2017-11-09 15:49:29 +06:30
Yan
09dcbaf9f2 license and AES 2017-11-09 15:47:16 +06:30
Yan
121338677c add license 2017-11-09 14:41:35 +06:30
Aung Myo
cb91ad307a update shop form 2017-11-09 14:40:15 +06:30
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Yan
4db7f7b7aa add survey form 2017-11-07 15:06:27 +06:30
Aung Myo
97c03c1744 update survey 2017-11-07 14:49:42 +06:30
Yan
17afb039cb update commission 2017-11-07 10:52:57 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Yan
15196053a0 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-01 17:14:44 +06:30
Aung Myo
ebb2114243 update payment method report and from,to time change 2017-11-01 16:14:45 +06:30
Yan
1fa2d090ab upgrading 2017-10-31 18:46:18 +06:30
Yan
4660530218 upgrade version 2017-10-31 18:41:19 +06:30
Aung Myo
01c4eeca81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-31 18:05:29 +06:30
Aung Myo
b89340b85e update payment menthod report 2017-10-31 18:03:36 +06:30
Yan
6a3e604af3 dev ip change 2017-10-31 13:42:09 +06:30