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

2018-03-29 16:16:33 +06:30
parent 386c5291a1 1c13b04697
commit d279c548a1
4 changed files with 35 additions and 24 deletions
--- a/app/controllers/oqs/edit_controller.rb
+++ b/app/controllers/oqs/edit_controller.rb
@@ -3,6 +3,7 @@ class Oqs::EditController < BaseOqsController
  	assigned_item_id = params[:id]
    @link_type = params[:type]
    @dining_type = nil
+    @booking = nil
    if params[:type] == 'oqs'
      assigned_item = AssignedOrderItem.find(assigned_item_id)
      @order_item = OrderItem.where("order_id='#{ assigned_item.order_id }' AND item_instance_code='#{ assigned_item.instance_code }'")