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

Inventory report

Browse Source
This commit is contained in:
Myat Zin Wai Maw
2019-06-25 10:27:31 +06:30
parent ae9d02333c
commit 438cefcc49
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/origami/payments_controller.rb
View File

@@ -102,7 +102,7 @@ class Origami::PaymentsController < BaseOrigamiController
printer = Printer::ReceiptPrinter.new(print_settings) printer = Printer::ReceiptPrinter.new(print_settings)
status, qr = KbzPay.pay(amount, receipt_no) # status, qr = KbzPay.pay(amount, receipt_no)
filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount,nil,nil,nil) filename, receipt_no, cashier_printer = printer.print_receipt_bill(print_settings,cashier_terminal,sale_items,sale_data,customer.name, item_price_by_accounts, discount_price_by_accounts, member_info, shop_detail, "Frt",current_balance,nil,other_amount,nil,nil,nil)

2
app/models/inventory_definition.rb
View File

@@ -102,7 +102,7 @@ class InventoryDefinition < ApplicationRecord
OR mii.item_instance_name LIKE ? OR mc.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%", OR mii.item_instance_name LIKE ? OR mc.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%",
"%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%") "%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%")
.group("mi.menu_category_id,inventory_definitions.item_code") .group("mi.menu_category_id,inventory_definitions.item_code")
.order("acc.title desc,mi.menu_category_id desc,balance ASC") .order("mi.name asc,acc.title desc,mi.menu_category_id desc,balance ASC")
end end
end end

2
app/models/stock_check_item.rb
View File

@@ -15,7 +15,7 @@ class StockCheckItem < ApplicationRecord
end end
def self.find_journal(item_code) def self.find_journal(item_code)
journal = StockJournal.where('item_code=?', item_code).order('created_at desc').take journal = StockJournal.where('item_code=?', item_code).order("id DESC").first
if journal if journal
return journal.id, journal.balance return journal.id, journal.balance
else else

2
config/puma.rb
View File

@@ -1,6 +1,6 @@
application_path="#{File.expand_path("../..", __FILE__)}" application_path="#{File.expand_path("../..", __FILE__)}"
directory application_path directory application_path
#environment ENV.fetch("RAILS_ENV") { "production" } environment ENV.fetch("RAILS_ENV") { "production" }
environment "production" environment "production"
pidfile "#{application_path}/tmp/puma/pid" pidfile "#{application_path}/tmp/puma/pid"
state_path "#{application_path}/tmp/puma/state" state_path "#{application_path}/tmp/puma/state"