git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed conflict after merch dev for current shop

Browse Source
This commit is contained in:
Nweni
2019-12-02 19:30:24 +06:30
parent 6ad2f320df 937f40e7c1
commit 417d64ecae
92 changed files with 1611 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/inventory/stock_checks_controller.rb
View File

@@ -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]