From c82156ef67674b560712f1ffe7e9ebd82f1de73b Mon Sep 17 00:00:00 2001
From: reaper <reaper@reaperville.com>
Date: Sun, 16 Jan 2011 09:40:56 +0900
Subject: [PATCH] Previous commit was defective, credits_total would not have
 been calculated if a nil didn't exist in a valid credits array.

---
 lib/spree/paypal_express.rb | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/lib/spree/paypal_express.rb b/lib/spree/paypal_express.rb
index 57dc227..68b62f2 100644
--- a/lib/spree/paypal_express.rb
+++ b/lib/spree/paypal_express.rb
@@ -239,10 +239,11 @@ module Spree::PaypalExpress
     end
     
     credits_total = 0
-    if credits.compact!
-      items.concat credits
-      credits_total = credits.map {|i| i[:amount] * i[:qty] }.sum
-    end
+     credits.compact!
+     if !credits.empty?  
+       items.concat credits
+       credits_total = credits.map {|i| i[:amount] * i[:qty] }.sum
+     end
     
     opts = { :return_url        => request.protocol + request.host_with_port + "/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}",
              :cancel_return_url => "http://"  + request.host_with_port + "/orders/#{order.number}/edit",