update order and request bill

app/controllers/api/bill_controller.rb

@@ -9,7 +9,7 @@ class Api::BillController < Api::ApiController
     if !ShiftSale.current_shift.nil?
     #create Bill by Booking ID
       table = 0
-      if (params[:booking_id])
+      if params[:booking_id].present?
         booking  = Booking.find(params[:booking_id])
         if booking.booking_orders.count > 0
           if booking.checkin_at.utc.strftime("%Y-%m-%d %H:%M") > Time.now.utc.strftime("%Y-%m-%d %H:%M") && booking.checkout_at.nil?
@@ -51,13 +51,6 @@ class Api::BillController < Api::ApiController
           @status = false
           @error_message = "There is no order for '#{params[:booking_id]}'"
         end
-      # elsif (params[:order_id])
-      #   order = Order.find(params[:order_id])
-      #   @status, @sale_id = Sale.generate_invoice_from_order(params[:order_id], current_login_employee, get_cashier, order.source)
-      #
-      #   # for Job
-      #   booking  = Booking.find_by_sale_id(@sale_id)
-      #   table = DiningFacility.find(booking.dining_facility_id)
       end
 
       # Bind shift sale id to sale

app/controllers/api/orders_controller.rb

@@ -67,15 +67,10 @@ class Api::OrdersController <  Api::ApiController
 
     if checkin_checkout_time(params[:booking_id])
 
-      if params[:booking_id].present?
-        booking = Booking.find(params[:booking_id])
-      end
-      if params[:table_id].present?
-        if booking.nil? || booking.dining_facility_id.to_i != params[:table_id].to_i
-          table = DiningFacility.find(params[:table_id])
-          booking = table.get_current_booking
-        end
-      end
+      table = DiningFacility.find(params[:table_id]) if params[:table_id].present?
+
+      booking = table.current_checkin_booking if table
+      booking ||= Booking.find(params[:booking_id]) if params[:booking_id].present?
 
       #for extratime
       is_extra_time = false
@@ -118,6 +113,7 @@ class Api::OrdersController <  Api::ApiController
       end
 
       @status, @booking = @order.generate
+      
       if @status && @booking
           Order.process_order_queue(@order.order_id,@order.table_id,@order.source)
       end
@@ -195,7 +191,7 @@ class Api::OrdersController <  Api::ApiController
   #checked checkin and checkout time
   def checkin_checkout_time(booking_id)
     status = true
-    if !booking_id.nil?
+    if booking_id.present?
       if booking = Booking.find(booking_id)
         if booking.checkout_at.present?
           if booking.checkout_at.utc <= Time.now.utc

app/controllers/api/restaurant/zones_controller.rb

@@ -2,8 +2,8 @@ class Api::Restaurant::ZonesController < Api::ApiController
 
   def index
       if (params[:filter] && params[:filter] = "all" )
-        @all_tables = Table.active
-        @all_rooms = Room.active
+        @all_tables = Table.includes(:zone, :current_checkin_booking, :current_checkout_booking, :current_reserved_booking).active
+        @all_rooms = Room.includes(:zone, :current_checkin_booking, :current_checkout_booking, :current_reserved_booking).active
       else
         @zones = Zone.includes([:tables, :rooms]).where("is_active = true")
       end