From 08d9540bcbdc270f422e4f2e1fc7885330ec6580 Mon Sep 17 00:00:00 2001 From: Bounmy Stephane Date: Sun, 8 Apr 2012 23:35:26 +0200 Subject: [PATCH] using routes helpers instead of manual url --- Gemfile | 7 ------- app/controllers/spree/checkout_controller_decorator.rb | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Gemfile b/Gemfile index 79cedf6..5b98998 100644 --- a/Gemfile +++ b/Gemfile @@ -23,11 +23,4 @@ group :cucumber do end gem 'awesome_print' - -# if RUBY_VERSION < "1.9" -# gem "ruby-debug" -# else -# gem "ruby-debug19" -# end - gem 'debugger' \ No newline at end of file diff --git a/app/controllers/spree/checkout_controller_decorator.rb b/app/controllers/spree/checkout_controller_decorator.rb index 6824f5d..40e0275 100644 --- a/app/controllers/spree/checkout_controller_decorator.rb +++ b/app/controllers/spree/checkout_controller_decorator.rb @@ -251,8 +251,8 @@ module Spree credits_total = credits.map {|i| i[:amount] * i[:quantity] }.sum end - 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", + opts = { :return_url => paypal_confirm_order_checkout_url(order, :payment_method_id => payment_method), + :cancel_return_url => edit_order_url(order), :order_id => order.number, :custom => order.number, :items => items,