Pull from master

2018-03-15 13:48:52 +06:30
parent 96f8640df7
commit 1188f6e8e9
29 changed files with 242 additions and 97 deletions
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -25,6 +25,13 @@ class Oqs::EditController < BaseOqsController
    order_item.item_order_by = current_user.name
    order_item.qty = qty_weight
    order_item.remark = remarks
+    if !order_item.set_menu_items.nil?
+      instance_item_sets = JSON.parse(order_item.set_menu_items)
+      instance_item_sets.each_with_index do |instance_item, instance_index|
+        instance_item_sets[instance_index]["quantity"] = qty_weight
+      end
+      order_item.set_menu_items = instance_item_sets.to_json
+    end
    order_item.save

    if ENV["SERVER_MODE"] != "cloud" #no print in cloud server