Commit Graph

2077 Commits

Author SHA1 Message Date
Aung Myo
900efb3fa6 update report 2017-11-28 19:11:19 +06:30
Aung Myo
20d580b2ab update foc and void for authorized 2017-11-27 13:54:21 +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
7140df5bf8 remove comment in sale item 2017-11-24 19:27:05 +06:30
Aung Myo
b611fcde97 update sale item report 2017-11-24 19:15:59 +06:30
Aung Myo
ef09042450 update sale item report 2017-11-24 19:12:33 +06:30
Yan
3809413a6f Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 19:04:55 +06:30
Aung Myo
6aed8f89c5 update sale item report 2017-11-24 19:03:53 +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
Yan
2341b6f223 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 13:11:59 +06:30
Yan
efb13024b4 add plus sign qty 2017-11-24 13:11:42 +06:30
Aung Myo
479a6b5a61 update search data in transaction 2017-11-24 13:09:22 +06:30
phyusin
1bbeba8485 Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-24 11:56:23 +06:30
phyusin
cb8aa0c8c9 change UI for other payment 2017-11-24 11:56:06 +06:30
Yan
a34706dd49 Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 10:43:14 +06:30
Aung Myo
b8df371a93 update addorder 2017-11-24 10:42:18 +06:30
Yan
80734b3642 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-24 10:41:40 +06:30
Yan
7c977e8423 amount_due >= 0 for grand total 0 2017-11-24 10:41:21 +06:30
phyusin
8277473185 change UI for sale_edit and customer in origami 2017-11-24 10:32:31 +06:30
phyusin
8a1518558b Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-24 09:38:48 +06:30
Yan
ca93f50fdf Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 19:02:03 +06:30
Aung Myo
7c39f8f7eb update addorder 2017-11-23 19:01:06 +06:30
phyusin
d87adb2dde Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-23 18:24:24 +06:30
Yan
1b06f3ec90 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 18:24:22 +06:30
phyusin
6a4acb71e8 change UI for promotions 2017-11-23 18:24:01 +06:30
Yan
840b0fc4fb Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-23 18:12:27 +06:30
Yan
25e9253fee substract total_amount - overall discount in shift sale 2017-11-23 18:12:07 +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
phyusin
acdefef6db add jquery-ui for autocomplete in CRM 2017-11-23 15:58:55 +06:30
phyusin
3d99714dfc Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes 2017-11-23 14:01:06 +06:30
phyusin
200d013060 change font-size for logout text 2017-11-23 14:00:45 +06:30
Yan
8f0b44ca7b price 0 print 2017-11-23 12:53:07 +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
phyusin
86ec4c7c80 change UI for logout 2017-11-23 11:07:21 +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
phyusin
abca17756f change UI for CRM/Customers 2017-11-23 10:14:06 +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
f8e6291d1b Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant 2017-11-22 18:39:56 +06:30