From d844dc8e1b4cea030e60529d83f17ecb8ddf01cb Mon Sep 17 00:00:00 2001
From: Lynne Davis <lynne@deanforestfoodhub.org.uk>
Date: Tue, 16 Feb 2016 17:47:51 +0000
Subject: [PATCH] Bug fixes to Order Cycle Reports

---
 .../order_cycle_management_report.rb               | 14 +++++++-------
 lib/open_food_network/user_balance_calculator.rb   | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/lib/open_food_network/order_cycle_management_report.rb b/lib/open_food_network/order_cycle_management_report.rb
index ea238f7792..90cfa5390a 100644
--- a/lib/open_food_network/order_cycle_management_report.rb
+++ b/lib/open_food_network/order_cycle_management_report.rb
@@ -17,7 +17,7 @@ module OpenFoodNetwork
     end
 
     def search
-      Spree::Order.complete.where("spree_orders.state != ?", :canceled).distributed_by_user(@user).managed_by(@user).search(params[:q])
+      Spree::Order.complete.distributed_by_user(@user).managed_by(@user).search(params[:q])
     end
 
     def orders
@@ -50,7 +50,7 @@ module OpenFoodNetwork
        order.shipping_method.andand.name,
        order.payments.first.andand.payment_method.andand.name,
        order.payments.first.amount,
-       OpenFoodNetwork::UserBalanceCalculator.new(order.user, order.distributor).balance
+       OpenFoodNetwork::UserBalanceCalculator.new(order.email, order.distributor).balance
       ]
     end
 
@@ -67,23 +67,23 @@ module OpenFoodNetwork
        order.shipping_method.andand.name,
        order.payments.first.andand.payment_method.andand.name,
        order.payments.first.amount,
-       OpenFoodNetwork::UserBalanceCalculator.new(order.user, order.distributor).balance,
+       OpenFoodNetwork::UserBalanceCalculator.new(order.email, order.distributor).balance,
        has_temperature_controlled_items?(order),
        order.special_instructions
       ]
     end
 
     def filter_to_payment_method(orders)
-      if params[:payment_method_name].present?
-        orders.with_payment_method_name(params[:payment_method_name])
+      if params[:payment_method_in].present?
+        orders.with_payment_method_name(params[:payment_method_in])
       else
         orders
       end
     end
 
     def filter_to_shipping_method(orders)
-      if params[:shipping_method_name].present?
-        orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:shipping_method_name])
+      if params[:shipping_method_in].present?
+        orders.joins(:shipping_method).where("spree_shipping_methods.name = ?", params[:shipping_method_in])
       else
         orders
       end
diff --git a/lib/open_food_network/user_balance_calculator.rb b/lib/open_food_network/user_balance_calculator.rb
index 73926c1d03..642374cad1 100644
--- a/lib/open_food_network/user_balance_calculator.rb
+++ b/lib/open_food_network/user_balance_calculator.rb
@@ -1,19 +1,19 @@
 module OpenFoodNetwork
   class UserBalanceCalculator
-    def initialize(user, distributor)
-      @user = user
+    def initialize(email, distributor)
+      @email = email
       @distributor = distributor
     end
 
     def balance
-      payment_total - order_total
+      payment_total - completed_order_total
     end
 
 
     private
 
-    def order_total
-      orders.sum &:total
+    def completed_order_total
+      orders.complete.sum &:total
     end
 
     def payment_total
@@ -22,11 +22,11 @@ module OpenFoodNetwork
 
 
     def orders
-      Spree::Order.where(distributor_id: @distributor, user_id: @user)
+      Spree::Order.where(distributor_id: @distributor, email: @email)
     end
 
     def payments
-      Spree::Payment.where(order_id: orders)
+      Spree::Payment.where(order_id: orders, state: "completed")
     end
   end
 end