From e1a5eda163b82f3e26da38c6d0689fe7d74b5542 Mon Sep 17 00:00:00 2001 From: nyanlinhtut Date: Fri, 21 Apr 2023 15:14:31 +0630 Subject: [PATCH] fix search order on transaction --- app/controllers/transactions/orders_controller.rb | 8 +++++--- app/models/order.rb | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/transactions/orders_controller.rb b/app/controllers/transactions/orders_controller.rb index 5cd94c3c..f5cfff61 100755 --- a/app/controllers/transactions/orders_controller.rb +++ b/app/controllers/transactions/orders_controller.rb @@ -10,10 +10,12 @@ class Transactions::OrdersController < ApplicationController if filter.nil? && from.nil? && to.nil? orders = Order.order("order_id desc") - else - from = Time.zone.parse(params[:from]).beginning_of_day - to = Time.zone.parse(params[:to]).end_of_day + elsif from.present? && to.present? + from = Time.zone.parse(params[:from]).beginning_of_day + to = Time.zone.parse(params[:to]).end_of_day orders = Order.search(filter,from,to) + elsif filter.present? + orders = Order.search(filter) end if !orders.nil? diff --git a/app/models/order.rb b/app/models/order.rb index fbdb7cdc..5bbee564 100755 --- a/app/models/order.rb +++ b/app/models/order.rb @@ -345,7 +345,7 @@ class Order < ApplicationRecord end - def self.search(filter,from,to) + def self.search(filter,from=nil,to=nil) if filter.blank? keyword = '' else