fix conflict

app/controllers/origami/quick_service_controller.rb

@@ -10,27 +10,24 @@ class Origami::QuickServiceController < ApplicationController
   def index
     today = DateTime.now
     day = Date.today.wday
-    # if params[:menu] == "true"
+
     @menus    = []
     @menu     = []
-    # else
-    #    @menus    = Menu.all
-    #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
-    # end
     @zone     = Zone.all
     @customer = Customer.all
-    @tables   = Table.all.active.order('status desc')
-    @rooms    = Room.all.active.order('status desc')
+    @tables   = Table.active.order('status desc')
+    @rooms    = Room.active.order('status desc')
     @cashier_type = "quick_service"
     display_type = Lookup.find_by_lookup_type("display_type")
-    if !display_type.nil? && display_type.value.to_i ==2
+    if !display_type.nil? && display_type.value.to_i == 2
       @display_type = display_type.value
     else
       @display_type = nil
     end
 
     #checked quick_service only
-    @quick_service_only = false
+    @quick_service_only = Lookup.collection_of('quickservice_add_order').any? { |x| x == ["quickserviceaddorder", "1"] }
+
     lookup_dine_in = Lookup.collection_of('quickservice_add_order')
     # puts 'lookup_dine_in!!!!'
     # puts lookup_dine_in
@@ -74,7 +71,7 @@ class Origami::QuickServiceController < ApplicationController
     #    @menus    = Menu.all
     #    @menu     = MenuCategory.active.where("menu_id =#{@menus[0].id}").order('order_by asc')
     # end
-    if(params[:id][0,3] == "BKI")
+    if params[:id].include? "BKI"
       @table_id = nil
       @table = nil
       @booking = Booking.find(params[:id])
@@ -131,7 +128,7 @@ class Origami::QuickServiceController < ApplicationController
     order = Order.new
     order.source = params[:order_source]
     order.order_type = params[:order_type]
-    order.customer_id = params[:customer_id] == ""? "CUS-000000000001" : params[:customer_id] # for no customer id from mobile
+    order.customer_id = params[:customer_id].present? ? params[:customer_id] : walkin.customer_id # for no customer id from mobile
     order.items = items_arr
     order.guest = params[:guest_info]
     order.table_id = params[:table_id]  # this is dining facilities's id