Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Extend PaymentMethods for new admin (#12240)
Damian Legawieca4bac9137fbf
diff --git a/admin/app/helpers/spree/admin/payments_helper.rb b/admin/app/helpers/spree/admin/payments_helper.rbindex 65e5013bca..d2394fa6b9 100644--- a/admin/app/helpers/spree/admin/payments_helper.rb+++ b/admin/app/helpers/spree/admin/payments_helper.rb@@ -15,6 +15,10 @@ module Spreeimage_tag "payment_icons/#{payment_method}.svg", optsrescue Sprockets::Rails::Helper::AssetNotFoundend++ def available_payment_methods+ @available_payment_methods ||= Spree::PaymentMethod.providers.map(&:new).delete_if { |payment_method| !payment_method.show_in_admin? && current_store.payment_methods.pluck(:type).include?(payment_method.type) }+ endendendenddiff --git a/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb b/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rbindex 500a5a56bc..5e1ebdb539 100644--- a/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb+++ b/api/spec/serializers/spree/api/v2/platform/payment_method_serializer_spec.rb@@ -28,9 +28,7 @@ describe Spree::Api::V2::Platform::PaymentMethodSerializer docreated_at: resource.created_at,updated_at: resource.updated_at,preferences: {- dummy_key: 'PUBLICKEY123',- server: 'test',- test_mode: true+ dummy_key: 'PUBLICKEY123'},public_metadata: {},private_metadata: {}diff --git a/core/app/models/spree/gateway.rb b/core/app/models/spree/gateway.rbindex ff679defec..880f34823d 100644--- a/core/app/models/spree/gateway.rb+++ b/core/app/models/spree/gateway.rb@@ -4,10 +4,9 @@ module Spreedelegate :authorize, :purchase, :capture, :void, :credit, to: :provider- validates :type, presence: true+ before_validation :set_name- preference :server, :string, default: 'test'- preference :test_mode, :boolean, default: true+ validates :type, presence: true, inclusion: { in: -> { Spree::PaymentMethod.providers.map(&:to_s) } }def payment_source_classCreditCard@@ -77,5 +76,11 @@ module Spreeendendend++ private++ def set_name+ self.name ||= provider_class.name.demodulize.titleize+ endendenddiff --git a/core/app/models/spree/gateway/bogus.rb b/core/app/models/spree/gateway/bogus.rbindex de8f275d99..3fcf44b49a 100644--- a/core/app/models/spree/gateway/bogus.rb+++ b/core/app/models/spree/gateway/bogus.rb@@ -15,6 +15,10 @@ module Spreeself.classend+ def show_in_admin?+ false+ end+def create_profile(payment)return if payment.source.has_payment_profile?diff --git a/core/app/models/spree/payment_method.rb b/core/app/models/spree/payment_method.rbindex b558c09184..0768004b71 100644--- a/core/app/models/spree/payment_method.rb+++ b/core/app/models/spree/payment_method.rb@@ -46,6 +46,10 @@ module Spreetype.demodulize.downcaseend+ def payment_icon_name+ method_type+ end+def self.find_with_destroyed(*args)unscoped { find(*args) }end@@ -58,6 +62,10 @@ module Spreetrueend+ def show_in_admin?+ true+ end+# Custom gateways should redefine this method. See Gateway implementation# as an exampledef reusable_sources(_order)diff --git a/core/spec/models/spree/gateway_spec.rb b/core/spec/models/spree/gateway_spec.rbindex 717e92ce10..8db85fe329 100644--- a/core/spec/models/spree/gateway_spec.rb+++ b/core/spec/models/spree/gateway_spec.rb@@ -29,6 +29,16 @@ describe Spree::Gateway, type: :model dogateway.imaginary_method('foo')end+ context 'Validations' do+ before do+ expect(Spree::PaymentMethod).to receive(:providers).and_return([TestGateway, Spree::Gateway::Bogus])+ end++ it 'validates the type' do+ expect(TestGateway.new).to be_valid+ end+ end+context 'fetching payment sources' dolet(:store) { create(:store) }let(:order) { store.orders.create(user_id: 1) }diff --git a/core/spec/models/spree/payment_method_spec.rb b/core/spec/models/spree/payment_method_spec.rbindex fa2f4a1d31..f5105f3f08 100644--- a/core/spec/models/spree/payment_method_spec.rb+++ b/core/spec/models/spree/payment_method_spec.rb@@ -5,6 +5,12 @@ describe Spree::PaymentMethod, type: :model dolet(:store) { create(:store) }+ # register test gateways+ before do+ Rails.application.config.spree.payment_methods << TestGateway+ Rails.application.config.spree.payment_methods << Spree::Gateway::Test+ end+context 'visibility scopes' dobefore do[nil, '', 'both', 'front_end', 'back_end'].each do |display_on|