Commit Graph

236 Commits

Author SHA1 Message Date
phyusin
0af1e5997f remove blank in account type 2017-11-30 11:18:08 +06:30
phyusin
f669101d3c remove blank in collection select for menu item and menu item instance 2017-11-28 14:57:18 +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
9226a7b18d only show instance attribute in menu item selected 2017-11-26 14:40:01 +06:30
phyusin
6a4acb71e8 change UI for promotions 2017-11-23 18:24:01 +06:30
Aung Myo
69dccb6770 update addorder and mem_action for additional para 2017-11-23 11:50:19 +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
Yan
6beb32348d major fix taxable price for sale and other sale and oqs 2017-11-22 18:39:35 +06:30
Aung Myo
fafd6df5e1 update addorder and show_account_info add shops 2017-11-22 16:49:34 +06:30
phyusin
afcf7725f5 change UI for all settings module 2017-11-22 16:28:17 +06:30
phyusin
efa591524f origami discount UI 2017-11-21 17:44:43 +06:30
phyusin
0b374cf3b2 change UI for simple menu item, promotion, setting/OQS 2017-11-21 17:41:05 +06:30
Aung Myo
01bf7caeb5 update oragimi view 2017-11-21 17:21:31 +06:30
Yan
7252e39515 merge with aung 2017-11-21 16:47:07 +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
Aung Myo
6360a914b4 update add order for popup qty 2017-11-16 14:23:51 +06:30
Aung Myo
bf0a8135f6 update rebate for credit and redeem 2017-11-15 17:54:59 +06:30
Aung Myo
8db96beca0 update oqs view an d promotion form update 2017-11-10 14:32:21 +06:30
Aung Myo
f8cd712ad1 update feedback testing 2017-11-09 17:25:54 +06:30
Aung Myo
cb91ad307a update shop form 2017-11-09 14:40:15 +06:30
Yan
8aa834a487 delete btn for menu item instance 2017-11-07 17:31:14 +06:30
Yan
7b2f928df0 test for jade 2017-11-07 12:32:50 +06:30
Yan
17afb039cb update commission 2017-11-07 10:52:57 +06:30
Yan
4fa0705f1c Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:32:48 +06:30
Aung Myo
b48625e25e update commission and seed for font 2017-11-07 10:31:10 +06:30
Yan
8f69caff2d Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant 2017-11-07 10:29:27 +06:30
phyusin
70a908158f fix for checkbox in promotion and Back btn fix for Customers in Origami 2017-11-06 16:02:01 +06:30
Aung Myo
ce49f81440 update update void print and sale item report 2017-11-06 13:42:04 +06:30
Aung Myo
cfa819f985 fixed conflic 2017-10-31 12:13:19 +06:30
Aung Myo
56940d7f00 update sale audit 2017-10-31 12:08:27 +06:30
Yan
c1db3ba8be merge with aung myo 2017-10-30 18:52:48 +06:30
Yan
da0558b5ef remove turbolinks in form for conflict 2017-10-30 17:26:38 +06:30
Aung Myo
a687b45193 update adminbsbs 2017-10-30 12:14:11 +06:30
Yan
8169da4d52 edit product form 2017-10-30 10:29:02 +06:30
Yan
ae5dfaf192 test for no work js,it cause by turbolink 2017-10-29 14:20:24 +06:30
Yan
6f6c037e9e merge with phyu sin 2017-10-27 18:40:58 +06:30
Yan
0f24cc0999 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 17:02:17 +06:30
phyusin
ef05aec1db add localization for all form data 2017-10-27 17:00:56 +06:30
Yan
61c9fd0c81 test for js 2017-10-27 16:53:32 +06:30
phyusin
d916c262d7 validation for commission, commissioner 2017-10-27 13:51:45 +06:30
Aung Myo
b4005efa1b fixed conflic 2017-10-27 13:25:13 +06:30
Aung Myo
188d091884 update checkout all formm 2017-10-27 13:17:32 +06:30
Yan
62ce53c978 Merge branch 'adminbsb_ui_changes' of bitbucket.org:code2lab/sxrestaurant into adminbsb_material_ui 2017-10-27 11:40:39 +06:30
Yan
18aa3d1e0f ui updated 2017-10-27 11:37:47 +06:30
phyusin
a57b0760fb change right panel text for promotion 2017-10-27 11:13:36 +06:30
Yan
4607321726 merge with origin 2017-10-26 17:58:43 +06:30
Yan
0da1aeaeb9 ui review and edited 2017-10-26 17:54:22 +06:30