solidus_nexio 0.7.10 → 0.7.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d41277b3e134349ca38560b0fdcaff483ca1a5c06f0009638bb6d1a760a021d
-  data.tar.gz: 206b628b09f118160b59f250de348348d49fd397a6562b887d403f710cb530fe
+  metadata.gz: 1b8b26c32f6aadcf7970abe96f50a80c434ab4dbfa8d3fee871b2fca6addb14c
+  data.tar.gz: d43e6cd590a8b93d2920f2e8bebb571823be7bfbd666601559016d5dcb61cad6
 SHA512:
-  metadata.gz: 1e11394077942c416ecd6d009624543ba30d88e5d357e4c11d8a354f23e7b0c012e08d78be80252f29232fbbbe93dc653fc006c7d40bcfb49bb12765d51e23e2
-  data.tar.gz: '098789028bed9c285c82dd4bd9ccd7a887aedcdb0207e70ca6dfa8a0cddbbc7210b61fff8fd336be0c9218053239b1c507cd9b4df666fd126109c10b509a6f3b'
+  metadata.gz: 6a32db735b15b242878bdb8a30e1a4c80223bd6ad3ebb82b6ec3be65f4499d66aa39c8cfee285f482136c471d52f2b97750e2304d72127a44cff5e0415f5c6fc
+  data.tar.gz: 99f7045179675543de2420dc5dd6e300eb08942552550754349e49052f2288bcb28d771c76c985d1ffc720077170641fc4c37f12b903f5afa434f0ccb959460e

data/app/decorators/models/solidus_nexio/payment_decorator.rb

@@ -13,15 +13,36 @@ module SolidusNexio
     end
 
     def authorize!
-      fetch_nexio_amp_transaction or clean_nexio_after { super }
+      authorize_apm_safely or clean_nexio_after { super }
     end
 
     def purchase!
-      fetch_nexio_amp_transaction or clean_nexio_after { super }
+      fetch_nexio_amp_transaction('Purchase') or clean_nexio_after { super }
+    end
+
+    def update_payment_state_from_nexio(action = nil)
+      return unless response_code.present?
+
+      transaction = payment_method.gateway.get_transaction(response_code)
+      unless transaction
+        error_message = "#{action}: The transaction is not found."
+        record_response(build_response(false, error_message))
+        return
+      end
+
+      message = "#{action}: The transaction #{transaction.data['id']} is updated."
+      record_response(build_response(true, message, transaction.data))
+      self.state = SolidusNexio::Mappings.payment_state(transaction.status)
+      self.amount = failed? || void? ? 0 : transaction.amount
+      save
     end
 
     private
 
+    def build_response(success, message, params = {})
+      ActiveMerchant::Billing::Response.new(success, message, params, test: payment_method.gateway.test?)
+    end
+
     def save_nexio_amp_id
       self.response_code = nexio_apm_transaction_id if nexio_apm_transaction_id.present?
     end
@@ -34,14 +55,10 @@ module SolidusNexio
       source.clean_nexio_cvv if nexio_card?
     end
 
-    def fetch_nexio_amp_transaction
+    def fetch_nexio_amp_transaction(action = nil)
       return unless response_code.present? && nexio_apm?
 
-      transaction = payment_method.gateway.get_transaction(response_code)
-      if transaction
-        self.amount = transaction.amount
-        self.state = SolidusNexio::Mappings.payment_state(transaction.status)
-        save!
+      if update_payment_state_from_nexio(action)
         return true if completed? || pending?
       else
         invalidate!
@@ -50,6 +67,18 @@ module SolidusNexio
       raise Spree::Core::GatewayError, I18n.t('spree.payment_processing_failed')
     end
 
+    def authorize_apm_safely
+      return unless nexio_apm?
+
+      if update_payment_state_from_nexio('Authorize')
+        return true if completed? || pending?
+      elsif response_code.present?
+        self.auth_confirmation_required = true
+        pend! unless completed? || pending?
+        PaymentConfirmationJob.set(wait: SolidusNexio.config.payment_confirmation_timeout.minutes).perform_later(self)
+      end
+    end
+
     Spree::Payment.include self
     # source set after other attribute assignments
     Spree::Payment.before_validation :save_nexio_amp_id, on: :create, if: :nexio_apm?

data/app/jobs/solidus_nexio/payment_confirmation_job.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module SolidusNexio
+  class PaymentConfirmationJob < ApplicationJob
+    def perform(payment)
+      PaymentConfirmationService.call(payment)
+    end
+  end
+end

data/app/services/solidus_nexio/payment_confirmation_service.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module SolidusNexio
+  PaymentConfirmationService = Struct.new(:payment) do
+    class << self
+      def call(payment)
+        return unless payment.nexio_apm? && payment.auth_confirmation_required
+
+        new(payment).confirm_payment_auth!
+        clear_auth_confirmation(payment)
+      end
+
+      protected
+
+      def clear_auth_confirmation(payment)
+        payment.update!(auth_confirmation_required: false)
+      end
+    end
+
+    def confirm_payment_auth!
+      return unless auth_confirmed
+
+      invalidate_payment unless update_payment_state_from_nexio('Auth Confirmation') && auth_confirmed
+    end
+
+    private
+
+    delegate :update_payment_state_from_nexio, to: :payment
+
+    def auth_confirmed
+      payment.completed? || payment.pending?
+    end
+
+    def invalidate_payment
+      payment.order&.cancel! or payment.void!
+    end
+  end
+end

data/db/migrate/20230509093147_add_auth_confirmation_required_to_spree_payment.rb

@@ -0,0 +1,5 @@
+class AddAuthConfirmationRequiredToSpreePayment < ActiveRecord::Migration[6.1]
+  def change
+    add_column :spree_payments, :auth_confirmation_required, :boolean
+  end
+end

data/lib/solidus_nexio/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusNexio
-  VERSION = '0.7.10'
+  VERSION = '0.7.11'
 end

data/lib/solidus_nexio.rb

@@ -11,7 +11,7 @@ module SolidusNexio
     'solidus_nexio_solidus_nexio_'
   end
 
-  @config = OpenStruct.new(merchant_secrets: [], save_webhooks: false, webhooks: [])
+  @config = OpenStruct.new(merchant_secrets: [], save_webhooks: false, webhooks: [], payment_confirmation_timeout: 3)
 
   def self.config
     yield @config if block_given?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_nexio
 version: !ruby/object:Gem::Version
-  version: 0.7.10
+  version: 0.7.11
 platform: ruby
 authors:
 - Whitespectre
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nexio_activemerchant
@@ -104,6 +104,7 @@ files:
 - app/decorators/models/solidus_nexio/credit_card_decorator.rb
 - app/decorators/models/solidus_nexio/payment_decorator.rb
 - app/helpers/solidus_nexio/checkout_helper.rb
+- app/jobs/solidus_nexio/payment_confirmation_job.rb
 - app/models/solidus_nexio/alternative_payment_method.rb
 - app/models/solidus_nexio/apm_source.rb
 - app/models/solidus_nexio/nexio_payment_commons.rb
@@ -112,6 +113,7 @@ files:
 - app/services/solidus_nexio/encryption_service.rb
 - app/services/solidus_nexio/mappings.rb
 - app/services/solidus_nexio/nexio_data.rb
+- app/services/solidus_nexio/payment_confirmation_service.rb
 - app/views/solidus_nexio/payment_states/capture.html.erb
 - app/views/spree/admin/payments/source_forms/_nexio_apm.html.erb
 - app/views/spree/admin/payments/source_forms/_nexio_own_form.html.erb
@@ -128,6 +130,7 @@ files:
 - config/routes.rb
 - db/migrate/20210723155452_create_solidus_nexio_solidus_nexio_webhooks.rb
 - db/migrate/20211109171335_add_solidus_nexio_apm_source.rb
+- db/migrate/20230509093147_add_auth_confirmation_required_to_spree_payment.rb
 - lib/solidus_nexio.rb
 - lib/solidus_nexio/engine.rb
 - lib/solidus_nexio/version.rb