fixed conflict after merch dev for current shop

2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
--- a/app/controllers/inventory/stock_check_items_controller.rb
+++ b/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