git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update inventory form and list

Browse Source
This commit is contained in:
Aung Myo
2018-09-20 16:52:15 +06:30
parent ee56ccea21
commit 5a155f596d
8 changed files with 131 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/controllers/inventory/inventory_controller.rb
View File

@@ -12,13 +12,34 @@ class Inventory::InventoryController < BaseInventoryController
@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")
.joins(" LEFT JOIN stock_journals sj ON sj.inventory_definition_id=inventory_definitions.id")
.group("inventory_definitions.item_code")
.order("balance ASC")
(#{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")
.group("mi.menu_category_id,inventory_definitions.item_code")
.order("acc.title desc,mi.menu_category_id desc,balance ASC")
end
# def self.get_item_query(type)
# query = Sale.select("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 ")
# query = query.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 ")
# query = query.joins(" JOIN accounts acc ON acc.id = mi.account_id")
# query = query.group("acc.title,mi.account_id,mi.menu_category_id")
# .order("acc.title desc, mi.account_id desc, mi.menu_category_id desc")
# end
def show
inventory_definition_id = params[:inventory_definition_id]
inventory = InventoryDefinition.find(inventory_definition_id)

5
app/controllers/inventory/stock_checks_controller.rb
View File

@@ -12,7 +12,10 @@ class Inventory::StockChecksController < BaseInventoryController
end
def show
@check = StockCheck.find(params[:id])
@check = StockCheck.find(params[:id])
@stock_check_items = StockCheckItem.get_items_with_category(params[:id])
end
def save_to_journal