diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb index d8a56cc6..55fd7d43 100755 --- a/app/controllers/inventory/stock_checks_controller.rb +++ b/app/controllers/inventory/stock_checks_controller.rb @@ -1,7 +1,21 @@ class Inventory::StockChecksController < BaseInventoryController def index @check = StockCheck.new - @inventory_definitions = InventoryDefinition.active.all + @inventory_definitions1 = InventoryDefinition.active.all + + @inventory_definitions = InventoryDefinition.select("inventory_definitions.*, + 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("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 ") + .group("mi.menu_category_id,inventory_definitions.item_code") + .order("mi.menu_category_id desc") + + puts @inventory_definitions.count + puts @inventory_definitions1.count + puts @inventory_definitions.to_json end def create diff --git a/app/models/stock_check_item.rb b/app/models/stock_check_item.rb index b9a95ef2..05ee98a7 100755 --- a/app/models/stock_check_item.rb +++ b/app/models/stock_check_item.rb @@ -45,7 +45,8 @@ class StockCheckItem < ApplicationRecord end def self.get_items_with_category(id) - query = StockCheckItem.select("stock_check_items.*,acc.title as account_name,mi.name as item_name, + query = StockCheckItem.select("stock_check_items.*,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("JOIN menu_item_instances mii ON mii.item_instance_code = stock_check_items.item_code" + diff --git a/app/views/inventory/stock_checks/index.html.erb b/app/views/inventory/stock_checks/index.html.erb index 667a172e..5ec971d8 100755 --- a/app/views/inventory/stock_checks/index.html.erb +++ b/app/views/inventory/stock_checks/index.html.erb @@ -33,9 +33,9 @@ <% end %>