Commit Graph

967 Commits

Author SHA1 Message Date
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
29fa95d229 license activate 2017-11-29 17:59:46 +06:30
Yan
b1d9027d5b subdomain + domain 2017-11-29 11:21:26 +06:30
Yan
9bbdb22bfb Merge branch 'master' into license 2017-11-29 10:20:27 +06:30
Yan
f29a5b95a4 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-28 19:12:02 +06:30
Aung Myo
900efb3fa6 update report 2017-11-28 19:11:19 +06:30
Yan
b394643991 license 2017-11-28 18:10:17 +06:30
Yan
f33be9e707 Merge branch 'master' into license 2017-11-28 17:07:58 +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
494d90c111 order item edit and print 2017-11-28 11:38:08 +06:30
phyusin
4192a94d47 check print copy greater than 0 in print_settings 2017-11-27 19:33:18 +06:30
phyusin
ad34002789 change query for transactions/order and transactions/bookings, transactions/credit 2017-11-27 18:16:46 +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
Yan
6eb3d9399e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-26 14:40:45 +06:30
Yan
9226a7b18d only show instance attribute in menu item selected 2017-11-26 14:40:01 +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
a5a33b269a Merge branch 'master' into license 2017-11-24 10:15:37 +06:30
Yan
840b0fc4fb Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 18:12:27 +06:30
Aung Myo
d78ba65675 update addorder and wrong tax 2017-11-23 17:34:31 +06:30
Yan
be5b3db619 uncomment void check completed 2017-11-23 17:10:58 +06:30
Yan
502b92fb98 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 12:15:01 +06:30
Yan
edd28332da Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 12:14:32 +06:30
Yan
f4898017d1 price 0 print 2017-11-23 12:14:14 +06:30
phyusin
b64229aded change UI and query for dashboard and UI for Origami/Commissions 2017-11-23 11:56:49 +06:30
Aung Myo
69dccb6770 update addorder and mem_action for additional para 2017-11-23 11:50:19 +06:30
Aung Myo
fcb3c63b2f update customer scss 2017-11-23 10:41:25 +06:30
Aung Myo
54120d7a46 update customer view and order add column table and orderby 2017-11-23 10:32:20 +06:30
Yan
3261fef3cf fix dis and payment foc and sale item report 2017-11-22 20:47:53 +06:30
Yan
06582d755e Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-22 18:40:38 +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
5b7ba0c144 update supervisor wrong spelling 2017-11-22 10:40:43 +06:30
Aung Myo
3041d6a368 update search data in transaction 2017-11-21 18:29:41 +06:30
Yan
7252e39515 merge with aung 2017-11-21 16:47:07 +06:30
Yan
ad66a6570b add popper.js.map and remove .idea 2017-11-21 16:30:56 +06:30
Aung Myo
21bd0f9575 update sqa testing feedback 2017-11-21 16:04:45 +06:30
Yan
861e554d63 fix for dining charges taxable price and ui modified 2017-11-21 12:10:53 +06:30