diff --git a/app/controllers/origami/split_bill_controller.rb b/app/controllers/origami/split_bill_controller.rb index 6aedd516..88828d1b 100644 --- a/app/controllers/origami/split_bill_controller.rb +++ b/app/controllers/origami/split_bill_controller.rb @@ -208,7 +208,7 @@ class Origami::SplitBillController < BaseOrigamiController end # begin - create_order(params,order_type,order_items.count,current_user) + order = create_order(params,order_type,order_items.count,current_user) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id}) @@ -250,7 +250,7 @@ class Origami::SplitBillController < BaseOrigamiController end # begin - create_order(params,order_type,order_items.count,current_user) + order = create_order(params,order_type,order_items.count,current_user) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id}) @@ -277,7 +277,7 @@ class Origami::SplitBillController < BaseOrigamiController end # begin - create_order(params,order_type,order_items.count,current_user) + order = create_order(params,order_type,order_items.count,current_user) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id}) @@ -314,6 +314,8 @@ class Origami::SplitBillController < BaseOrigamiController order.employee_name = current_user.name order.guest_info = nil order.save! + + return order end def update_order_item(order_id, order_item) @@ -325,11 +327,9 @@ class Origami::SplitBillController < BaseOrigamiController instance_item_sets.each_with_index do |instance_item, instance_index| instance_item_sets[instance_index]["quantity"] = (instance_item["quantity"].to_i - order_item['qty'].to_i).to_s "[{\"item_instance_code\":\"psi002in001\",\"quantity\":\"2\",\"price\":\"5500.0\"}]" - set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'], 'price' => instance_item["price"]}) + set_menu_items_obj.push({'item_instance_code' => instance_item["item_instance_code"], 'quantity' => order_item['qty'].to_i, 'price' => instance_item["price"]}) end orderItem.set_menu_items = instance_item_sets.to_json - else - set_menu_items_obj = nil end OrderItem.processs_item(orderItem.item_code,