git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change create order

Browse Source
This commit is contained in:
phyusin
2018-02-21 14:18:37 +06:30
parent 3534a887fc
commit 0392854f90
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/controllers/origami/split_bill_controller.rb
View File

@@ -208,7 +208,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
# begin # 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}) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
@@ -250,7 +250,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
# begin # 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}) BookingOrder.create({:booking_id => booking.booking_id, :order_id => order.order_id})
@@ -277,7 +277,7 @@ class Origami::SplitBillController < BaseOrigamiController
end end
# begin # 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}) 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.employee_name = current_user.name
order.guest_info = nil order.guest_info = nil
order.save! order.save!
return order
end end
def update_order_item(order_id, order_item) 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.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 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\"}]" "[{\"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 end
orderItem.set_menu_items = instance_item_sets.to_json orderItem.set_menu_items = instance_item_sets.to_json
else
set_menu_items_obj = nil
end end
OrderItem.processs_item(orderItem.item_code, OrderItem.processs_item(orderItem.item_code,