update pending and quick service

2018-02-15 15:26:34 +06:30
parent a8fdf2ec30
commit cf644892c9
9 changed files with 164 additions and 27 deletions
--- a/app/controllers/origami/pending_order_controller.rb
+++ b/app/controllers/origami/pending_order_controller.rb
@@ -9,8 +9,15 @@ class Origami::PendingOrderController < BaseOrigamiController
    @sale = Sale.find(params[:sale_id])
    @order = SaleOrder.find_by_sale_id(@sale.sale_id).order_id
    @booking = BookingOrder.find_by_order_id(@order).booking_id
-    @table_id = Booking.find(@booking).dining_facility_id
-    @dining  = DiningFacility.find(@table_id)
+    puts "sssssssssss"
+    puts @booking
+    if Booking.find(@booking).dining_facility_id.to_i > 0
+      @table_id = Booking.find(@booking).dining_facility_id
+      @dining  = DiningFacility.find(@table_id)
+    else
+      @table_id = nil
+      @dining  = nil
+    end
  end
   helper_method :shop_detail
  def shop_detail