From ea3922a023a652ffbbba06315c4aa770f02f36d1 Mon Sep 17 00:00:00 2001 From: David Cook Date: Wed, 12 Jun 2013 15:19:14 +1000 Subject: [PATCH] filter out cancelled orders from the reports --- .../spree/admin/reports_controller_decorator.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb index 6de3fc1575..f5350bc2cc 100644 --- a/app/controllers/spree/admin/reports_controller_decorator.rb +++ b/app/controllers/spree/admin/reports_controller_decorator.rb @@ -25,7 +25,7 @@ Spree::Admin::ReportsController.class_eval do end params[:q][:meta_sort] ||= "completed_at.desc" - @search = Spree::Order.complete.search(params[:q]) + @search = Spree::Order.complete.where("state != ?", 'canceled').search(params[:q]) orders = @search.result @report = OpenFoodWeb::OrderAndDistributorReport.new orders @@ -54,7 +54,7 @@ Spree::Admin::ReportsController.class_eval do end params[:q][:meta_sort] ||= "completed_at.desc" - @search = Spree::Order.complete.search(params[:q]) + @search = Spree::Order.complete.where("state != ?", 'canceled').search(params[:q]) orders = @search.result @distributors = Enterprise.is_distributor @@ -85,7 +85,7 @@ Spree::Admin::ReportsController.class_eval do end params[:q][:meta_sort] ||= "completed_at.desc" - @search = Spree::Order.complete.search(params[:q]) + @search = Spree::Order.complete.where("state != ?", 'canceled').search(params[:q]) orders = @search.result line_items = orders.map { |o| o.line_items }.flatten @@ -237,7 +237,7 @@ Spree::Admin::ReportsController.class_eval do end params[:q][:meta_sort] ||= "completed_at.desc" - @search = Spree::Order.complete.search(params[:q]) + @search = Spree::Order.complete.where("state != ?", 'canceled').search(params[:q]) orders = @search.result payments = orders.map { |o| o.payments.select { |payment| payment.completed? } }.flatten # Only select completed payments @@ -341,7 +341,7 @@ Spree::Admin::ReportsController.class_eval do end params[:q][:meta_sort] ||= "completed_at.desc" - @search = Spree::Order.complete.search(params[:q]) + @search = Spree::Order.complete.where("state != ?", 'canceled').search(params[:q]) orders = @search.result line_items = orders.map { |o| o.line_items }.flatten #payments = orders.map { |o| o.payments.select { |payment| payment.completed? } }.flatten # Only select completed payments