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

update sotck check

Browse Source
This commit is contained in:
Aung Myo
2018-09-24 15:55:35 +06:30
parent 944ccc1cec
commit 0158f007fa
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,21 @@
class Inventory::StockChecksController < BaseInventoryController class Inventory::StockChecksController < BaseInventoryController
def index def index
@check = StockCheck.new @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 end
def create def create

3
app/models/stock_check_item.rb
View File

@@ -45,7 +45,8 @@ class StockCheckItem < ApplicationRecord
end end
def self.get_items_with_category(id) 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," + mii.item_instance_name as instance_name," +
"mc.name as menu_category_name,mc.id as menu_category_id ") "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" + .joins("JOIN menu_item_instances mii ON mii.item_instance_code = stock_check_items.item_code" +

4
app/views/inventory/stock_checks/index.html.erb
View File

@@ -33,9 +33,9 @@
<option value="<%= id.item_code %>"> <option value="<%= id.item_code %>">
<% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %> <% menu_item = MenuItemInstance.find_by_item_instance_code(id.item_code) %>
<% if menu_item.nil? %> <% if menu_item.nil? %>
<%= Product.find_by_item_code(id.item_code).name rescue "-" %> <%= Product.find_by_item_code(id.item_code).name rescue "-" %>
<% else %> <% else %>
<%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %> <%= menu_item.menu_item.name rescue '-' %> - <%= menu_item.item_instance_name rescue '-' %>
<% end %> <% end %>
</option> </option>
<% end %> <% end %>