Commit Graph

905 Commits

Author SHA1 Message Date
Yan
4e616ed5eb need to fix license 2017-12-19 14:18:41 +06:30
Yan
368405451f need to fix license 2017-12-19 11:49:03 +06:30
Yan
5798a612d7 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 17:19:39 +06:30
Aung Myo
035d0851ee update checking booking 2017-12-14 17:10:05 +06:30
phyusin
ed429b2d4b change checkout time and free time 2017-12-14 16:40:29 +06:30
Yan
fc45198542 bill foc add remark for original 2017-12-14 14:47:10 +06:30
Yan
697aabc0bd Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 14:31:08 +06:30
Yan
2c24b13344 bill foc 2017-12-14 14:30:30 +06:30
phyusin
c86d91054b change query for dashboard 2017-12-14 12:02:50 +06:30
phyusin
00615a4443 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-12-13 18:30:27 +06:30
phyusin
32dac8e9a8 change query for dashboard and time for checkin channel 2017-12-13 18:30:04 +06:30
Yan
18bc28b1a1 auto checkin color change 2017-12-13 16:50:40 +06:30
phyusin
211db16311 add channel for checkin process 2017-12-13 15:58:44 +06:30
Yan
ebf46e856d Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-13 11:07:16 +06:30
Aung Myo
15bfe11fc0 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-12 18:06:52 +06:30
Aung Myo
0b46206b62 update rebate double and old balance 2017-12-12 17:52:05 +06:30
Yan
dcb3a37a81 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 17:50:33 +06:30
Yan
bbf30ed26f dashboard hourly sale and license code clean 2017-12-12 17:41:35 +06:30
phyusin
8611489ecb change dashboard data 2017-12-12 15:43:56 +06:30
Yan
196746bd4f Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 10:45:02 +06:30
Yan
8298b1aebe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-12 10:40:22 +06:30
Yan
f11145cbd1 disable no rebate if credit note 2017-12-12 10:35:26 +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
4f7a6b0825 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 18:29:50 +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
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
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
ffb829fbc3 license updating 2017-12-08 12:06:21 +06:30
Yan
308e007372 license updating 2017-12-08 11:51:38 +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
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
phyusin
51ecc653f1 add current login name in checkin process 2017-12-07 16:26:11 +06:30