diff --git a/app/controllers/inventory/stock_checks_controller.rb b/app/controllers/inventory/stock_checks_controller.rb index d8a56cc6..06db5c5f 100755 --- a/app/controllers/inventory/stock_checks_controller.rb +++ b/app/controllers/inventory/stock_checks_controller.rb @@ -1,7 +1,15 @@ class Inventory::StockChecksController < BaseInventoryController def index @check = StockCheck.new - @inventory_definitions = InventoryDefinition.active.all + # @inventory_definitions1 = InventoryDefinition.active.all + + @category = InventoryDefinition.select("inventory_definitions.*,"+ + "mc.name as name,mc.id as 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") + .order("mi.menu_category_id desc") end def create @@ -42,6 +50,19 @@ class Inventory::StockChecksController < BaseInventoryController end end + def get_menu_category () + if (params[:id]) + + #Pull this menu + @menu_category = InventoryDefinition.search_by_category(params[:id]) + puts @menu_category.to_json + # puts @menu.menu_items[1].item_attributes.to_json + return @menu_category + else + MenuCategory.current_menu + end + end + #Shop Name in Navbor helper_method :shop_detail def shop_detail diff --git a/app/models/inventory_definition.rb b/app/models/inventory_definition.rb index 56f726bb..377ac153 100755 --- a/app/models/inventory_definition.rb +++ b/app/models/inventory_definition.rb @@ -61,4 +61,21 @@ class InventoryDefinition < ApplicationRecord end end end + + def self.search_by_category(cat_id) + @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 ") + .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 ") + .where("mc.id=#{cat_id}") + .group("mi.menu_category_id,inventory_definitions.item_code") + .order("mi.menu_category_id desc") + + + + end + end 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/inventory_definitions/backup_form.html.erb b/app/views/inventory/inventory_definitions/_backupform.html.erb similarity index 100% rename from app/views/inventory/inventory_definitions/backup_form.html.erb rename to app/views/inventory/inventory_definitions/_backupform.html.erb diff --git a/app/views/inventory/inventory_definitions/_form.html.erb b/app/views/inventory/inventory_definitions/_form.html.erb index 9cd2acb4..d99a4974 100644 --- a/app/views/inventory/inventory_definitions/_form.html.erb +++ b/app/views/inventory/inventory_definitions/_form.html.erb @@ -73,7 +73,11 @@ - " id="server_mode"> +
+ +