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

fix search order on transaction

Browse Source
This commit is contained in:
nyanlinhtut
2023-04-21 15:14:31 +06:30
parent 7578286ee4
commit e1a5eda163
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,10 +10,12 @@ class Transactions::OrdersController < ApplicationController
if filter.nil? && from.nil? && to.nil? if filter.nil? && from.nil? && to.nil?
orders = Order.order("order_id desc") orders = Order.order("order_id desc")
else elsif from.present? && to.present?
from = Time.zone.parse(params[:from]).beginning_of_day from = Time.zone.parse(params[:from]).beginning_of_day
to = Time.zone.parse(params[:to]).end_of_day to = Time.zone.parse(params[:to]).end_of_day
orders = Order.search(filter,from,to) orders = Order.search(filter,from,to)
elsif filter.present?
orders = Order.search(filter)
end end
if !orders.nil? if !orders.nil?

2
app/models/order.rb
View File

@@ -345,7 +345,7 @@ class Order < ApplicationRecord
end end
def self.search(filter,from,to) def self.search(filter,from=nil,to=nil)
if filter.blank? if filter.blank?
keyword = '' keyword = ''
else else