conflict data

app/controllers/origami/home_controller.rb

@@ -8,8 +8,9 @@ class Origami::HomeController < BaseOrigamiController
     @rooms    = Room.unscoped.all.active.order('status desc')
     @complete = Sale.where("DATE_FORMAT(created_at,'%Y-%m-%d') = ? and sale_status != 'new'",DateTime.now.strftime('%Y-%m-%d'))
     @orders   = Order.includes("sale_orders").where("DATE_FORMAT(date,'%Y-%m-%d') = ? and status != 'billed' and source != 'quick_service'",DateTime.now.strftime('%Y-%m-%d')).order('date desc')
-    @shop     = Shop.first
+
     @customers = Customer.pluck("customer_id, name")
+    @shop     = shop_detail
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
 
@@ -27,7 +28,7 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
-    @shop =  Shop.first
+    @shop =  shop_detail
     @membership = MembershipSetting::MembershipSetting
     @payment_methods = PaymentMethodSetting.all
     @dining_booking = @dining.bookings.active.where("DATE_FORMAT(created_at,'%Y-%m-%d') = '#{DateTime.now.strftime('%Y-%m-%d')}' OR DATE_FORMAT(created_at,'%Y-%m-%d') = '#{Date.today.prev_day}' ")