Commit Graph

1044 Commits

Author SHA1 Message Date
Yan
368405451f need to fix license 2017-12-19 11:49:03 +06:30
phyusin
332f0235a0 change channel to cronဓ 2017-12-14 17:39:39 +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
d2f79b8950 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-14 14:36:49 +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
Aung Myo
5b3031aac5 update pronter receipt for void and foc 2017-12-14 14:11:05 +06:30
Yan
5e6d7bb958 merge with aung myo 2017-12-14 13:49:55 +06:30
Aung Myo
95f500ae24 table show in complete sale 2017-12-14 12:07:36 +06:30
Yan
48f08d00af nothing 2017-12-14 12:04:31 +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
974c5df830 is taxable for other charges 2017-12-13 18:29:07 +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
Aung Myo
f497957a56 update add subcategory in addorder 2017-12-13 13:18:53 +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
fa5a9053ac update discount by card payment 5% 2017-12-12 17:56:46 +06:30
Aung Myo
0b46206b62 update rebate double and old balance 2017-12-12 17:52:05 +06:30
phyusin
8611489ecb change dashboard data 2017-12-12 15:43:56 +06:30
Aung Myo
66964a6926 update crm addore 2017-12-11 18:01:19 +06:30
Aung Myo
0dce6e4329 udate add order controller 2017-12-11 10:39:19 +06:30
Yan
d80c7840cc remove card pay for member dis 2017-12-08 17:37:30 +06:30
Yan
2d2b7ecb4c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 16:46:01 +06:30
Aung Myo
e4a4c7aba4 update receipt no report 2017-12-08 16:07:10 +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
phyusin
5bfe9ef31e change checkin api 2017-12-08 14:39:14 +06:30
Aung Myo
e8626e78f5 update paymal response record and show double payment 2017-12-08 13:59:05 +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
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
e4ceabf111 oqs edit txt rechange to updated 2017-12-07 19:19:24 +06:30
Yan
8ff73b2b21 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 17:37:24 +06:30
phyusin
51ecc653f1 add current login name in checkin process 2017-12-07 16:26:11 +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
8da0c04577 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-07 14:27:15 +06:30
Yan
d35ee7ef31 add rounding adj in paypar payment 2017-12-07 14:27:02 +06:30
Aung Myo
1645f75fa3 update report excel 2017-12-07 14:05:39 +06:30
Yan
970b6f857e checkin get update 2017-12-07 13:38:41 +06:30
Yan
e4b4a3d986 rounding adj in credit and other 2017-12-07 12:19:07 +06:30