fix search order on transaction

2023-04-21 15:14:31 +06:30
parent 7578286ee4
commit e1a5eda163
2 changed files with 6 additions and 4 deletions
--- 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?