From 4dd5e129680e2115c12fe20bc4c8b04b9c2ae72f Mon Sep 17 00:00:00 2001
From: Rob H <oeoeaio@gmail.com>
Date: Fri, 26 Oct 2012 13:49:39 +1100
Subject: [PATCH] Fix reports controller, previous changes to fix change
 generate_report were incomplete

---
 .../admin/reports_controller_decorator.rb     | 254 +++++++++---------
 1 file changed, 127 insertions(+), 127 deletions(-)

diff --git a/app/controllers/spree/admin/reports_controller_decorator.rb b/app/controllers/spree/admin/reports_controller_decorator.rb
index a8cbd23f08..d5bb667845 100644
--- a/app/controllers/spree/admin/reports_controller_decorator.rb
+++ b/app/controllers/spree/admin/reports_controller_decorator.rb
@@ -93,96 +93,96 @@ Spree::Admin::ReportsController.class_eval do
 
     case params[:report_type]
     when "bulk_coop_supplier_report"
-      
+
       header = ["Supplier", "Product", "Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total"]
-      
-      columns = [ proc { |lis| lis.first.variant.product.supplier.name }, 
-        proc { |lis| lis.first.variant.product.name }, 
-        proc { |lis| "UNIT SIZE" }, 
-        proc { |lis| lis.first.variant.options_text }, 
-        proc { |lis| lis.first.variant.weight }, 
-        proc { |lis|  lis.sum { |li| li.quantity } }, 
+
+      columns = [ proc { |lis| lis.first.variant.product.supplier.name },
+        proc { |lis| lis.first.variant.product.name },
+        proc { |lis| "UNIT SIZE" },
+        proc { |lis| lis.first.variant.options_text },
+        proc { |lis| lis.first.variant.weight },
+        proc { |lis|  lis.sum { |li| li.quantity } },
         proc { |lis| lis.sum { |li| li.max_quantity || 0 } } ]
-      
-      rules = [ { group_by: proc { |li| li.variant.product.supplier }, 
+
+      rules = [ { group_by: proc { |li| li.variant.product.supplier },
         sort_by: proc { |supplier| supplier.name } },
-        { group_by: proc { |li| li.variant.product }, 
-        sort_by: proc { |product| product.name }, 
-        summary_columns: [ proc { |lis| lis.first.variant.product.supplier.name }, 
-          proc { |lis| lis.first.variant.product.name }, proc { |lis| "UNIT SIZE" }, 
-          proc { |lis| "" }, proc { |lis| "" }, 
-          proc { |lis|  lis.sum { |li| li.quantity * li.variant.weight } }, 
+        { group_by: proc { |li| li.variant.product },
+        sort_by: proc { |product| product.name },
+        summary_columns: [ proc { |lis| lis.first.variant.product.supplier.name },
+          proc { |lis| lis.first.variant.product.name }, proc { |lis| "UNIT SIZE" },
+          proc { |lis| "" }, proc { |lis| "" },
+          proc { |lis|  lis.sum { |li| li.quantity * li.variant.weight } },
           proc { |lis| lis.sum { |li| (li.max_quantity || 0) * li.variant.weight } } ] },
-        { group_by: proc { |li| li.variant }, 
+        { group_by: proc { |li| li.variant },
         sort_by: proc { |variant| variant.options_text } } ]
-          
+
     when "bulk_coop_allocation"
-      
+
       header = ["Customer", "Product", "Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total"]
-      
-      columns = [ proc { |lis| lis.first.order.bill_address.firstname + " " + lis.first.order.bill_address.lastname },  
-        proc { |lis| lis.first.variant.product.name }, 
-        proc { |lis| "UNIT SIZE" }, 
-        proc { |lis| lis.first.variant.options_text }, 
-        proc { |lis| lis.first.variant.weight }, 
-        proc { |lis|  lis.sum { |li| li.quantity } }, 
-        proc { |lis| lis.sum { |li| li.max_quantity || 0 } } ]     
-      
-      rules = [ { group_by: proc { |li| li.variant.product }, 
-        sort_by: proc { |product| product.name } }, 
-        { group_by: proc { |li| li.variant }, 
-        sort_by: proc { |variant| variant.options_text } }, 
-        { group_by: proc { |li| li.order.user }, 
-        sort_by: proc { |user| user.to_s } } ]
-        
-    when "bulk_coop_packing_sheets"
-      
-      header = ["Customer", "Product", "Variant", "Sum Total"]
-      
-      columns = [ proc { |lis| lis.first.order.bill_address.firstname + " " + lis.first.order.bill_address.lastname },  
-        proc { |lis| lis.first.variant.product.name }, 
-        proc { |lis| lis.first.variant.options_text }, 
-        proc { |lis|  lis.sum { |li| li.quantity } } ]     
-      
-      rules = [ { group_by: proc { |li| li.variant.product }, 
-        sort_by: proc { |product| product.name } }, 
-        { group_by: proc { |li| li.variant }, 
-        sort_by: proc { |variant| variant.options_text } }, 
-        { group_by: proc { |li| li.order.user }, 
-        sort_by: proc { |user| user.to_s } } ]
-      
-    when "bulk_coop_customer_payments"
-      
-      header = ["Customer", "Date of Order", "Total Cost", "Amount Owing", "Amount Paid"]
-      
-      columns = [ proc { |lis| lis.first.order.bill_address.firstname + " " + lis.first.order.bill_address.lastname }, 
-        proc { |lis| lis.first.order.created_at.to_s },  
-        proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.total } }, 
-        proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.outstanding_balance } }, 
-        proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.payment_total } } ]     
-      
-      rules = [ { group_by: proc { |li| li.order.user }, 
-        sort_by: proc { |user| user.to_s } }, 
-        { group_by: proc { |li| li.order }, 
-        sort_by: proc { |order|  order.created_at } } ]
-      
-    else # List all line items
-      
-      header = ["Supplier", "Product", "Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total"]
-      
-      columns = [ proc { |lis| lis.first.variant.product.supplier.name },  
-        proc { |lis| lis.first.variant.product.name }, 
-        proc { |lis| "UNIT SIZE" }, 
-        proc { |lis| lis.first.variant.options_text }, 
-        proc { |lis| lis.first.variant.weight }, 
-        proc { |lis|  lis.sum { |li| li.quantity } }, 
+
+      columns = [ proc { |lis| lis.first.order.bill_address.firstname + " " + lis.first.order.bill_address.lastname },
+        proc { |lis| lis.first.variant.product.name },
+        proc { |lis| "UNIT SIZE" },
+        proc { |lis| lis.first.variant.options_text },
+        proc { |lis| lis.first.variant.weight },
+        proc { |lis|  lis.sum { |li| li.quantity } },
         proc { |lis| lis.sum { |li| li.max_quantity || 0 } } ]
-      
-      rules = [ { group_by: proc { |li| li.variant.product.supplier }, 
-        sort_by: proc { |supplier| supplier.name } }, 
-        { group_by: proc { |li| li.variant.product }, 
-        sort_by: proc { |product| product.name } }, 
-        { group_by: proc { |li| li.variant }, 
+
+      rules = [ { group_by: proc { |li| li.variant.product },
+        sort_by: proc { |product| product.name } },
+        { group_by: proc { |li| li.variant },
+        sort_by: proc { |variant| variant.options_text } },
+        { group_by: proc { |li| li.order.user },
+        sort_by: proc { |user| user.to_s } } ]
+
+    when "bulk_coop_packing_sheets"
+
+      header = ["Customer", "Product", "Variant", "Sum Total"]
+
+      columns = [ proc { |lis| lis.first.order.bill_address.firstname + " " + lis.first.order.bill_address.lastname },
+        proc { |lis| lis.first.variant.product.name },
+        proc { |lis| lis.first.variant.options_text },
+        proc { |lis|  lis.sum { |li| li.quantity } } ]
+
+      rules = [ { group_by: proc { |li| li.variant.product },
+        sort_by: proc { |product| product.name } },
+        { group_by: proc { |li| li.variant },
+        sort_by: proc { |variant| variant.options_text } },
+        { group_by: proc { |li| li.order.user },
+        sort_by: proc { |user| user.to_s } } ]
+
+    when "bulk_coop_customer_payments"
+
+      header = ["Customer", "Date of Order", "Total Cost", "Amount Owing", "Amount Paid"]
+
+      columns = [ proc { |lis| lis.first.order.bill_address.firstname + " " + lis.first.order.bill_address.lastname },
+        proc { |lis| lis.first.order.created_at.to_s },
+        proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.total } },
+        proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.outstanding_balance } },
+        proc { |lis| lis.map { |li| li.order }.uniq.sum { |o| o.payment_total } } ]
+
+      rules = [ { group_by: proc { |li| li.order.user },
+        sort_by: proc { |user| user.to_s } },
+        { group_by: proc { |li| li.order },
+        sort_by: proc { |order|  order.created_at } } ]
+
+    else # List all line items
+
+      header = ["Supplier", "Product", "Unit Size", "Variant", "Weight", "Sum Total", "Sum Max Total"]
+
+      columns = [ proc { |lis| lis.first.variant.product.supplier.name },
+        proc { |lis| lis.first.variant.product.name },
+        proc { |lis| "UNIT SIZE" },
+        proc { |lis| lis.first.variant.options_text },
+        proc { |lis| lis.first.variant.weight },
+        proc { |lis|  lis.sum { |li| li.quantity } },
+        proc { |lis| lis.sum { |li| li.max_quantity || 0 } } ]
+
+      rules = [ { group_by: proc { |li| li.variant.product.supplier },
+        sort_by: proc { |supplier| supplier.name } },
+        { group_by: proc { |li| li.variant.product },
+        sort_by: proc { |product| product.name } },
+        { group_by: proc { |li| li.variant },
         sort_by: proc { |variant| variant.options_text } } ]
     end
 
@@ -192,7 +192,7 @@ Spree::Admin::ReportsController.class_eval do
     @table = order_grouper.table(line_items)
     csv_file_name = "bulk_coop.csv"
 
-    generate_report(@header, @table, params[:csv], csv_file_name)
+    render_report(@header, @table, params[:csv], csv_file_name)
   end
 
   def payments
@@ -219,72 +219,72 @@ Spree::Admin::ReportsController.class_eval do
     case params[:report_type]
     when "payments_by_payment_type"
       table_items = payments
-      
+
       header = ["Payment State", "Distributor", "Payment Type", "Total ($)"]
 
-      columns = [ proc { |payments| payments.first.order.payment_state }, 
-        proc { |payments| payments.first.order.distributor.name },  
-        proc { |payments| payments.first.payment_method.name }, 
+      columns = [ proc { |payments| payments.first.order.payment_state },
+        proc { |payments| payments.first.order.distributor.name },
+        proc { |payments| payments.first.payment_method.name },
         proc { |payments| payments.sum { |payment| payment.amount } } ]
 
-      rules = [ { group_by: proc { |payment| payment.order.payment_state }, 
-        sort_by: proc { |payment_state| payment_state } }, 
-        { group_by: proc { |payment| payment.order.distributor }, 
-        sort_by: proc { |distributor| distributor.name } }, 
-        { group_by: proc { |payment| payment.payment_method }, 
+      rules = [ { group_by: proc { |payment| payment.order.payment_state },
+        sort_by: proc { |payment_state| payment_state } },
+        { group_by: proc { |payment| payment.order.distributor },
+        sort_by: proc { |distributor| distributor.name } },
+        { group_by: proc { |payment| payment.payment_method },
         sort_by: proc { |method| method.name } } ]
-      
+
     when "itemised_payment_totals"
       table_items = orders
-      
+
       header = ["Payment State", "Distributor", "Product Total ($)", "Shipping Total ($)", "Outstanding Balance ($)", "Total ($)"]
-      
-      columns = [ proc { |orders| orders.first.payment_state }, 
-        proc { |orders| orders.first.distributor.name },  
-        proc { |orders| orders.sum { |o| o.item_total } }, 
-        proc { |orders| orders.sum { |o| o.ship_total } }, 
-        proc { |orders| orders.sum { |o| o.outstanding_balance } }, 
+
+      columns = [ proc { |orders| orders.first.payment_state },
+        proc { |orders| orders.first.distributor.name },
+        proc { |orders| orders.sum { |o| o.item_total } },
+        proc { |orders| orders.sum { |o| o.ship_total } },
+        proc { |orders| orders.sum { |o| o.outstanding_balance } },
         proc { |orders| orders.sum { |o| o.total } } ]
-      
-      rules = [ { group_by: proc { |order| order.payment_state }, 
-        sort_by: proc { |payment_state| payment_state } }, 
-        { group_by: proc { |order| order.distributor }, 
+
+      rules = [ { group_by: proc { |order| order.payment_state },
+        sort_by: proc { |payment_state| payment_state } },
+        { group_by: proc { |order| order.distributor },
         sort_by: proc { |distributor| distributor.name } } ]
-      
+
     when "payment_totals"
       table_items = orders
 
       header = ["Payment State", "Distributor", "Product Total ($)", "Shipping Total ($)", "Total ($)", "EFT ($)", "PayPal ($)", "Outstanding Balance ($)"]
 
-      columns = [ proc { |orders| orders.first.payment_state }, 
-        proc { |orders| orders.first.distributor.name }, 
-        proc { |orders| orders.sum { |o| o.item_total } }, 
-        proc { |orders| orders.sum { |o| o.ship_total } }, 
-        proc { |orders| orders.sum { |o| o.total } },  
-        proc { |orders| orders.sum { |o| o.payments.select { |payment| payment.completed? && (payment.payment_method.name.to_s.include? "EFT") }.sum { |payment| payment.amount } } }, 
-        proc { |orders| orders.sum { |o| o.payments.select { |payment| payment.completed? && (payment.payment_method.name.to_s.include? "PayPal") }.sum{ |payment| payment.amount } } }, 
+      columns = [ proc { |orders| orders.first.payment_state },
+        proc { |orders| orders.first.distributor.name },
+        proc { |orders| orders.sum { |o| o.item_total } },
+        proc { |orders| orders.sum { |o| o.ship_total } },
+        proc { |orders| orders.sum { |o| o.total } },
+        proc { |orders| orders.sum { |o| o.payments.select { |payment| payment.completed? && (payment.payment_method.name.to_s.include? "EFT") }.sum { |payment| payment.amount } } },
+        proc { |orders| orders.sum { |o| o.payments.select { |payment| payment.completed? && (payment.payment_method.name.to_s.include? "PayPal") }.sum{ |payment| payment.amount } } },
         proc { |orders| orders.sum { |o| o.outstanding_balance } } ]
 
-      rules = [ { group_by: proc { |order| order.payment_state }, 
-        sort_by: proc { |payment_state| payment_state } }, 
-        { group_by: proc { |order| order.distributor }, 
+      rules = [ { group_by: proc { |order| order.payment_state },
+        sort_by: proc { |payment_state| payment_state } },
+        { group_by: proc { |order| order.distributor },
         sort_by: proc { |distributor| distributor.name } } ]
 
     else
       table_items = payments
-      
+
       header = ["Payment State", "Distributor", "Payment Type", "Total ($)"]
 
-      columns = [ proc { |payments| payments.first.order.payment_state }, 
-        proc { |payments| payments.first.order.distributor.name },  
-        proc { |payments| payments.first.payment_method.name }, 
+      columns = [ proc { |payments| payments.first.order.payment_state },
+        proc { |payments| payments.first.order.distributor.name },
+        proc { |payments| payments.first.payment_method.name },
         proc { |payments| payments.sum { |payment| payment.amount } } ]
 
-      rules = [ { group_by: proc { |payment| payment.order.payment_state }, 
-        sort_by: proc { |payment_state| payment_state } }, 
-        { group_by: proc { |payment| payment.order.distributor }, 
-        sort_by: proc { |distributor| distributor.name } }, 
-        { group_by: proc { |payment| payment.payment_method }, 
+      rules = [ { group_by: proc { |payment| payment.order.payment_state },
+        sort_by: proc { |payment_state| payment_state } },
+        { group_by: proc { |payment| payment.order.distributor },
+        sort_by: proc { |distributor| distributor.name } },
+        { group_by: proc { |payment| payment.payment_method },
         sort_by: proc { |method| method.name } } ]
 
     end
@@ -294,11 +294,11 @@ Spree::Admin::ReportsController.class_eval do
     @header = header
     @table = order_grouper.table(table_items)
     csv_file_name = "payments.csv"
-    
-    generate_report(@header, @table, params[:csv], csv_file_name)
+
+    render_report(@header, @table, params[:csv], csv_file_name)
 
   end
-  
+
   def render_report (header, table, create_csv, csv_file_name)
     unless create_csv
       render :html => table