Commit Graph

892 Commits

Author SHA1 Message Date
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
50bf67f5e5 miss and add instance in oqs 2017-11-15 16:46:00 +06:30
Yan
d1765ca32c fix for oqs and add instance code to assign order item 2017-11-15 16:19:44 +06:30
Yan
71a4b9b7e3 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 13:28:46 +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
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
7c6153f16f licensing 2017-11-15 12:01:35 +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
Aung Myo
f927d99807 update transaction 2017-11-14 15:48:22 +06:30
Aung Myo
937576856f update back buttom in cashier default 2017-11-14 15:33:06 +06:30
Yan
abb8838215 licensing 2017-11-14 15:31:18 +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
fa7cb53e55 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-14 13:08:22 +06:30
Aung Myo
f1a28d64e1 update OQS and cashier 2017-11-14 09:43:13 +06:30
Yan
a6252923f1 test license 2017-11-10 19:03:10 +06:30
Yan
e4308cdc53 license test remove 2017-11-10 18:10:19 +06:30
Yan
97fd7619ce license test 2017-11-10 18:08:48 +06:30
Yan
3a71b86695 add license and encryption for cloud 2017-11-10 14:34:46 +06:30
Yan
4ce8fe48bc license for master 2017-11-10 14:15:05 +06:30
Yan
a70f9a43e6 license 2017-11-10 14:11:10 +06:30
Yan
fb64041a3f Merge branch 'master' into license 2017-11-10 11:30:05 +06:30
Yan
b82099368f fix edit dining charges 2017-11-10 11:29:45 +06:30
Yan
e5f1a44551 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-09 18:31:16 +06:30
Yan
053a8dbf8a activation form 2017-11-09 18:30:20 +06:30
Aung Myo
f8cd712ad1 update feedback testing 2017-11-09 17:25:54 +06:30
Yan
310ba78ef5 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-09 14:42:18 +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
66ae94c3e2 fix dining charges for room 2017-11-09 11:51:49 +06:30
Yan
a5d2b3b32b fix dining time 2017-11-08 18:56:03 +06:30
Aung Myo
bfadacd950 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-08 09:32:25 +06:30
Yan
6dd0faee10 change ui for delete backend 2017-11-07 20:00:51 +06:30
Aung Myo
dcf4c6125a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-11-07 18:16:01 +06:30
Aung Myo
2756cf2987 update survey json 2017-11-07 17:32:24 +06:30
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Aung Myo
55943a2e33 update survey json 2017-11-07 15:19:22 +06:30
Aung Myo
75118ef88b update survey 2017-11-07 14:53:46 +06:30
Aung Myo
97c03c1744 update survey 2017-11-07 14:49:42 +06:30
Yan
4fa0705f1c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:32:48 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Yan
6917ce2612 add survey 2017-11-06 18:51:15 +06:30
Yan
d5efe1402f add survey 2017-11-06 18:23:38 +06:30
Aung Myo
3aacc63b82 update conflix sarb rb 2017-11-06 14:17:47 +06:30