From 9a9bef5304c8a6a012fa819d3ad37d729efe3243 Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Fri, 9 Nov 2012 20:31:08 +1100 Subject: [PATCH] Report filtering on completion date, not creation date --- .../admin/reports_controller_decorator.rb | 62 +++++++++---------- .../spree/admin/reports/bulk_coop.html.haml | 6 +- .../spree/admin/reports/group_buys.html.haml | 4 +- .../admin/reports/order_cycles.html.haml | 6 +- .../reports/orders_and_distributors.html.haml | 4 +- .../spree/admin/reports/payments.html.haml | 6 +- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 93d9168ae8..046fd05525 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -14,16 +14,16 @@ Spree::Admin::ReportsController.class_eval do def orders_and_distributors params[:q] = {} unless params[:q] - if params[:q][:created_at_gt].blank? - params[:q][:created_at_gt] = Time.zone.now.beginning_of_month + if params[:q][:completed_at_gt].blank? + params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month else - params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month + params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month end - if params[:q] && !params[:q][:created_at_lt].blank? - params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue "" + if params[:q] && !params[:q][:completed_at_lt].blank? + params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue "" end - params[:q][:meta_sort] ||= "created_at.desc" + params[:q][:meta_sort] ||= "completed_at.desc" @search = Spree::Order.complete.search(params[:q]) orders = @search.result @@ -43,16 +43,16 @@ Spree::Admin::ReportsController.class_eval do def group_buys params[:q] = {} unless params[:q] - if params[:q][:created_at_gt].blank? - params[:q][:created_at_gt] = Time.zone.now.beginning_of_month + if params[:q][:completed_at_gt].blank? + params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month else - params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month + params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month end - if params[:q] && !params[:q][:created_at_lt].blank? - params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue "" + if params[:q] && !params[:q][:completed_at_lt].blank? + params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue "" end - params[:q][:meta_sort] ||= "created_at.desc" + params[:q][:meta_sort] ||= "completed_at.desc" @search = Spree::Order.complete.search(params[:q]) orders = @search.result @@ -74,16 +74,16 @@ Spree::Admin::ReportsController.class_eval do def bulk_coop params[:q] = {} unless params[:q] - if params[:q][:created_at_gt].blank? - params[:q][:created_at_gt] = Time.zone.now.beginning_of_month + if params[:q][:completed_at_gt].blank? + params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month else - params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month + params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month end - if params[:q] && !params[:q][:created_at_lt].blank? - params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue "" + if params[:q] && !params[:q][:completed_at_lt].blank? + params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue "" end - params[:q][:meta_sort] ||= "created_at.desc" + params[:q][:meta_sort] ||= "completed_at.desc" @search = Spree::Order.complete.search(params[:q]) orders = @search.result @@ -180,7 +180,7 @@ Spree::Admin::ReportsController.class_eval do proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.payment_total } } ] rules = [ { group_by: proc { |li| li.order }, - sort_by: proc { |order| order.created_at } } ] + sort_by: proc { |order| order.completed_at } } ] else # List all line items @@ -226,16 +226,16 @@ Spree::Admin::ReportsController.class_eval do def payments params[:q] = {} unless params[:q] - if params[:q][:created_at_gt].blank? - params[:q][:created_at_gt] = Time.zone.now.beginning_of_month + if params[:q][:completed_at_gt].blank? + params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month else - params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month + params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month end - if params[:q] && !params[:q][:created_at_lt].blank? - params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue "" + if params[:q] && !params[:q][:completed_at_lt].blank? + params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue "" end - params[:q][:meta_sort] ||= "created_at.desc" + params[:q][:meta_sort] ||= "completed_at.desc" @search = Spree::Order.complete.search(params[:q]) orders = @search.result @@ -330,16 +330,16 @@ Spree::Admin::ReportsController.class_eval do def order_cycles params[:q] = {} unless params[:q] - if params[:q][:created_at_gt].blank? - params[:q][:created_at_gt] = Time.zone.now.beginning_of_month + if params[:q][:completed_at_gt].blank? + params[:q][:completed_at_gt] = Time.zone.now.beginning_of_month else - params[:q][:created_at_gt] = Time.zone.parse(params[:q][:created_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month + params[:q][:completed_at_gt] = Time.zone.parse(params[:q][:completed_at_gt]).beginning_of_day rescue Time.zone.now.beginning_of_month end - if params[:q] && !params[:q][:created_at_lt].blank? - params[:q][:created_at_lt] = Time.zone.parse(params[:q][:created_at_lt]).end_of_day rescue "" + if params[:q] && !params[:q][:completed_at_lt].blank? + params[:q][:completed_at_lt] = Time.zone.parse(params[:q][:completed_at_lt]).end_of_day rescue "" end - params[:q][:meta_sort] ||= "created_at.desc" + params[:q][:meta_sort] ||= "completed_at.desc" @search = Spree::Order.complete.search(params[:q]) orders = @search.result diff --git a/app/views/spree/admin/reports/bulk_coop.html.haml b/app/views/spree/admin/reports/bulk_coop.html.haml index 8c570e8de1..adde173e98 100644 --- a/app/views/spree/admin/reports/bulk_coop.html.haml +++ b/app/views/spree/admin/reports/bulk_coop.html.haml @@ -3,11 +3,11 @@ %br .date-range-filter %div{"class" => "left sub-field"} - = f.text_field :created_at_gt, :class => 'datepicker' + = f.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' %div{"class" => "right sub-field"} - = f.text_field :created_at_lt, :class => 'datepicker' + = f.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) %br @@ -36,4 +36,4 @@ %td= column - if @table.empty? %tr - %td{:colspan => "2"}= t(:none) \ No newline at end of file + %td{:colspan => "2"}= t(:none) diff --git a/app/views/spree/admin/reports/group_buys.html.haml b/app/views/spree/admin/reports/group_buys.html.haml index f593483d57..bdda9a043d 100644 --- a/app/views/spree/admin/reports/group_buys.html.haml +++ b/app/views/spree/admin/reports/group_buys.html.haml @@ -3,11 +3,11 @@ %br .date-range-filter %div{"class" => "left sub-field"} - = f.text_field :created_at_gt, :class => 'datepicker' + = f.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' %div{"class" => "right sub-field"} - = f.text_field :created_at_lt, :class => 'datepicker' + = f.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) %br diff --git a/app/views/spree/admin/reports/order_cycles.html.haml b/app/views/spree/admin/reports/order_cycles.html.haml index 33bd97cb06..4468f1d183 100644 --- a/app/views/spree/admin/reports/order_cycles.html.haml +++ b/app/views/spree/admin/reports/order_cycles.html.haml @@ -3,11 +3,11 @@ %br .date-range-filter %div{"class" => "left sub-field"} - = f.text_field :created_at_gt, :class => 'datepicker' + = f.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' %div{"class" => "right sub-field"} - = f.text_field :created_at_lt, :class => 'datepicker' + = f.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) %br @@ -36,4 +36,4 @@ %td= column - if @table.empty? %tr - %td{:colspan => "2"}= t(:none) \ No newline at end of file + %td{:colspan => "2"}= t(:none) diff --git a/app/views/spree/admin/reports/orders_and_distributors.html.haml b/app/views/spree/admin/reports/orders_and_distributors.html.haml index 08fba94e7e..26137158b0 100644 --- a/app/views/spree/admin/reports/orders_and_distributors.html.haml +++ b/app/views/spree/admin/reports/orders_and_distributors.html.haml @@ -3,11 +3,11 @@ %br .date-range-filter %div{"class" => "left sub-field"} - = s.text_field :created_at_gt, :class => 'datepicker' + = s.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' %div{"class" => "right sub-field"} - = s.text_field :created_at_lt, :class => 'datepicker' + = s.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) = check_box_tag :csv diff --git a/app/views/spree/admin/reports/payments.html.haml b/app/views/spree/admin/reports/payments.html.haml index 898bba70ef..66da52ad4b 100644 --- a/app/views/spree/admin/reports/payments.html.haml +++ b/app/views/spree/admin/reports/payments.html.haml @@ -3,11 +3,11 @@ %br .date-range-filter %div{"class" => "left sub-field"} - = f.text_field :created_at_gt, :class => 'datepicker' + = f.text_field :completed_at_gt, :class => 'datepicker' %br = label_tag nil, t(:start), :class => 'sub' %div{"class" => "right sub-field"} - = f.text_field :created_at_lt, :class => 'datepicker' + = f.text_field :completed_at_lt, :class => 'datepicker' %br = label_tag nil, t(:stop) %br @@ -36,4 +36,4 @@ %td= column - if @table.empty? %tr - %td{:colspan => "2"}= t(:none) \ No newline at end of file + %td{:colspan => "2"}= t(:none)