update filter in sale and order and creditnote

app/controllers/transactions/orders_controller.rb

@@ -2,23 +2,30 @@ class Transactions::OrdersController < ApplicationController
 	load_and_authorize_resource except: [:create]
 	def index
 
-		filter = params[:filter]     
-		if filter.nil?
+		filter = params[:filter]
+		from   = params[:from]
+		to     = params[:to]
+
+		if filter.nil? || from.nil? || to.nil?
 		    orders = Order.order("order_id desc")
 		else
-		    order = Order.search(filter)
-		    if order.count > 0
-		      orders = order 
-		    else
-		      orders = Order.order("order_id desc")
-		        
-		    end    
+		    orders = Order.search(filter,from,to)
+		    # if order.count > 0
+		    #   orders = order 
+		    # else
+		    #   orders = Order.order("order_id desc")  
+		    # end    
 		end    
-		    @orders = Kaminari.paginate_array(orders).page(params[:page]).per(50)
-			    respond_to do |format|
-			    format.html # index.html.erb
-			    format.json { render json: @orders }
-		    end
+		    
+		if !orders.nil?
+			@orders = Kaminari.paginate_array(orders).page(params[:page]).per(50)
+		else
+			@orders = []
+		end
+		respond_to do |format|
+			format.html # index.html.erb
+			format.json { render json: @orders }
+		end
 	end
 	
 	def show