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

Edit filter

Browse Source
This commit is contained in:
San Wai Lwin
2018-08-06 13:52:47 +06:30
parent af6aae5cb6
commit 10d93a658c
6 changed files with 40 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/transactions/card_sale_trans_controller.rb
View File

@@ -9,13 +9,11 @@ class Transactions::CardSaleTransController < ApplicationController
["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"],
["Alipay Payment","alipay"]]
@sales = Sale.all
# byebug
payment_type = params[:payment_type]
sale_id = params[:sale_id]
status_type = params[:status_type]
# from = params[:from]
# to = params[:to]
from, to = get_date_range_from_params
if sale_id.nil? && from.nil? && to.nil? && payment_method.nil? && status_type.nil?

11
app/controllers/transactions/card_settle_trans_controller.rb
View File

@@ -9,22 +9,21 @@ class Transactions::CardSettleTransController < ApplicationController
["Master Payment","master"], ["JCB Payment","jcb"],["UnionPay Payment","unionpay"],
["Alipay Payment","alipay"]]
@sales = Sale.all
# byebug
payment_type = params[:payment_type]
sale_id = params[:sale_id]
cashier_name = params[:cashier_name]
status_type = params[:status_type]
# from = params[:from]
# to = params[:to]
from, to = get_date_range_from_params
if sale_id.nil? && from.nil? && to.nil? && payment_method.nil? && status_type.nil?
if cashier_name.nil? && from.nil? && to.nil? && payment_method.nil? && status_type.nil?
@cardSettles = CardSettleTran.order("sale_id desc")
@cardSettles = Kaminari.paginate_array(@cardSettles).page(params[:page]).per(20)
else
cardSettle = CardSettleTran.search(sale_id,from,to,payment_type,status_type)
cardSettle = CardSettleTran.search(cashier_name,from,to,payment_type,status_type)
if cardSettle.count > 0
@cardSettles = cardSettle
@cardSettles = Kaminari.paginate_array(@cardSettles).page(params[:page]).per(20)