From 451e76b33f6cd1ae63ac4dd3846fd1962aebd680 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Fri, 7 Mar 2014 15:27:52 +1100 Subject: [PATCH] Tweaking our paypal express plumbing further --- app/controllers/shop/checkout_controller.rb | 2 +- config/routes.rb | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/app/controllers/shop/checkout_controller.rb b/app/controllers/shop/checkout_controller.rb index 6fd69a4d17..1b9b3f9196 100644 --- a/app/controllers/shop/checkout_controller.rb +++ b/app/controllers/shop/checkout_controller.rb @@ -100,7 +100,7 @@ class Shop::CheckoutController < Spree::CheckoutController render :edit and return end - redirect_to(paypal_payment_order_checkout_url(@order, :payment_method_id => payment_method.id)) + redirect_to(main_app.shop_paypal_payment_url(@order, :payment_method_id => payment_method.id)) true end diff --git a/config/routes.rb b/config/routes.rb index 4fa61e8754..14519b4b13 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -13,6 +13,8 @@ Openfoodnetwork::Application.routes.draw do #end get '/checkout', :to => 'checkout#edit' , :as => :checkout put '/checkout', :to => 'checkout#update' , :as => :update_checkout + + get "/checkout/paypal_payment", to: 'checkout#paypal_payment', as: :paypal_payment end resources :enterprises do