Commit Graph

775 Commits

Author SHA1 Message Date
Aung Myo
b1fa5f1518 update add extra time 2018-01-02 12:30:57 +06:30
phyusin
23422aa5a7 fix for void and float cal: error 2017-12-29 15:08:48 +06:30
Aung Myo
2a7eb7a12a Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-12-29 14:44:27 +06:30
Aung Myo
bbd708e91d update foc error for name error 2017-12-29 14:44:01 +06:30
Aung Myo
26a11ebecd add extra charge in oroder 2017-12-29 14:39:47 +06:30
phyusin
30dac06c8a add membership type in customer 2017-12-29 12:02:40 +06:30
Aung Myo
9f04fae692 update rouding adj 2017-12-29 10:00:36 +06:30
Aung Myo
ad690c562b update rounding 0 for foc and memberdiscount 2017-12-29 09:22:22 +06:30
Aung Myo
c9f230fa70 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-12-28 18:05:44 +06:30
Aung Myo
ecb9a5f010 update void foc and credit for member discount 2017-12-28 18:02:25 +06:30
Aung Myo
d58f7d1605 update addord for extra time 2017-12-28 16:21:49 +06:30
Aung Myo
23e7c8db97 update payment control with first bill 2017-12-28 10:59:23 +06:30
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
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
Aung Myo
c0170104c9 update member discount for 5% 2017-12-15 13:57:54 +06:30
Yan
13ec405437 merge with master 2017-12-15 10:36:43 +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
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
6507ad1eb5 Merge branch 'master' into cloud 2017-12-13 18:30:39 +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
b3b443735a merge with master 2017-12-13 11:43:22 +06:30
Yan
c660097d28 no print for cloud 2017-12-12 18:51:13 +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
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
c8767dae99 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-12-08 14:59:01 +06:30
Aung Myo
e8626e78f5 update paymal response record and show double payment 2017-12-08 13:59:05 +06:30
phyusin
46bbd90df5 add fun: for checkin and checkout 2017-12-08 10:14:28 +06:30
phyusin
51ecc653f1 add current login name in checkin process 2017-12-07 16:26:11 +06:30
Yan
cb0559a1ab rounding adj fix 2017-12-07 15:06:38 +06:30
Yan
d35ee7ef31 add rounding adj in paypar payment 2017-12-07 14:27:02 +06:30
Yan
e4b4a3d986 rounding adj in credit and other 2017-12-07 12:19:07 +06:30
Aung Myo
5b9182c1d1 update rounding adj 2017-11-30 15:44:48 +06:30
Aung Myo
6cb7c1e0c4 update rounding adj 2017-11-30 12:05:01 +06:30
Aung Myo
7ce71a1960 update inventory hide and cancan update 2017-11-30 11:19:15 +06:30
Yan
0b03c243ec is card true to string 2017-11-28 17:06:46 +06:30
Yan
6cae1b613c javascript is card true 2017-11-28 16:47:12 +06:30
Yan
93db6130a1 some wrong in memberdiscount and no pay if any card payment 2017-11-28 15:57:19 +06:30