raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-24 20:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

filter out cancelled orders from the reports

Browse Source
This commit is contained in:
David Cook
2013-06-12 15:19:14 +10:00
parent 1e94f88c5e
commit ea3922a023
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/controllers/spree/admin/reports_controller_decorator.rb
View File

@@ -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