update order and request bill

2019-12-11 17:56:39 +06:30
parent 26edf23b46
commit 58117d0f48
28 changed files with 336 additions and 448 deletions
--- a/app/controllers/api/restaurant/zones_controller.rb
+++ b/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