Ensure 'No Order Cycle' remains selected after clicking 'Search'

app/controllers/spree/admin/reports_controller_decorator.rb

@@ -367,11 +367,15 @@ Spree::Admin::ReportsController.class_eval do
     end
 
     @search = Spree::Order.complete.not_state(:canceled).managed_by(spree_current_user).search(params[:q])
+
+    if params[:q] && params[:q][:order_cycle_id_null] == true
+      # Ensure 'No Order Cycle' remains selected
+      params[:q][:order_cycle_id_eq] = '-1'
+    end
     
     orders = @search.result
     @line_items = orders.map { |o| o.line_items.managed_by(spree_current_user) }.flatten
     #payments = orders.map { |o| o.payments.select { |payment| payment.completed? } }.flatten # Only select completed payments
-    # binding.pry
     
     @distributors = Enterprise.is_distributor.managed_by(spree_current_user)
     #@suppliers = Enterprise.is_primary_producer

app/views/spree/admin/reports/orders_and_fulfillment.html.haml

@@ -16,9 +16,9 @@
   =# f.collection_select(:supplier_id_eq, @suppliers, :id, :name, :include_blank => @include_blank)
   %br
   = label_tag nil, "Order Cycle: "
-  - order_cycles_select = [['No Order Cycle', -1]] 
-  - order_cycles_select += @order_cycles.collect {|oc| [ "#{oc.name}   (#{oc.orders_open_at.to_s(:short)} - #{oc.orders_close_at.to_s(:short)})", oc.id ] }
-  = f.select(:order_cycle_id_eq, order_cycles_select, :include_blank => @include_blank)
+  - order_cycles_select = [['No Order Cycle', '-1']]
+  - order_cycles_select += @order_cycles.collect {|oc| [ "#{oc.name}   (#{oc.orders_open_at.to_s(:short)} - #{oc.orders_close_at.to_s(:short)})".html_safe, oc.id ] }
+  = f.select(:order_cycle_id_eq, order_cycles_select, include_blank: @include_blank, selected: params[:q][:order_cycle_id_eq])
   %br
   = label_tag nil, "Report Type: "
   = select_tag(:report_type, options_for_select(@report_types, @report_type))