Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

2018-05-14 15:42:35 +06:30
parent 1c8ea30efa e264e7a32b
commit 39dce3424e
9 changed files with 125 additions and 36 deletions
--- a/app/assets/javascripts/addorder.js
+++ b/app/assets/javascripts/addorder.js
@@ -1373,7 +1373,7 @@ $(function() {
                if (JSON.stringify(menu_items[field].item_sets)!='[]') {
                  fa_plus = '';
                  add = '';
-                  menu_item_box = 'add_icon';
+                  menu_item_box = 'set_add_icon';
                  data_target = 'sx_item_set_detailModal';
                  data_modal = 'modal'
                  add_icon = "set_item_box"
--- a/app/assets/stylesheets/addorder.scss
+++ b/app/assets/stylesheets/addorder.scss
@@ -270,4 +270,8 @@ i.logout_icon{

 .border-left{
  border-left:1px solid #fff;
+}
+
+.set_add_icon{
+  display:none;
 }