Merge branch 'adminbsb_material_ui' of bitbucket.org:code2lab/sxrestaurant

2017-11-07 10:32:48 +06:30
parent 8f69caff2d b48625e25e
commit 4fa0705f1c
19 changed files with 309 additions and 21 deletions
--- a/app/assets/javascripts/settings/processing_items.js
+++ b/app/assets/javascripts/settings/processing_items.js
@@ -40,7 +40,12 @@ $(document).ready(function() {
      items.push($(value).attr("data-id"));
    });

-    $("#order_queue_station_processing_items").val(JSON.stringify(items));
-    //$(this).submit();
+    
+    if ($(this).attr('data_name')=="assign_product") {
+      $("#commission_product_code").val(JSON.stringify(items));
+    }else{
+      $("#order_queue_station_processing_items").val(JSON.stringify(items));
+    }
+    $(this).submit();
  })
 })