Commit Graph

1360 Commits

Author SHA1 Message Date
Yan
697aabc0bd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 14:31:08 +06:30
Yan
5e6d7bb958 merge with aung myo 2017-12-14 13:49:55 +06:30
Aung Myo
736d336a77 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-14 12:08:19 +06:30
Aung Myo
95f500ae24 table show in complete sale 2017-12-14 12:07:36 +06:30
phyusin
ed7bd07164 cahnge int for foc 2017-12-14 12:07:00 +06:30
phyusin
c86d91054b change query for dashboard 2017-12-14 12:02:50 +06:30
Yan
4d81ee85ce Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-14 11:52:43 +06:30
Yan
e8c5cd1219 call waiter css 2017-12-14 11:51:44 +06:30
Aung Myo
de4f63aabc price 0 in table and room show 2017-12-14 11:36:20 +06:30
Yan
974c5df830 is taxable for other charges 2017-12-13 18:29:07 +06:30
Aung Myo
f497957a56 update add subcategory in addorder 2017-12-13 13:18:53 +06:30
Yan
ebf46e856d Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-13 11:07:16 +06:30
Aung Myo
f908c8e036 update add subcategory in addorder 2017-12-13 11:04:54 +06:30
Yan
dcb3a37a81 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 17:50:33 +06:30
Yan
d39896af82 remove padding in dashboard 2017-12-12 17:49:44 +06:30
Yan
bbf30ed26f dashboard hourly sale and license code clean 2017-12-12 17:41:35 +06:30
phyusin
5ba010c1e6 change card sale data 2017-12-12 16:46:14 +06:30
phyusin
112c4d9228 change dashboard data 2017-12-12 16:24:31 +06:30
phyusin
3ef122b8f3 check card in dashboard 2017-12-12 16:11:32 +06:30
phyusin
0ade612b97 change dashboard data 2017-12-12 16:06:04 +06:30
phyusin
450a27b4f0 change redeem amt for nett 2017-12-12 15:46:53 +06:30
phyusin
8611489ecb change dashboard data 2017-12-12 15:43:56 +06:30
Yan
e55948a7b2 login keyup changed 2017-12-12 15:33:23 +06:30
phyusin
685fbf1e83 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-12 11:06:18 +06:30
phyusin
59fbe1ed17 change customer UI 2017-12-12 10:51:58 +06:30
Yan
196746bd4f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 10:45:02 +06:30
Aung Myo
66964a6926 update crm addore 2017-12-11 18:01:19 +06:30
phyusin
e727b8b22e check table status for late data and check pending showing when there is no item in origami 2017-12-11 17:39:19 +06:30
phyusin
01ead63d19 change UI for report filter 2017-12-11 10:16:56 +06:30
phyusin
863349092f add localization for membership actions and settings 2017-12-08 18:28:51 +06:30
phyusin
725daaf7d4 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 17:03:56 +06:30
Yan
2d2b7ecb4c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 16:46:01 +06:30
phyusin
9310baa81a add checkin checkout time in origami 2017-12-08 16:42:53 +06:30
Aung Myo
e4a4c7aba4 update receipt no report 2017-12-08 16:07:10 +06:30
phyusin
e787974aa8 change update btn UI in settings/OQS 2017-12-08 15:11:05 +06:30
phyusin
41971dae81 change report filter for shift and checkin api 2017-12-08 14:26:13 +06:30
phyusin
1e7cec4646 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 11:20:43 +06:30
phyusin
deda2dd0c7 add double click event for all payment 2017-12-08 11:20:30 +06:30
Yan
45fa3f81fc Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 10:41:57 +06:30
phyusin
2faf5ba386 change checkout fun: in UI 2017-12-08 10:40:57 +06:30
Yan
8eb65f6f81 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 10:17:19 +06:30
phyusin
46bbd90df5 add fun: for checkin and checkout 2017-12-08 10:14:28 +06:30
Aung Myo
8a98af32eb update rails logger for paymal response 2017-12-08 10:13:08 +06:30
phyusin
5994263ff1 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-07 18:18:56 +06:30
phyusin
abecd08ba2 control double click event 2017-12-07 18:18:32 +06:30
Yan
8ff73b2b21 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 17:37:24 +06:30
Yan
daf3554826 table status color 2017-12-07 17:04:55 +06:30
Aung Myo
d9fd19265b update from and to date index.html of all report 2017-12-07 15:51:40 +06:30
Yan
cb0559a1ab rounding adj fix 2017-12-07 15:06:38 +06:30
Yan
a7b2107624 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 14:27:33 +06:30