fixed conflict

app/controllers/origami/home_controller.rb

@@ -6,7 +6,7 @@ class Origami::HomeController < BaseOrigamiController
     @rooms    = Room.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.all.order('date desc')
-    @shop     = Shop.find_by_id(1)
+    @shop     = Shop::ShopDetail
 
     # @shift = ShiftSale.current_open_shift(current_user.id)
   end
@@ -22,6 +22,10 @@ class Origami::HomeController < BaseOrigamiController
     @status_sale = ""
     @sale_array = Array.new
 
+    @shop =  Shop::ShopDetail
+    @membership = MembershipSetting::MembershipSetting
+    @payment_methods = PaymentMethodSetting.all
+
     @dining.bookings.active.each do |booking|
         if booking.sale_id.nil? && booking.booking_status != 'moved'
           @order_items = Array.new