Commit Graph

1064 Commits

Author SHA1 Message Date
Nweni
e19dc3313d fixed conflict 2017-12-27 16:45:15 +06:30
Nweni
ede876ea27 index / home 2017-12-27 16:42:37 +06:30
phyusin
3d235f9d69 add alert_time_min in api/checkin and check for waiter login 2017-12-27 10:30:22 +06:30
Aung Myo
a525babf9a update order queue printer for bitp k5 problem 2017-12-26 16:19:25 +06:30
Yan
c9f44e5f21 license disable 2017-12-22 17:51:21 +06:30
Yan
1ec0754d0d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-22 16:37:09 +06:30
Yan
11d9912401 license updated 2017-12-22 16:35:04 +06:30
Yan
da4af7bfc5 license updated 2017-12-22 16:33:12 +06:30
phyusin
d904784e61 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-21 18:08:22 +06:30
phyusin
43b8fffc11 change rebate with creditnote in payment controller 2017-12-21 17:22:03 +06:30
phyusin
fcc7571223 check current balance for rebate member & change firstbill fun: 2017-12-21 15:46:48 +06:30
Aung Myo
12f5e42d44 update comment for rounding adj 2017-12-21 10:49:25 +06:30
Aung Myo
e0d97470cc update membership discount firstbill 2017-12-21 10:35:09 +06:30
Aung Myo
802b51eab4 update roundign adj and member discount in first bill 2017-12-20 17:11:27 +06:30
Yan
3be8a56ac6 need to fix license 2017-12-19 16:54:11 +06:30
Yan
368405451f need to fix license 2017-12-19 11:49:03 +06:30
Aung Myo
aec3b17127 upate call waiter print 2017-12-15 17:58:38 +06:30
Aung Myo
9f41be5c99 upate call waiter print 2017-12-15 17:55:02 +06:30
phyusin
60a58bc948 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-15 15:18:25 +06:30
Aung Myo
c0170104c9 update member discount for 5% 2017-12-15 13:57:54 +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
dfbae46696 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-14 17:10:40 +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