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

add filter in dashboard and Transaction/Sale

Browse Source
This commit is contained in:
phyusin
2018-03-26 16:42:17 +06:30
parent 6bb833aff3
commit 4b78de3f9a
6 changed files with 972 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

850
app/models/sale.rb
View File

File diff suppressed because it is too large Load Diff

10
app/models/stock_journal.rb
View File

@@ -36,12 +36,16 @@ class StockJournal < ApplicationRecord
journal.save
end
def self.inventory_balances(today,from,to)
def self.inventory_balances(today,from,to,from_time,to_time)
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")
if !from_time.nil? && !to_time.nil?
query = query.where("DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}'")
else
query = query.where("DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%Y-%m-%d') between '#{from}' and '#{to}' and DATE_FORMAT(CONVERT_TZ(stock_journals.created_at,'+00:00','+06:30'),'%H:%M') between '#{from_time}' and '#{to_time}'")
end
query = query.group("mii.item_instance_name")
.order("mii.item_instance_name ASC")
else
query = StockJournal.select("mii.item_instance_name as item_instance_name,balance")