Previous commit was defective, credits_total would not have been calculated if a nil didn't exist in a valid credits array.

This commit is contained in:
reaper 2011-01-16 09:40:56 +09:00
parent 8800abf9bb
commit c82156ef67
1 changed files with 5 additions and 4 deletions

View File

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