Pull from master

2018-05-14 16:00:31 +06:30
parent 11bae95ac6
commit 916dbf2cd3
14 changed files with 173 additions and 139 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"