From 9a09c4910e97cfb49ae33e0be49a928e551d73d0 Mon Sep 17 00:00:00 2001 From: Chris Nighitngale Date: Thu, 16 Feb 2012 10:38:51 -0700 Subject: [PATCH] made return url's work for spree mounted at different locations --- app/controllers/spree/checkout_controller_decorator.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb index 4c251b5..5e98383 100644 --- a/app/controllers/spree/checkout_controller_decorator.rb +++ b/app/controllers/spree/checkout_controller_decorator.rb @@ -252,9 +252,8 @@ module Spree credits_total = credits.map {|i| i[:amount] * i[:quantity] }.sum end - 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", + opts = { :return_url => spree.root_url + "orders/#{order.number}/checkout/paypal_confirm?payment_method_id=#{payment_method}", + :cancel_return_url => spree.root_url + "orders/#{order.number}/edit", :order_id => order.number, :custom => order.number, :items => items, @@ -269,7 +268,7 @@ module Spree if stage == "checkout" opts[:handling] = 0 - opts[:callback_url] = "http://" + request.host_with_port + "/paypal_express_callbacks/#{order.number}" + opts[:callback_url] = spree_root_url + "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