diff --git a/app/controllers/origami/payments_controller.rb b/app/controllers/origami/payments_controller.rb index 2a180b56..98f7d082 100755 --- a/app/controllers/origami/payments_controller.rb +++ b/app/controllers/origami/payments_controller.rb @@ -102,7 +102,7 @@ class Origami::PaymentsController < BaseOrigamiController 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) diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb index f56de536..189d8dc7 100755 --- a/app/models/inventory_definition.rb +++ b/app/models/inventory_definition.rb @@ -102,7 +102,7 @@ class InventoryDefinition < ApplicationRecord OR mii.item_instance_name LIKE ? OR mc.name LIKE ?","%#{filter}%","%#{filter}%","%#{filter}%", "%#{filter}%","%#{filter}%","%#{filter}%","%#{filter}%") .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 diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb index 05ee98a7..67e8b3aa 100755 --- a/app/models/stock_check_item.rb +++ b/app/models/stock_check_item.rb @@ -15,7 +15,7 @@ class StockCheckItem < ApplicationRecord end 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 return journal.id, journal.balance else diff --git a/config/puma.rb b/config/puma.rb index fd89392f..a0dae8b3 100755 --- a/config/puma.rb +++ b/config/puma.rb @@ -1,6 +1,6 @@ application_path="#{File.expand_path("../..", __FILE__)}" directory application_path -#environment ENV.fetch("RAILS_ENV") { "production" } +environment ENV.fetch("RAILS_ENV") { "production" } environment "production" pidfile "#{application_path}/tmp/puma/pid" state_path "#{application_path}/tmp/puma/state"