Commit Graph

1957 Commits

Author SHA1 Message Date
phyusin
4899e624ef change dashboard ui 2017-11-17 09:56:40 +06:30
phyusin
384c0f2dd2 align summary panel in dashboard 2017-11-16 18:23:42 +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
059d1fc853 remove log in custom js 2017-11-15 19:15:20 +06:30
Yan
f8823360e3 add instance code to assigned_order_items 2017-11-15 17:59:32 +06:30
Yan
50aca66abe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-15 17:56:16 +06:30
Aung Myo
bf0a8135f6 update rebate for credit and redeem 2017-11-15 17:54:59 +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
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
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
Aung Myo
de3f2e5e90 clear buttom in datepickere 2017-11-15 09:44:52 +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
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
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
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
phyusin
69fb7fa551 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-14 09:42:55 +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
4ad65c5480 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-10 14:35:05 +06:30
Yan
3a71b86695 add license and encryption for cloud 2017-11-10 14:34:46 +06:30
Aung Myo
8db96beca0 update oqs view an d promotion form update 2017-11-10 14:32:21 +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
9c50e1486f activation form 2017-11-09 18:30:33 +06:30
Yan
053a8dbf8a activation form 2017-11-09 18:30:20 +06:30
Aung Myo
7115ae0a97 update gem clean force 2017-11-09 18:09:18 +06:30
Aung Myo
f8cd712ad1 update feedback testing 2017-11-09 17:25:54 +06:30