Merge branch 'r-1902001-01-dev' of gitlab.com:code2lab/SXRestaurant into r-1902001-01-dev

app/controllers/origami/payments_controller.rb

@@ -102,6 +102,7 @@ class Origami::PaymentsController < BaseOrigamiController
 
       printer = Printer::ReceiptPrinter.new(print_settings)
 
+
       #TODO :: KBZPAY ( QR )
       # On/Off setting ( show or not qr )
       # qrCode = "00020101021202021110500346KBZ005ab0ed5c1ed09d1c4585ff1313170389160831435294600062000040732kp1e78f7efddca190042638341afb88d50200006KBZPay0106KBZPay5303MMK5802MM62170813PAY_BY_QRCODE64060002my6304FBBD"

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

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

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"