From 93b293af0697ebd8154a9df98a5e3e2f35f2c6f0 Mon Sep 17 00:00:00 2001
From: NyanLinHtut <nyanlinhtut@code2lab.com>
Date: Wed, 26 Feb 2020 16:50:10 +0630
Subject: [PATCH] fixed inventroy

---
 app/models/inventory_definition.rb | 49 ++++++++++++++++--------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb
index a1e06505..a7f91477 100755
--- a/app/models/inventory_definition.rb
+++ b/app/models/inventory_definition.rb
@@ -1,5 +1,8 @@
 class InventoryDefinition < ApplicationRecord
 
+  has_many :stock_journals
+  has_one :menu_item_instance, foreign_key: "item_instance_code", primary_key: "item_code"
+
   scope :active, -> {where(:is_active => true)}
 
   def self.calculate_product_count(saleObj=nil,saleobj_after_req_bill=nil)
@@ -69,7 +72,7 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.search_by_category(cat_id)
-     @inventory_definitions =   InventoryDefinition.select("inventory_definitions.*,
+     inventory_definitions =   InventoryDefinition.select("inventory_definitions.*,
                  mi.name as item_name,mii.item_instance_name as instance_name," +
                  "mi.item_code as item_code,mii.item_instance_code as instance_code," +
                 "mc.name as menu_category_name,mc.id as menu_category_id ")
@@ -82,29 +85,29 @@ class InventoryDefinition < ApplicationRecord
   end
 
   def self.get_by_category(filter)
-    least_stock = StockJournal.select(:balance)
-                  .where('stock_journals.updated_at = (SELECT MAX(stock_journals.updated_at) FROM stock_journals WHERE (stock_journals.item_code = inventory_definitions.item_code))')
-                  .order(:id => :desc).to_sql
+    least_stock = StockJournal.select(:inventory_definition_id, :credit, :debit, :balance)
+                  .joins("JOIN (
+                    #{StockJournal.select("item_code, MAX(created_at) created_at").group(:item_code).to_sql}) last_stock_journals
+                    ON last_stock_journals.item_code = stock_journals.item_code
+                    AND last_stock_journals.created_at = stock_journals.created_at").to_sql
 
-    @inventory_definitions = InventoryDefinition.select("inventory_definitions.*,
-                (CASE WHEN sj.credit IS NULL THEN 0 ELSE sj.credit END) as credit,
-                (CASE WHEN sj.debit IS NULL THEN 0 ELSE sj.debit END) as debit,
-                (#{least_stock}) as balance,"+
-                "acc.title as account_name,mi.name as item_name,
-                 mii.item_instance_name as instance_name," +
-                "mc.name as menu_category_name,mc.id as menu_category_id "
-                )
-                .joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")
-                .joins("JOIN menu_item_instances mii ON mii.item_instance_code = inventory_definitions.item_code" +
-                     " JOIN menu_items mi ON mi.id = mii.menu_item_id" +
-                     " JOIN menu_categories mc ON mc.id = mi.menu_category_id ")
-                .joins(" JOIN accounts acc ON acc.id = mi.account_id")
-                .where("inventory_definitions.item_code LIKE ? OR inventory_definitions.min_order_level LIKE ?
-                  OR inventory_definitions.max_stock_level LIKE ? OR sj.balance LIKE ? OR mi.name LIKE ?
-                  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("balance asc, mi.name asc,acc.title desc,mi.menu_category_id desc")
+    inventory_definitions = InventoryDefinition
+                .select("inventory_definitions.*,
+                  stock_journals.credit as credit,
+                  stock_journals.debit as debit,
+                  stock_journals.balance as balance,
+                  accounts.title as account_name,
+                  menu_items.name as item_name,
+                  menu_item_instances.item_instance_name as instance_name,
+                  menu_categories.name as menu_category_name,
+                  menu_categories.id as menu_category_id")
+                .joins("LEFT JOIN (#{least_stock}) stock_journals on stock_journals.inventory_definition_id = inventory_definitions.id")
+                .joins(menu_item_instance: { menu_item: [:menu_category, :account]})
+                .where("inventory_definitions.item_code LIKE :filter OR inventory_definitions.min_order_level LIKE :filter
+                  OR inventory_definitions.max_stock_level LIKE :filter OR stock_journals.balance LIKE :filter OR menu_items.name LIKE :filter
+                  OR menu_item_instances.item_instance_name LIKE :filter OR menu_categories.name LIKE :filter", filter: "%#{filter}%")
+                .group("menu_items.menu_category_id, inventory_definitions.item_code")
+                .order("balance asc, menu_items.name asc, accounts.title desc, menu_items.menu_category_id desc")
   end
 
 end