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

update commission && report

Browse Source
This commit is contained in:
Aung Myo
2018-05-24 14:03:49 +06:30
parent b4d421fdcf
commit 6d6d90050f
6 changed files with 70 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/product_commission.rb
View File

@@ -61,9 +61,10 @@ class ProductCommission < ApplicationRecord
end
def self.get_transaction(from, to, commissioner)
transaction = all
transaction = ProductCommission.select("product_commissions.*,menu_items.name as porduct_name")
.joins("join menu_items on menu_items.item_code = product_commissions.product_code")
if !from.nil? && !to.nil?
transaction = transaction.where('updated_at between ? and ?', from, to)
transaction = transaction.where('product_commissions.updated_at between ? and ?', from, to)
end
if commissioner != 0
transaction = transaction.where(commissioner_id: commissioner)