Merge branch 'quick_service' of bitbucket.org:code2lab/sxrestaurant into split_bill

2018-02-21 13:41:50 +06:30
parent c9780ebffc c3af21d71c
commit 75a774b6fa
8 changed files with 177 additions and 78 deletions
--- a/app/controllers/origami/payments_controller.rb
+++ b/app/controllers/origami/payments_controller.rb
@@ -157,8 +157,14 @@ class Origami::PaymentsController < BaseOrigamiController

        if params[:type] == "quick_service"
          booking = Booking.find_by_sale_id(sale_id)
+          if booking.dining_facility_id.to_i>0
+            table_id = booking.dining_facility_id
+          else
+            table_id = 0
+          end
+          
          booking.booking_orders.each do |order|
-          Order.pay_process_order_queue(order.order_id,booking.dining_facility_id)
+          Order.pay_process_order_queue(order.order_id,table_id,sale_id)
        end
    end
      end