fixed conflict after merch dev for current shop

app/controllers/inventory/inventory_controller.rb

@@ -18,4 +18,12 @@ class Inventory::InventoryController < BaseInventoryController
       format.xls
     end
   end
+
+   	#Shop Name in Navbor
+	helper_method :shop_detail
+  
+	def shop_detail
+		@shop = Shop.current_shop
+	end
+
 end

app/controllers/inventory/inventory_definitions_controller.rb

@@ -104,6 +104,12 @@ class Inventory::InventoryDefinitionsController < BaseInventoryController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.current_shop
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_inventory_definition

app/controllers/inventory/stock_check_items_controller.rb

@@ -60,6 +60,12 @@ class Inventory::StockCheckItemsController < BaseInventoryController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.current_shop
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_stock_check_item

app/controllers/inventory/stock_checks_controller.rb

@@ -45,9 +45,10 @@ class Inventory::StockChecksController < BaseInventoryController
     member_info = nil
     unique_code = 'StockCheckPdf'
 
-    shop_details = current_shop
-    checker = Employee.find_by_id_and_shop_code(stockcheck.check_by,@shop.shop_code)
-    print_settings = PrintSetting.find_by_unique_code_and_shop_code(unique_code,@shop.shop_code)
+
+    shop_details = Shop.current_shop
+    checker = Employee.find(stockcheck.check_by)
+    print_settings = PrintSetting.find_by_unique_code(unique_code)
     if !print_settings.nil?
       printer = Printer::ReceiptPrinter.new(print_settings)
       printer.print_stock_check_result(print_settings, stockcheck, stockcheck_items, checker.name, @shop)
@@ -68,7 +69,7 @@ class Inventory::StockChecksController < BaseInventoryController
   #Shop Name in Navbor
   helper_method :shop_detail
   def shop_detail
-    @shop = current_shop
+    @shop = Shop.current_shop
   end
 
   # before_action :set_stock_check, only: [:show, :edit, :update, :destroy]

app/controllers/inventory/stock_journals_controller.rb

@@ -61,6 +61,12 @@ class StockJournalsController < ApplicationController
     end
   end
 
+  #Shop Name in Navbor
+  helper_method :shop_detail
+  def shop_detail
+    @shop = Shop.current_shop
+  end
+  
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_stock_journal