Commit Graph

2283 Commits

Author SHA1 Message Date
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
394249c16a Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 18:30:16 +06:30
phyusin
4f7a6b0825 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 18:29:50 +06:30
phyusin
c4c5ac5eab Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 18:29:11 +06:30
phyusin
863349092f add localization for membership actions and settings 2017-12-08 18:28:51 +06:30
Yan
d80c7840cc remove card pay for member dis 2017-12-08 17:37:30 +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
Yan
e04ef1e223 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 16:31:39 +06:30
Yan
dd5936b991 license cloud finished 2017-12-08 16:26:41 +06:30
phyusin
2415adff98 check min for api checkin process 2017-12-08 16:09:37 +06:30
Aung Myo
e4a4c7aba4 update receipt no report 2017-12-08 16:07:10 +06:30
phyusin
fefa8da5d6 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 15:11:17 +06:30
phyusin
e787974aa8 change update btn UI in settings/OQS 2017-12-08 15:11:05 +06:30
Yan
33326931e2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 14:59:49 +06:30
Yan
c8767dae99 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 14:59:01 +06:30
Yan
f57dd8ba38 license updating 2017-12-08 14:58:35 +06:30
phyusin
3dce4ccd10 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 14:39:31 +06:30
phyusin
5bfe9ef31e change checkin api 2017-12-08 14:39:14 +06:30
Yan
1ff1ddeacd Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 14:27:28 +06:30
Yan
5310e3e534 license updating 2017-12-08 14:27:10 +06:30
phyusin
d7fa976298 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 14:26:34 +06:30
phyusin
41971dae81 change report filter for shift and checkin api 2017-12-08 14:26:13 +06:30
Aung Myo
e8626e78f5 update paymal response record and show double payment 2017-12-08 13:59:05 +06:30
Yan
681b5afebc Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 12:06:37 +06:30
Yan
ffb829fbc3 license updating 2017-12-08 12:06:21 +06:30
phyusin
4e5a99eee2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 12:05:47 +06:30
phyusin
495dcf1dcf change login user 2017-12-08 12:05:36 +06:30
Yan
0591e4449e Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 11:51:53 +06:30
Yan
308e007372 license updating 2017-12-08 11:51:38 +06:30
phyusin
ede4851257 change get_Cashier to current_login_emp in checkin api 2017-12-08 11:48:04 +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
485eef3782 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-08 09:52:33 +06:30
Yan
e4ceabf111 oqs edit txt rechange to updated 2017-12-07 19:19:24 +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
Yan
94c2086152 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 16:50:51 +06:30
phyusin
ac54a1032b check booking checkout_at 2017-12-07 16:49:43 +06:30
Yan
31a5678122 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 16:38:17 +06:30
Yan
b38b53026f un-comment bookink.checkout_by in sale 2017-12-07 16:37:59 +06:30