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

change stock check for dashboard query

Browse Source
This commit is contained in:
phyusin
2018-02-27 10:04:48 +06:30
parent 1b1206d735
commit 90b7a7f201
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/models/stock_journal.rb
View File

@@ -36,12 +36,20 @@ class StockJournal < ApplicationRecord
journal.save
end
def self.inventory_balances(today)
query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
def self.inventory_balances(today,from,to)
if !from.nil? && !to.nil?
query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
.joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
.where("stock_journals.created_at between '#{from}' and '#{to}'")
.group("mii.item_instance_name")
.order("mii.item_instance_name ASC")
else
query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")
.joins("join menu_item_instances mii on mii.item_instance_code=stock_journals.item_code")
.where("DATE_FORMAT(stock_journals.created_at,'%Y-%m-%d') = '#{today}'")
.group("mii.item_instance_name")
.order("mii.item_instance_name ASC")
end
end
end