Merge pull request #11732 from yasirazgar/11612_keep_data_range_reports

Maintain date range values in the report forms

app/views/admin/reports/_date_range_form.html.haml

@@ -1,10 +1,13 @@
 -# Field used for ransack search. This date range is mostly used for Spree::Order
 -# so default field is 'completed_at'
 - field ||= 'completed_at'
+- start_date ||= params[:q].try(:[], :completed_at_gt)
+- end_date ||= params[:q].try(:[], :completed_at_lt)
+
 .row.date-range-filter
   .alpha.two.columns= label_tag nil, t(:date_range)
   .omega.fourteen.columns
-    = f.text_field "#{field}_gt", :class => 'datetimepicker datepicker-from', :placeholder => t(:start), data: { controller: "flatpickr", "flatpickr-enable-time-value": true, "flatpickr-default-date-value": "startOfDay" }
+    = f.text_field "#{field}_gt", :class => 'datetimepicker datepicker-from', :placeholder => t(:start), data: { controller: "flatpickr", "flatpickr-enable-time-value": true, "flatpickr-default-date-value": "startOfDay" }, value: start_date 
     %span.range-divider
       %i.icon-arrow-right
-    = f.text_field "#{field}_lt", :class => 'datetimepicker datepicker-to', :placeholder => t(:stop), data: { controller: "flatpickr", "flatpickr-enable-time-value": true, "flatpickr-default-date-value": "endOfDay" }
+    = f.text_field "#{field}_lt", :class => 'datetimepicker datepicker-to', :placeholder => t(:stop), data: { controller: "flatpickr", "flatpickr-enable-time-value": true, "flatpickr-default-date-value": "endOfDay" }, value: end_date 

app/views/admin/reports/filters/_packing.html.haml

@@ -1,4 +1,5 @@
-= render partial: 'admin/reports/date_range_form', locals: { f: f, field: 'order_completed_at' }
+= render partial: 'admin/reports/date_range_form', 
+         locals: { f: f, field: 'order_completed_at', start_date: params[:q].try(:[], :order_completed_at_gt), end_date: params[:q].try(:[], :order_completed_at_lt) }
 
 .row
   .alpha.two.columns= label_tag nil, t(:report_hubs)

spec/system/admin/reports/packing_report_spec.rb

@@ -65,6 +65,9 @@ describe "Packing Reports" do
                                "Quantity", "TempControlled?"].map(&:upcase)
                             ])
         expect(page).to have_selector 'table.report__table tbody tr', count: 5 # Totals row/order
+
+        # date range is kept after form submission
+        check_prefilled_dates
       end
 
       it "sorts alphabetically" do
@@ -84,6 +87,9 @@ describe "Packing Reports" do
                               order2.bill_address.lastname,
                               ""
                             ])
+
+        # date range is kept after form submission
+        check_prefilled_dates
       end
     end
 
@@ -106,6 +112,9 @@ describe "Packing Reports" do
                             ])
 
         expect(all('table.report__table tbody tr').count).to eq(3) # Totals row per supplier
+
+        # date range is kept after form submission
+        check_prefilled_dates
       end
     end
   end
@@ -144,6 +153,9 @@ describe "Packing Reports" do
           find("button[type='submit']").click
           expect(page).to have_content li1.product.name
           expect(page).to have_content li2.product.name
+
+          # date range is kept after form submission
+          check_prefilled_dates
         end
       end
     end