Remove option to create StripeConnect methods

This commit is contained in:
Maikel Linke
2022-01-24 11:17:23 +11:00
parent 191646b611
commit f22c2b0e73
3 changed files with 8 additions and 18 deletions

View File

@@ -132,12 +132,6 @@ module Spree
providers.reject! { |provider| stripe_provider?(provider) }
end
# This method is deprecated and will be removed soon:
unless @payment_method&.type == "Spree::Gateway::StripeConnect" ||
OpenFoodNetwork::FeatureToggle.enabled?("StripeConnect")
providers.reject! { |provider| provider.name.ends_with?("StripeConnect") }
end
providers
end
@@ -160,12 +154,11 @@ module Spree
end
def stripe_payment_method?
["Spree::Gateway::StripeConnect",
"Spree::Gateway::StripeSCA"].include? @payment_method.try(:type)
@payment_method.try(:type) == "Spree::Gateway::StripeSCA"
end
def stripe_provider?(provider)
provider.name.ends_with?("StripeConnect", "StripeSCA")
provider.name.ends_with?("StripeSCA")
end
def base_params
@@ -177,7 +170,7 @@ module Spree
raw_params[ActiveModel::Naming.param_key(@payment_method)] || {}
end
# Merge payment method params with gateway params like :gateway_stripe_connect
# Merge payment method params with gateway params like :gateway_stripe_sca
# Also, remove password if present and blank
def update_params
@update_params ||= begin

View File

@@ -146,7 +146,6 @@ module Openfoodnetwork
# Register Spree payment methods
initializer "spree.gateway.payment_methods", :after => "spree.register.payment_methods" do |app|
Rails.application.reloader.to_prepare do
app.config.spree.payment_methods << Spree::Gateway::StripeConnect
app.config.spree.payment_methods << Spree::Gateway::StripeSCA
app.config.spree.payment_methods << Spree::Gateway::PayPalExpress
end

View File

@@ -34,14 +34,13 @@ module Spree
providers = assigns(:providers).map(&:to_s)
expect(providers).to include "Spree::Gateway::StripeSCA"
expect(providers).to_not include "Spree::Gateway::StripeConnect"
end
end
describe "#edit" do
let(:deprecated_stripe) {
let(:stripe) {
create(
:stripe_connect_payment_method,
:stripe_sca_payment_method,
distributor_ids: [enterprise_id],
preferred_enterprise_id: enterprise_id
)
@@ -50,14 +49,13 @@ module Spree
before { allow(controller).to receive(:spree_current_user) { user } }
it "shows the current gateway type even if deprecated" do
allow(Spree::Config).to receive(:stripe_connect_enabled).and_return(true)
it "shows the current gateway type even if not enabled" do
allow(Spree::Config).to receive(:stripe_connect_enabled).and_return(false)
spree_get :edit, id: deprecated_stripe.id
spree_get :edit, id: stripe.id
providers = assigns(:providers).map(&:to_s)
expect(providers).to include "Spree::Gateway::StripeSCA"
expect(providers).to include "Spree::Gateway::StripeConnect"
end
end