From e69daa02c68ef56ad8b569eebb7c612f558f1c57 Mon Sep 17 00:00:00 2001 From: Chris Nighitngale Date: Thu, 16 Feb 2012 00:19:28 -0700 Subject: [PATCH] removed two references to incorrect /spree path --- app/controllers/spree/checkout_controller_decorator.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb index ee39f22..4c251b5 100644 --- a/app/controllers/spree/checkout_controller_decorator.rb +++ b/app/controllers/spree/checkout_controller_decorator.rb @@ -252,7 +252,7 @@ module Spree credits_total = credits.map {|i| i[:amount] * i[:quantity] }.sum end - opts = { #:return_url => request.protocol + request.host_with_port + "/spree/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}", + opts = { #:return_url => request.protocol + request.host_with_port + "/orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}", :return_url => "http://" + 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", :order_id => order.number, @@ -269,7 +269,7 @@ module Spree if stage == "checkout" opts[:handling] = 0 - opts[:callback_url] = "http://" + request.host_with_port + "/spree/paypal_express_callbacks/#{order.number}" + opts[:callback_url] = "http://" + request.host_with_port + "/paypal_express_callbacks/#{order.number}" opts[:callback_timeout] = 3 elsif stage == "payment" #hack to add float rounding difference in as handling fee - prevents PayPal from rejecting orders