spree_vpago 0.1.0.pre.beta

data/app/models/vpago/order_decorator.rb

@@ -0,0 +1,78 @@
+module Vpago
+  module OrderDecorator
+    extend Spree::DisplayMoney
+    money_methods :order_adjustment_total, :shipping_discount
+
+    def self.prepended(base)
+      base.has_many :payouts, class_name: 'Spree::Payout', through: :payments
+      base.has_many :vendor_payment_methods, -> { unscope(:order).distinct },
+                    class_name: 'Spree::PaymentMethod',
+                    through: :line_items
+
+      base.state_machine.before_transition from: :cart, do: :ensure_valid_vendor_payment_methods
+      base.state_machine.after_transition to: :complete, do: :generate_line_items_total_metadata
+    end
+
+    # override
+    def process_payments!
+      super if insufficient_processed_payment?
+
+      # Prevent from reaching :complete state if payment is insufficient
+      errors.add(:base, Spree.t(:insufficient_payment_amount_to_cover_the_total)) if insufficient_processed_payment?
+    end
+
+    def insufficient_processed_payment?
+      processed_payment_total < total
+    end
+
+    def processed_payment_total
+      payment_total + pending_payments.sum(:amount)
+    end
+
+    def ensure_valid_vendor_payment_methods
+      return if line_items_from_same_vendor?
+      return unless vendor_payment_methods.any?
+
+      errors.add(:line_items, 'some_payment_methods_cant_be_used_across_vendors')
+
+      false
+    end
+
+    def line_items_from_same_vendor?
+      line_items.joins(:variant).pluck('spree_variants.vendor_id').uniq.size == 1
+    end
+
+    def required_payway_payout?
+      line_items.any?(&:required_payway_payout?) || shipments.any?(&:required_payway_payout?)
+    end
+
+    # override
+    def available_payment_methods(store = nil)
+      payment_methods = if vendor_payment_methods.any?
+                          vendor_payment_methods
+                        else
+                          collect_payment_methods(store)
+                        end
+
+      @available_payment_methods ||= if required_payway_payout?
+                                       payment_methods.select(&:type_payway_v2?)
+                                     else
+                                       payment_methods
+                                     end
+    end
+
+    def line_items_count
+      line_items.size
+    end
+
+    def generate_line_items_total_metadata
+      line_items.each(&:update_total_metadata)
+    end
+
+    def order_adjustment_total
+      adjustments.eligible.sum(:amount)
+    end
+  end
+end
+
+Spree::Order.prepend(Vpago::OrderDecorator) if Spree::Order.included_modules.exclude?(Vpago::OrderDecorator)

data/app/models/vpago/payment_decorator.rb

@@ -0,0 +1,44 @@
+module Vpago
+  module PaymentDecorator
+    def self.prepended(base)
+      base.has_many :payouts, class_name: 'Spree::Payout', inverse_of: :payment
+      base.after_create -> { Vpago::PayoutsGenerator.new(self).call }, if: :should_generate_payouts?
+
+      base.delegate :checkout_url,
+                    :processing_url,
+                    :success_url,
+                    :process_payment_url,
+                    to: :url_constructor
+    end
+
+    def process!
+      # give payment another chance to re-process, even if it failed.
+      update!(state: :checkout) if processing? || send(:has_invalid_state?)
+
+      super
+    end
+
+    def url_constructor
+      @url_constructor ||= Vpago::PaymentUrlConstructor.new(self)
+    end
+
+    def should_generate_payouts?
+      payment_method.enable_payout? && payouts.empty?
+    end
+
+    # COMPLETED, CANCELLED
+    def pre_auth_status
+      pre_auth_response['transaction_status']
+    end
+
+    def pre_auth_completed?
+      pre_auth_status == 'COMPLETED'
+    end
+
+    def pre_auth_cancelled?
+      pre_auth_status == 'CANCELLED'
+    end
+  end
+end
+
+Spree::Payment.prepend(Vpago::PaymentDecorator) unless Spree::Payment.included_modules.include?(Vpago::PaymentDecorator)

data/app/models/vpago/payment_method_decorator.rb

@@ -0,0 +1,91 @@
+module Vpago
+  module PaymentMethodDecorator
+    TYPE_PAYWAY = 'Spree::Gateway::Payway'.freeze
+    TYPE_PAYWAY_V2 = 'Spree::Gateway::PaywayV2'.freeze
+    TYPE_WINGSDK = 'Spree::Gateway::WingSdk'.freeze
+    TYPE_ACLEDA = 'Spree::Gateway::Acleda'.freeze
+    TYPE_ACLEDA_MOBILE = 'Spree::Gateway::AcledaMobile'.freeze
+
+    def self.prepended(base)
+      base.preference :icon_name, :string, default: 'cheque'
+      base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true, inverse_of: :payment_methods
+
+      def base.vpago_payments
+        [
+          Spree::PaymentMethod::TYPE_PAYWAY_V2,
+          Spree::PaymentMethod::TYPE_PAYWAY,
+          Spree::PaymentMethod::TYPE_WINGSDK,
+          Spree::PaymentMethod::TYPE_ACLEDA,
+          Spree::PaymentMethod::TYPE_ACLEDA_MOBILE
+        ]
+      end
+    end
+
+    def enable_payout? = support_payout?
+    def enable_pre_auth? = support_pre_auth? && self[:enable_pre_auth]
+    def support_payout? = false
+    def support_pre_auth? = false
+
+    # TODO: we have already implement purchase for payway_v2.
+    # make sure to implement this on other payment method as well.
+    def purchase(_amount, _source, _gateway_options = {})
+      ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Success')
+    end
+
+    def default_payout_profile
+      nil
+    end
+
+    def vpago_payment?
+      self.class.vpago_payments.include?(type)
+    end
+
+    def vapgo_checkout_service
+      if type_payway?
+        ::Vpago::Payway::Checkout
+      elsif type_payway_v2?
+        ::Vpago::PaywayV2::Checkout
+      elsif type_wingsdk?
+        ::Vpago::WingSdk::Checkout
+      elsif type_acleda?
+        ::Vpago::Acleda::Checkout
+      end
+    end
+
+    def payment_request_updater
+      if type_payway?
+        ::Vpago::Payway::PaymentRequestUpdater
+      elsif type_payway_v2?
+        ::Vpago::PaywayV2::PaymentRequestUpdater
+      elsif type_wingsdk?
+        ::Vpago::WingSdk::PaymentRequestUpdater
+      elsif type_acleda?
+        ::Vpago::Acleda::PaymentRequestUpdater
+      elsif type_acleda_mobile?
+        ::Vpago::AcledaMobile::PaymentRequestUpdater
+      end
+    end
+
+    def type_acleda_mobile?
+      type == Spree::PaymentMethod::TYPE_ACLEDA_MOBILE
+    end
+
+    def type_acleda?
+      type == Spree::PaymentMethod::TYPE_ACLEDA
+    end
+
+    def type_payway?
+      type == Spree::PaymentMethod::TYPE_PAYWAY
+    end
+
+    def type_payway_v2?
+      type == Spree::PaymentMethod::TYPE_PAYWAY_V2
+    end
+
+    def type_wingsdk?
+      type == Spree::PaymentMethod::TYPE_WINGSDK
+    end
+  end
+end
+
+Spree::PaymentMethod.prepend(Vpago::PaymentMethodDecorator) unless Spree::PaymentMethod.included_modules.include?(Vpago::PaymentMethodDecorator)

data/app/models/vpago/payouts_generator.rb

@@ -0,0 +1,125 @@
+# generate payouts for remaining amount of provided payment.
+# currently only support for PaywayV2 payment.
+module Vpago
+  class PayoutsGenerator
+    attr_reader :payment, :line_items, :shipments
+
+    attr_accessor :remaining_amount
+
+    def initialize(payment)
+      @payment = payment
+
+      @line_items = payment.order.line_items.includes(
+        :active_payway_payout_profiles,
+        :confirmed_payouts_for_vendor,
+        :adjustments
+      )
+
+      @shipments = payment.order.shipments.includes(
+        :confirmed_payouts_for_vendor,
+        :adjustments,
+        selected_shipping_rate: :active_payway_payout_profiles
+      )
+
+      self.remaining_amount = payment.amount
+    end
+
+    def call
+      payouts = vendor_payouts + vendor_shipment_payouts + store_payouts
+
+      return [] if payouts.all?(&:default?)
+      return [] unless payouts.all? { |payout| validated?(payout) }
+
+      ActiveRecord::Base.transaction { payouts.each(&:save!) }
+    end
+
+    def validated?(payout)
+      return false if payout.payout_profile.preferred_merchant_id != payment.payment_method.preferred_merchant_id
+
+      true
+    end
+
+    def vendor_payouts
+      line_items.each_with_object([]) do |line_item, payouts|
+        payout_profile = line_item.active_payway_payout_profiles.first
+        next unless payout_profile.present?
+
+        total_confirmed_payouts = line_item.confirmed_payouts_for_vendor.sum(:amount)
+        next if total_confirmed_payouts >= line_item.pre_commission_amount
+
+        amount_owed_to_vendor = line_item.pre_commission_amount - total_confirmed_payouts
+        payout_amount = [amount_owed_to_vendor, remaining_amount].min
+        outstanding_amount = [amount_owed_to_vendor - payout_amount, 0].max
+
+        payouts << Spree::Payout.new(
+          default: false,
+          state: :created,
+          payoutable: line_item,
+          payment: payment,
+          payout_profile: payout_profile,
+          amount: payout_amount,
+          outstanding_amount: outstanding_amount,
+          private_metadata: {
+            total_confirmed_payouts: total_confirmed_payouts,
+            amount_owed_to_vendor: amount_owed_to_vendor,
+            payoutable: line_item.latest_private_metadata
+          }
+        )
+
+        self.remaining_amount -= payout_amount
+      end
+    end
+
+    def vendor_shipment_payouts
+      shipments.each_with_object([]) do |shipment, payouts|
+        next unless shipment.selected_shipping_rate.handle_by_vendor?
+
+        payout_profile = shipment.selected_shipping_rate.active_payway_payout_profiles.first
+        next unless payout_profile.present?
+
+        total_confirmed_payouts = shipment.confirmed_payouts_for_vendor.sum(:amount)
+        next if total_confirmed_payouts >= shipment.cost_with_vendor_adjustment_total
+
+        amount_owed_to_shipping_vendor = shipment.cost_with_vendor_adjustment_total - total_confirmed_payouts
+        payout_amount = [amount_owed_to_shipping_vendor, remaining_amount].min
+        outstanding_amount = [amount_owed_to_shipping_vendor - payout_amount, 0].max
+
+        payouts << Spree::Payout.new(
+          default: false,
+          state: :created,
+          payoutable: shipment,
+          payment: payment,
+          payout_profile: payout_profile,
+          amount: payout_amount,
+          outstanding_amount: outstanding_amount,
+          private_metadata: {
+            total_confirmed_payouts: total_confirmed_payouts,
+            amount_owed_to_vendor: amount_owed_to_shipping_vendor,
+            payoutable: {
+              cost: shipment.cost,
+              vendor_adjustment_total: shipment.vendor_adjustment_total,
+              cost_with_vendor_adjustment_total: shipment.cost_with_vendor_adjustment_total
+            }
+          }
+        )
+
+        self.remaining_amount -= payout_amount
+      end
+    end
+
+    # generate payout for all remaining amount to store.
+    def store_payouts
+      return [] if self.remaining_amount <= 0
+
+      [
+        Spree::Payout.new(
+          default: true,
+          state: :created,
+          payment: payment,
+          payout_profile: Spree::PayoutProfiles::PaywayV2.default,
+          amount: self.remaining_amount
+        )
+      ]
+    end
+  end
+end

data/app/models/vpago/product_decorator.rb

@@ -0,0 +1,30 @@
+module Vpago
+  module ProductDecorator
+    def self.prepended(base)
+      base.has_many :payout_profile_products,
+                    class_name: 'Spree::PayoutProfileProduct', inverse_of: :product
+
+      base.has_many :payout_profiles,
+                    class_name: 'Spree::PayoutProfile', through: :payout_profile_products,
+                    source: :payout_profile
+
+      base.has_many :active_payout_profiles, -> { verified.active },
+                    class_name: 'Spree::PayoutProfile',
+                    through: :payout_profile_products, source: :payout_profile
+
+      base.has_many :active_payway_payout_profiles, -> { payway.verified.active },
+                    class_name: 'Spree::PayoutProfile',
+                    through: :payout_profile_products, source: :payout_profile
+
+      base.has_many :required_payout_profile_products, -> { required },
+                    class_name: 'Spree::PayoutProfileProduct',
+                    inverse_of: :product
+
+      base.has_many :required_active_payout_profiles, -> { verified.active },
+                    class_name: 'Spree::PayoutProfile',
+                    through: :required_payout_profile_products, source: :payout_profile
+    end
+  end
+end
+
+Spree::Product.prepend(Vpago::ProductDecorator) unless Spree::Product.included_modules.include?(Vpago::ProductDecorator)

data/app/models/vpago/promotion_action_decorator.rb

@@ -0,0 +1,9 @@
+module Vpago
+  module PromotionActionDecorator
+    def self.prepended(base)
+      base.enum run_by: { store: 0, vendor: 1 }, _prefix: true
+    end
+  end
+end
+
+Spree::PromotionAction.prepend(Vpago::PromotionActionDecorator) unless Spree::PromotionAction.included_modules.include?(Vpago::PromotionActionDecorator)

data/app/models/vpago/shipment_decorator.rb

@@ -0,0 +1,23 @@
+module Vpago
+  module ShipmentDecorator
+    def self.prepended(base)
+      base.include ::Vpago::Payoutable
+    end
+
+    def required_payway_payout?
+      selected_shipping_rate.required_active_payout_profiles.payway.exists?
+    end
+
+    # there is no commission for shipment yet.
+    # so amount that vendor expected is cost + their adjustments.
+    def cost_with_vendor_adjustment_total
+      cost + vendor_adjustment_total
+    end
+
+    def vendor_adjustment_total
+      adjustments.handle_by_vendor.total
+    end
+  end
+end
+
+Spree::Shipment.prepend(Vpago::ShipmentDecorator) unless Spree::Shipment.included_modules.include?(Vpago::ShipmentDecorator)

data/app/models/vpago/shipping_method_decorator.rb

@@ -0,0 +1,33 @@
+module Vpago
+  module ShippingMethodDecorator
+    def self.prepended(base)
+      base.enum handle_by: { store: 0, vendor: 1 }, _prefix: true
+
+      base.has_many :payout_profile_shipping_methods,
+                    class_name: 'Spree::PayoutProfileShippingMethod',
+                    inverse_of: :shipping_method
+
+      base.has_many :payout_profiles,
+                    class_name: 'Spree::PayoutProfile', through: :payout_profile_shipping_methods,
+                    source: :payout_profile
+
+      base.has_many :active_payout_profiles, -> { verified.active },
+                    class_name: 'Spree::PayoutProfile',
+                    through: :payout_profile_shipping_methods, source: :payout_profile
+
+      base.has_many :active_payway_payout_profiles, -> { payway.verified.active },
+                    class_name: 'Spree::PayoutProfile',
+                    through: :payout_profile_shipping_methods, source: :payout_profile
+
+      base.has_many :required_payout_profile_shipping_methods, -> { required },
+                    class_name: 'Spree::PayoutProfileShippingMethod',
+                    inverse_of: :shipping_method
+
+      base.has_many :required_active_payout_profiles, -> { verified.active },
+                    class_name: 'Spree::PayoutProfile',
+                    through: :required_payout_profile_shipping_methods, source: :payout_profile
+    end
+  end
+end
+
+Spree::ShippingMethod.prepend(Vpago::ShippingMethodDecorator) unless Spree::ShippingMethod.included_modules.include?(Vpago::ShippingMethodDecorator)

data/app/models/vpago/shipping_rate_decorator.rb

@@ -0,0 +1,25 @@
+module Vpago
+  module ShippingRateDecorator
+    def self.prepended(base)
+      base.has_many :payout_profiles, class_name: 'Spree::PayoutProfile', through: :shipping_method
+      base.has_many :active_payout_profiles, class_name: 'Spree::PayoutProfile', through: :shipping_method
+      base.has_many :active_payway_payout_profiles, class_name: 'Spree::PayoutProfile', through: :shipping_method
+      base.has_many :required_active_payout_profiles, class_name: 'Spree::PayoutProfile', through: :shipping_method
+
+      base.enum handle_by: { store: 0, vendor: 1 }, _prefix: true
+
+      base.scope :handle_by_vendor, -> { where(handle_by: :vendor) }
+      base.scope :handle_by_store, -> { where(handle_by: :store) }
+
+      base.before_save :set_handle_by
+    end
+
+    private
+
+    def set_handle_by
+      self.handle_by = shipping_method.handle_by
+    end
+  end
+end
+
+Spree::ShippingRate.prepend(Vpago::ShippingRateDecorator) unless Spree::ShippingRate.included_modules.include?(Vpago::ShippingRateDecorator)

data/app/models/vpago/store_decorator.rb

@@ -0,0 +1,17 @@
+module Vpago
+  module StoreDecorator
+    def self.prepended(base)
+      # override
+      base.has_many :payment_methods, -> { where(vendor_id: nil) },
+                    through: :store_payment_methods,
+                    class_name: 'Spree::PaymentMethod'
+
+      base.has_many :payment_methods_including_vendor,
+                    through: :store_payment_methods,
+                    class_name: 'Spree::PaymentMethod',
+                    source: :payment_method
+    end
+  end
+end
+
+Spree::Store.prepend(Vpago::StoreDecorator) unless Spree::Store.included_modules.include?(Vpago::StoreDecorator)

data/app/models/vpago/tax_category_decorator.rb

@@ -0,0 +1,9 @@
+module Vpago
+  module TaxCategoryDecorator
+    def self.prepended(base)
+      base.enum collect_by: { store: 0, vendor: 1 }, _prefix: true
+    end
+  end
+end
+
+Spree::TaxCategory.prepend(Vpago::TaxCategoryDecorator) unless Spree::TaxCategory.included_modules.include?(Vpago::TaxCategoryDecorator)

data/app/models/vpago/variant_decorator.rb

@@ -0,0 +1,22 @@
+module Vpago
+  module VariantDecorator
+    def self.prepended(base)
+      base.belongs_to :vendor, class_name: 'Spree::Vendor'
+
+      base.has_many :vendor_payment_methods, class_name: 'Spree::PaymentMethod',
+                                             through: :vendor,
+                                             source: :payment_methods
+    end
+  end
+end
+
+if Spree::Variant.included_modules.exclude?(Vpago::VariantDecorator)
+  # spree_multi_vendor use :vendor method for assoication, we should use association (belongs_to :vendor) instead.
+  #
+  # problem with those methods is that it store value in memeory,
+  # even we call variant.reload, the method value is no being reload.
+  SpreeMultiVendor::Spree::VariantDecorator.remove_method :vendor
+  SpreeMultiVendor::Spree::VariantDecorator.remove_method :vendor_id
+
+  Spree::Variant.prepend(Vpago::VariantDecorator)
+end

data/app/models/vpago/vendor_decorator.rb

@@ -0,0 +1,10 @@
+module Vpago
+  module VendorDecorator
+    def self.prepended(base)
+      base.has_many :payout_profiles, class_name: 'Spree::PayoutProfile', inverse_of: :vendor
+      base.has_many :payment_methods, class_name: 'Spree::PaymentMethod', inverse_of: :vendor
+    end
+  end
+end
+
+Spree::Vendor.prepend(Vpago::VendorDecorator) unless Spree::Vendor.included_modules.include?(Vpago::VendorDecorator)

data/app/overrides/spree/admin/adjustments/_adjustment/handle_by_table_body.html.erb.deface

@@ -0,0 +1,11 @@
+<!-- insert_before ".actions" -->
+
+<td class="text-center">
+  <% if adjustment.source.is_a?(Spree::PromotionAction) %>
+    <%= link_to adjustment.handle_by.to_s.capitalize, edit_admin_promotion_path(adjustment.source.promotion) %>
+  <% elsif adjustment.source.is_a?(Spree::TaxRate) %>
+    <%= link_to adjustment.handle_by.to_s.capitalize, edit_admin_tax_rate_path(adjustment.source) %>
+  <% else %>
+    <%= adjustment.handle_by.to_s.capitalize %>
+  <% end %>
+</td>

data/app/overrides/spree/admin/adjustments/_adjustments_table/handle_by_table_header.html.erb.deface

@@ -0,0 +1,3 @@
+<!-- insert_before ".actions" -->
+
+<th class="text-center"><%= Spree.t(:handler) %></th>

data/app/overrides/spree/admin/adjustments/_form/handle_by_field.html.erb.deface

@@ -0,0 +1,10 @@
+<!-- insert_bottom "[data-hook='admin_adjustment_form_fields']" -->
+
+<%= f.field_container :handle_by, class: ['mb-4'] do %>
+  <%= f.label :handle_by, raw(Spree.t(:handle_by) + required_span_tag) %>
+  <%= f.select :handle_by, Spree::Adjustment.handle_bies.keys.map {|item| [item.capitalize, item]}, {}, :class => "fullwidth select2" %>
+  <%= f.error_message_on :handle_by %>
+  <small class="form-text text-muted">
+    This information is crucial for the financial report.
+  </small>
+<% end %>

data/app/overrides/spree/admin/orders/_shipment/edit_method.html.erb.deface

@@ -0,0 +1,26 @@
+<!-- replace ".edit-method" -->
+
+<tr class="edit-method is-hidden total">
+  <td colspan="3">
+    <div class="field alpha five columns">
+      <%= label_tag 'selected_shipping_rate_id', Spree.t(:shipping_method) %>
+      <%= select_tag :selected_shipping_rate_id,
+            options_for_select(shipment.shipping_rates.map {|sr| ["#{sr.name} #{sr.display_price}", sr.id] }, shipment.selected_shipping_rate_id),
+            { class: 'select2', data: {'shipment-number' => shipment.number } } %>
+    </div>
+  </td>
+  <td colspan="2">
+    <label><%= Spree.t(:handle_by) %>:</label>
+    <%= select_tag :handle_by,
+      options_for_select(Spree::ShippingRate.handle_bies.keys, shipment.selected_shipping_rate&.handle_by),
+      { class: 'fullwidth select2' } %>
+  </td>
+  <td class="actions">
+    <span class="d-flex justify-content-center">
+      <% if can? :update, shipment %>
+        <%= link_to_with_icon 'cancel.svg', Spree.t('actions.cancel'), "#", class: 'cancel-method btn btn-light btn-sm', data: {action: 'cancel'}, title: Spree.t('actions.cancel'), no_text: true %>
+        <%= link_to_with_icon 'save.svg', Spree.t('actions.save'), "#", class: 'save-method btn btn-success btn-sm', data: {'shipment-number' => shipment.number, action: 'save'}, title: Spree.t('actions.save'), no_text: true %>
+      <% end %>
+    </span>
+  </td>
+</tr>

data/app/overrides/spree/admin/orders/_shipment/show_method.html.erb.deface

@@ -0,0 +1,27 @@
+<!-- replace ".show-method" -->
+
+<tr class="show-method total">
+  <% if shipment.selected_shipping_rate.present? %>
+    <td colspan="2">
+      <strong><%= shipment.selected_shipping_rate.name %></strong>
+    </td>
+    <td colspan="2" class="text-center">
+      <%= link_to edit_admin_shipping_method_path(shipment.shipping_method) do %>
+        Handled by <%= shipment.selected_shipping_rate.handle_by.capitalize %>
+      <% end %>
+    </td>
+    <td class="total text-center">
+      <%= shipment.display_cost %>
+    </td>
+  <% else %>
+    <td colspan='5'><%= Spree.t(:no_shipping_method_selected) %></td>
+  <% end %>
+
+  <td class="actions">
+    <span class="d-flex justify-content-center">
+      <% if( (can? :update, shipment) and !shipment.shipped?) %>
+        <%= link_to_with_icon 'edit.svg', Spree.t('edit'), "javascript:;", class: 'edit-method with-tip btn btn-sm btn-light', data: {action: 'edit'}, no_text: true %>
+      <% end %>
+    </span>
+  </td>
+</tr>

data/app/overrides/spree/admin/payment_methods/_form/enable_pre_auth_field.html.erb.deface

@@ -0,0 +1,17 @@
+<!-- insert_after "[data-hook='active']" -->
+
+<% if @payment_method.support_pre_auth? %>
+  <div class="form-group">
+    <strong><%= Spree.t(:enable_pre_auth) %></strong>
+    
+    <div class="form-check my-2">
+      <%= radio_button :payment_method, :enable_pre_auth, true, id: 'payment_method_enable_pre_auth_true', class: 'form-check-input' %>
+      <%= label_tag 'payment_method_enable_pre_auth_true', Spree.t(:say_yes), class: 'form-check-label' %>
+    </div>
+
+    <div class="form-check my-2">
+      <%= radio_button :payment_method, :enable_pre_auth, false, id: 'payment_method_enable_pre_auth_false', class: 'form-check-input' %>
+      <%= label_tag 'payment_method_enable_pre_auth_false', Spree.t(:say_no), class: 'form-check-label' %>
+    </div>
+  </div>
+<% end %>

data/app/overrides/spree/admin/payment_methods/_form/vendor_field.html.erb.deface

@@ -0,0 +1,6 @@
+<!-- insert_before "[data-hook='display']" -->
+
+<div data-hook="vendor" class="form-group">
+  <%= label_tag :payment_method_vendor, Spree.t(:vendor) %>
+  <%= collection_select(:payment_method, :vendor_id, Spree::Vendor.all, :id, :name, { include_blank: Spree.t('match_choices.none') }, { class: 'select2' }) %>
+</div>