From e0cb7a29bf265a240bd90b0ab7c341aec6d12ac3 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Thu, 3 Sep 2020 20:11:51 +0100 Subject: [PATCH] Add helper prefix to helper calls --- app/controllers/checkout_controller.rb | 2 +- .../spree/admin/orders/customer_details_controller.rb | 2 +- app/controllers/spree/admin/payment_methods_controller.rb | 4 ++-- app/controllers/spree/admin/payments_controller.rb | 6 +++--- app/controllers/spree/admin/users_controller.rb | 4 ++-- app/controllers/spree/admin/variants_controller.rb | 2 +- app/controllers/spree/credit_cards_controller.rb | 4 ++-- app/controllers/spree/orders_controller.rb | 6 +++--- .../spree/admin/orders/payments/payments_controller_spec.rb | 1 + 9 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/controllers/checkout_controller.rb b/app/controllers/checkout_controller.rb index c47b112359..34e974febd 100644 --- a/app/controllers/checkout_controller.rb +++ b/app/controllers/checkout_controller.rb @@ -150,7 +150,7 @@ class CheckoutController < Spree::StoreController def handle_redirect_from_stripe if OrderWorkflow.new(@order).next && order_complete? checkout_succeeded - redirect_to(order_path(@order)) && return + redirect_to(spree.order_path(@order)) && return else checkout_failed end diff --git a/app/controllers/spree/admin/orders/customer_details_controller.rb b/app/controllers/spree/admin/orders/customer_details_controller.rb index 8ad0c7ea28..56502d54a0 100644 --- a/app/controllers/spree/admin/orders/customer_details_controller.rb +++ b/app/controllers/spree/admin/orders/customer_details_controller.rb @@ -27,7 +27,7 @@ module Spree @order.shipments.map(&:refresh_rates) flash[:success] = Spree.t('customer_details_updated') - redirect_to admin_order_customer_path(@order) + redirect_to spree.admin_order_customer_path(@order) else render action: :edit end diff --git a/app/controllers/spree/admin/payment_methods_controller.rb b/app/controllers/spree/admin/payment_methods_controller.rb index 950b97340b..b649a51970 100644 --- a/app/controllers/spree/admin/payment_methods_controller.rb +++ b/app/controllers/spree/admin/payment_methods_controller.rb @@ -22,7 +22,7 @@ module Spree if @payment_method.save invoke_callbacks(:create, :after) flash[:success] = Spree.t(:successfully_created, resource: Spree.t(:payment_method)) - redirect_to edit_admin_payment_method_path(@payment_method) + redirect_to spree.edit_admin_payment_method_path(@payment_method) else invoke_callbacks(:create, :fails) respond_with(@payment_method) @@ -43,7 +43,7 @@ module Spree if @payment_method.update(params_for_update) invoke_callbacks(:update, :after) flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payment_method)) - redirect_to edit_admin_payment_method_path(@payment_method) + redirect_to spree.edit_admin_payment_method_path(@payment_method) else invoke_callbacks(:update, :fails) respond_with(@payment_method) diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb index bfdb4fd2ff..22e4e84725 100644 --- a/app/controllers/spree/admin/payments_controller.rb +++ b/app/controllers/spree/admin/payments_controller.rb @@ -35,16 +35,16 @@ module Spree @payment.process! flash[:success] = flash_message_for(@payment, :successfully_created) - redirect_to admin_order_payments_path(@order) + redirect_to spree.admin_order_payments_path(@order) else OrderWorkflow.new(@order).complete! flash[:success] = Spree.t(:new_order_completed) - redirect_to edit_admin_order_url(@order) + redirect_to spree.edit_admin_order_url(@order) end rescue Spree::Core::GatewayError => e flash[:error] = e.message.to_s - redirect_to new_admin_order_payment_path(@order) + redirect_to spree.new_admin_order_payment_path(@order) end end diff --git a/app/controllers/spree/admin/users_controller.rb b/app/controllers/spree/admin/users_controller.rb index e6ffeaa6cd..3241a889f1 100644 --- a/app/controllers/spree/admin/users_controller.rb +++ b/app/controllers/spree/admin/users_controller.rb @@ -60,14 +60,14 @@ module Spree if @user.generate_spree_api_key! flash[:success] = t('spree.api.key_generated') end - redirect_to edit_admin_user_path(@user) + redirect_to spree.edit_admin_user_path(@user) end def clear_api_key if @user.clear_spree_api_key! flash[:success] = t('spree.api.key_cleared') end - redirect_to edit_admin_user_path(@user) + redirect_to spree.edit_admin_user_path(@user) end protected diff --git a/app/controllers/spree/admin/variants_controller.rb b/app/controllers/spree/admin/variants_controller.rb index 302b3e62a5..3a591f59c0 100644 --- a/app/controllers/spree/admin/variants_controller.rb +++ b/app/controllers/spree/admin/variants_controller.rb @@ -67,7 +67,7 @@ module Spree Spree.t('notice_messages.variant_not_deleted') end - redirect_to admin_product_variants_url(params[:product_id], @url_filters) + redirect_to spree.admin_product_variants_url(params[:product_id], @url_filters) end protected diff --git a/app/controllers/spree/credit_cards_controller.rb b/app/controllers/spree/credit_cards_controller.rb index a1c2e60ea5..9b4c2d971d 100644 --- a/app/controllers/spree/credit_cards_controller.rb +++ b/app/controllers/spree/credit_cards_controller.rb @@ -48,10 +48,10 @@ module Spree else flash[:error] = I18n.t(:card_could_not_be_removed) end - redirect_to account_path(anchor: 'cards') + redirect_to spree.account_path(anchor: 'cards') rescue Stripe::CardError flash[:error] = I18n.t(:card_could_not_be_removed) - redirect_to account_path(anchor: 'cards') + redirect_to spree.account_path(anchor: 'cards') end private diff --git a/app/controllers/spree/orders_controller.rb b/app/controllers/spree/orders_controller.rb index 898ec93f99..a948e4d801 100644 --- a/app/controllers/spree/orders_controller.rb +++ b/app/controllers/spree/orders_controller.rb @@ -90,7 +90,7 @@ module Spree @order.next_transition.run_callbacks if @order.cart? redirect_to checkout_state_path(@order.checkout_steps.first) elsif @order.complete? - redirect_to order_path(@order) + redirect_to spree.order_path(@order) else redirect_to main_app.cart_path end @@ -157,7 +157,7 @@ module Spree else flash[:error] = I18n.t(:orders_could_not_cancel) end - redirect_to request.referer || order_path(@order) + redirect_to request.referer || spree.order_path(@order) end private @@ -221,7 +221,7 @@ module Spree if items.empty? flash[:error] = I18n.t(:orders_cannot_remove_the_final_item) - redirect_to order_path(order_to_update) + redirect_to spree.order_path(order_to_update) end end diff --git a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb index 8e78be69d8..287f70a655 100644 --- a/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb +++ b/spec/controllers/spree/admin/orders/payments/payments_controller_spec.rb @@ -1,6 +1,7 @@ # frozen_string_literal: true require 'spec_helper' +require 'spree/core/gateway_error' describe Spree::Admin::PaymentsController, type: :controller do let!(:shop) { create(:enterprise) }