Commit Graph

1138 Commits

Author SHA1 Message Date
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
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
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
Aung Myo
de3f2e5e90 clear buttom in datepickere 2017-11-15 09:44:52 +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
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
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
Aung Myo
8db96beca0 update oqs view an d promotion form update 2017-11-10 14:32:21 +06:30
Yan
fb64041a3f Merge branch 'master' into license 2017-11-10 11:30:05 +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
Aung Myo
cb91ad307a update shop form 2017-11-09 14:40:15 +06:30
Yan
eba30f6566 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-09 12:04:32 +06:30
Aung Myo
0813cb5722 update design pages 2017-11-09 12:01:22 +06:30
Yan
845adf7d19 install form 2017-11-09 10:56:03 +06:30
Aung Myo
60eb21a5eb update desing pages 2017-11-08 18:13:57 +06:30
Aung Myo
99222a3f70 update desing pages 2017-11-08 18:06:26 +06:30
Aung Myo
7fe1ff5b22 update payment page 2017-11-08 17:14:18 +06:30
Aung Myo
482d0559eb update login dashoborad 2017-11-08 11:09:53 +06:30
Yan
6dd0faee10 change ui for delete backend 2017-11-07 20:00:51 +06:30
Yan
6596c90f02 turbolink fixing 2017-11-07 18:51:59 +06:30
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Yan
f7ef431ded Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 15:29:28 +06:30
Aung Myo
55943a2e33 update survey json 2017-11-07 15:19:22 +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
758b36000e origami numpad ui fix and promotion fix 2017-11-07 14:48:33 +06:30
Yan
7b2f928df0 test for jade 2017-11-07 12:32:50 +06:30
Yan
0ad958d8a8 del migrating no need commission 2017-11-07 11:03:19 +06:30
Yan
17afb039cb update commission 2017-11-07 10:52:57 +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
8f69caff2d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:29:27 +06:30
phyusin
c5e6854faa change UI for payment page in origami 2017-11-07 10:28:20 +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
phyusin
70a908158f fix for checkbox in promotion and Back btn fix for Customers in Origami 2017-11-06 16:02:01 +06:30
Aung Myo
3aacc63b82 update conflix sarb rb 2017-11-06 14:17:47 +06:30