Commit Graph

450 Commits

Author SHA1 Message Date
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
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
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
Yan
442681c3a0 remove comment from void controler 2017-11-28 14:57:58 +06:30
Yan
144aea94c7 remove comment 2017-11-28 14:41:27 +06:30
Yan
0c084a1816 credit payment fix when visa assign 2017-11-27 14:24:34 +06:30
phyusin
9ad9e9ae57 change select box for item attribute in menu item instance and button UI for CRM/Queue 2017-11-27 13:33:20 +06:30
phyusin
c170974224 change promotion with menu item and menu item instance 2017-11-27 09:23:10 +06:30
Yan
87a27250b7 fix minus addorder.js and void and other origami 2017-11-26 22:23:37 +06:30
Aung Myo
74a9166620 update fixed conflicx 2017-11-25 16:51:11 +06:30
Aung Myo
2ebecc2fb2 update reports 2017-11-25 16:32:30 +06:30
Yan
3809413a6f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 19:04:55 +06:30
Aung Myo
b49f46a5c2 update sale item report 2017-11-24 18:57:01 +06:30
Yan
5beb427dfe Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 13:12:16 +06:30
Aung Myo
479a6b5a61 update search data in transaction 2017-11-24 13:09:22 +06:30
Yan
be5b3db619 uncomment void check completed 2017-11-23 17:10:58 +06:30
Yan
3261fef3cf fix dis and payment foc and sale item report 2017-11-22 20:47:53 +06:30
Yan
6beb32348d major fix taxable price for sale and other sale and oqs 2017-11-22 18:39:35 +06:30
Yan
1fd4108ac0 change all sale item 2017-11-22 12:12:27 +06:30
Aung Myo
21bd0f9575 update sqa testing feedback 2017-11-21 16:04:45 +06:30
Yan
e7cd8deb8e fix tester bugs 2017-11-17 15:51:20 +06:30
Aung Myo
393d0badc3 update customer transaction list 2017-11-17 11:47:42 +06:30
Yan
25fef8e61c check req bill cntrl 2017-11-16 21:12:16 +06:30
Yan
f18947789c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-16 20:48:58 +06:30
Aung Myo
c0733d7c48 update queue view 2017-11-16 19:26:52 +06:30
phyusin
b09061d9c2 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-16 18:19:05 +06:30
phyusin
d648bbf100 dashboard ui and checkin checkout process 2017-11-16 18:17:40 +06:30
Yan
d1765ca32c fix for oqs and add instance code to assign order item 2017-11-15 16:19:44 +06:30