spree_vpago 2.2.2.pre.pre37 → 2.2.2.pre.pre40

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 80ca360d497f7891656f158631ef9178ccabf9d459ab128794b0566ed1a00d0a
-  data.tar.gz: 6da0dee64c3bd2031e9aa7546b7a1c6a0f555aa443f5b55e730883e7cf16c17b
+  metadata.gz: ba1b0a5520634444abf62c6b2bd65ed6660be8bbad0f53ae16a3eb359cabe260
+  data.tar.gz: 56fc2911ed815ec53799f6d0a6456d64798e513de758830e34c79af6b871df16
 SHA512:
-  metadata.gz: 193b7fb86e59840f6baee2efc7910efd16614078e67969b7ffa24879a4fc5e34914af0b83b4e9b54a5af64a169f513c7cc7b2f4805383c5dd08adf2dc3664b9c
-  data.tar.gz: 4d5baf443e247ac4cb9cdeaff28ef8c8401289e18026102bb2c5147c7b274b04d190d1615e48c228377892e9e2c91ff5725553bcf87497139758e8f2ceadd2ba
+  metadata.gz: b29505ce698611342dc6eb6ab1a787cb8ec7a427244a25db1cd476b17431b0425603fd6b8b8cb30ba5262155e5a701d910f5a4bb182815bc64b6daf151fa5f6f
+  data.tar.gz: fd7291a06bb337ea5be06da2d0ef7cd2bd0affec96c73057d9d34eceda56b44ec7954347bf1b2858dcd3aa207bca9b5a72db66e101e62c6179b7e1b17038ea91

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre37)
+    spree_vpago (2.2.2.pre.pre40)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/controllers/spree/admin/payment_payway_queriers_controller.rb

@@ -2,11 +2,11 @@ module Spree
   module Admin
     class PaymentPaywayQueriersController < PaymentPaywayBaseController
       include Spree::Backend::Callbacks
+
       around_action :set_writing_role, only: %i[show]
 
       def show
-        tran_status = transaction_status_service.new(@payment)
-        tran_status.call
+        tran_status = @payment.payment_method.check_transaction(@payment)
 
         if tran_status.success?
           @payment.update_column(:gateway_status, true)
@@ -19,14 +19,6 @@ module Spree
         redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
       end
 
-      def transaction_status_service
-        if @payment.payment_method.type_payway_v2?
-          Vpago::PaywayV2::TransactionStatus
-        elsif @payment.payment_method.type_payway?
-          Vpago::Payway::TransactionStatus
-        end
-      end
-
       private
 
       def set_writing_role

data/app/controllers/spree/vpago_payments_controller.rb

@@ -16,6 +16,8 @@ module Spree
       return redirect_to @payment.processing_url, allow_other_host: true unless @payment.checkout?
 
       @order = @payment.order
+
+      Rails.logger.info("[Vpago][#{@payment.number}] Showing checkout page for order #{@order.number}")
     end
 
     # GET
@@ -25,7 +27,7 @@ module Spree
 
       @order = @payment.order
 
-      Rails.logger.info("[Vpago] Showing processing page for payment #{@payment.number} for order #{@order.number}")
+      Rails.logger.info("[Vpago][#{@payment.number}] Showing processing page for order #{@order.number}")
     end
 
     # GET
@@ -36,7 +38,7 @@ module Spree
       @order = @payment.order
       raise CanCan::AccessDenied unless @order.completed?
 
-      Rails.logger.info("[Vpago] Showing success page for payment #{@payment.number} for order #{@order.number}")
+      Rails.logger.info("[Vpago][#{@payment.number}] Showing success page for order #{@order.number}")
     end
 
     # GET
@@ -48,9 +50,9 @@ module Spree
       return render json: { status: :failed }, status: :ok if @payment.failed?
 
       if @payment.payment_method.support_check_transaction_api?
-        Rails.logger.info("[Vpago] Checking transaction for payment #{@payment.number}")
+        Rails.logger.info("[Vpago][#{@payment.number}] Checking transaction for payment #{@payment.number}")
         checker = @payment.payment_method.check_transaction(@payment)
-        Rails.logger.info("[Vpago] Check transaction result for payment #{@payment.number} with success: #{checker.success?}, failed: #{checker.try(:failed?)}")
+        Rails.logger.info("[Vpago][#{@payment.number}] Check transaction result for payment #{@payment.number} with success: #{checker.success?}, failed: #{checker.try(:failed?)}")
 
         if checker.success?
           render json: { status: :success }, status: :ok
@@ -60,43 +62,46 @@ module Spree
           render json: { status: :pending }, status: :ok
         end
       else
+        Rails.logger.info("[Vpago][#{@payment.number}] Payment method does not support check transaction API")
         render json: { status: :pending }, status: :ok
       end
     end
 
     # POST
     def process_payment
-      Rails.logger.info("[Vpago] Received payment notification: method=#{request.method}, params=#{params.to_unsafe_h}")
       return render json: { status: :ok }, status: :ok if request.method != 'POST'
 
       return_params = sanitize_return_params
       @payment = Vpago::PaymentFinder.new(return_params).find_and_verify
 
+      # log process payment requested
+      Rails.logger.info("[Vpago][#{@payment&.number}] Process payment requested with params: #{return_params}")
+
       if @payment.nil?
         Rails.logger.error("[Vpago] Payment not found for params: #{return_params}")
         return render_not_found
       end
 
-      Rails.logger.info("[Vpago] Payment found: #{@payment&.number}, order: #{@payment&.order&.number}")
+      Rails.logger.info("[Vpago][#{@payment.number}] Payment found: #{@payment&.number}, order: #{@payment&.order&.number}")
 
       # for ABA reviewing mode, we can disable pushback from bank, and only process it from our app UI instead.
       # This will give ABA team to know that we don't rely on just pushback and have fallback to process payment.
       if @payment.payment_method.type_payway_v2? && @payment.payment_method.reviewing_mode? && request_from_external_server?
-        Rails.logger.info("[Vpago] Received payment notification from bank in reviewing mode, skipping processing: #{params}")
+        Rails.logger.info("[Vpago][#{@payment.number}] Received payment notification from bank in reviewing mode, skipping processing")
         return render json: { status: :ok }, status: :ok
       end
 
       unless @payment.order.paid?
-        Rails.logger.info("[Vpago] Enqueuing payment processor job for payment #{@payment.number}: #{params}")
+        Rails.logger.info("[Vpago][#{@payment.number}] Enqueuing payment processor job for payment #{@payment.number}")
         Vpago::PaymentProcessorJob.perform_later(
           payment_number: @payment.number
         )
       end
 
-      Rails.logger.info("[Vpago] Successfully enqueued payment processor job for payment #{@payment.number}: #{params}")
+      Rails.logger.info("[Vpago][#{@payment.number}] Successfully enqueued payment processor job for payment #{@payment.number}")
       render json: { status: :ok }, status: :ok
     rescue StandardError => e
-      Rails.logger.error("[Vpago] Failed to enqueue payment processor job: #{params} #{e.message}")
+      Rails.logger.error("[Vpago][#{@payment.number}] Failed to enqueue payment processor job for payment #{@payment.number}: #{e.message}")
       render json: { status: :internal_server_error, message: 'Failed to enqueue payment processor job' }, status: :internal_server_error
     end
 
@@ -108,11 +113,11 @@ module Spree
       return render_not_found unless @payment
 
       Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number) unless @payment.order.paid?
-      Rails.logger.info("[Vpago] Successfully enqueued payment processor job for payment #{@payment.number}: #{params}")
+      Rails.logger.info("[Vpago][#{@payment.number}] Successfully enqueued payment processor job for payment #{@payment.number}")
 
       render json: { status: { code: '000001', message: 'success' }, data: nil }, status: :ok
     rescue StandardError => e
-      Rails.logger.error("[Vpago] Failed to enqueue payment processor job: #{params} #{e.message}")
+      Rails.logger.error("[Vpago][#{@payment.number}] Failed to enqueue payment processor job for payment #{@payment.number}: #{e.message}")
       render json: { status: :internal_server_error, message: 'Failed to enqueue payment processor job' }, status: :internal_server_error
     end
 

data/app/models/spree/gateway/payway_v2.rb

@@ -159,7 +159,7 @@ module Spree
       # ABA requires the use of the v2 API, but it does not yet support payout responses.
       # Until v2 fully supports payouts, we fall back to v1 when payouts are enabled.
       # Otherwise, we use v2 by default.
-      checker = if payment.payouts.any?
+      checker = if payment.preload_payout_ids.any?
                   Vpago::PaywayV2::TransactionStatus.new(payment)
                 else
                   Vpago::PaywayV2::TransactionStatusV2.new(payment)

data/app/models/vpago/payment_decorator.rb

@@ -33,6 +33,17 @@ module Vpago
       end
     end
 
+    # Stores preloaded payout IDs in private_metadata to avoid N+1 queries
+    # when checking whether payouts exist for this payment.
+    def preload_payout_ids=(ids)
+      self.private_metadata ||= {}
+      self.private_metadata['preload_payout_ids'] = ids
+    end
+
+    def preload_payout_ids
+      self.private_metadata&.fetch('preload_payout_ids', []) || []
+    end
+
     # override
     def process!
       reset_for_retry! if failed?
@@ -106,4 +117,4 @@ module Vpago
   end
 end
 
-Spree::Payment.prepend(Vpago::PaymentDecorator) unless Spree::Payment.included_modules.include?(Vpago::PaymentDecorator)
+Spree::Payment.prepend(Vpago::PaymentDecorator) unless Spree::Payment.include?(Vpago::PaymentDecorator)

data/app/models/vpago/payouts_generator.rb

@@ -39,7 +39,7 @@ module Vpago
 
         # If any payouts were rounded, the total may increase slightly.
         # Update the payment amount to match the sum of payouts to avoid mismatch errors.
-        payment.update(amount: payouts.map(&:amount).sum)
+        payment.update(amount: payouts.map(&:amount).sum, preload_payout_ids: payouts.map(&:id))
 
         payouts
       end

data/app/views/spree/vpago_payments/forms/spree/gateway/_payway_v2.html.erb

@@ -72,7 +72,7 @@
 
       shouldShowRedirectContainer = !shouldOpenCheckoutUrl && shouldOpenAbaPayDeeplink;
       if(shouldShowRedirectContainer){
-        showRedirectContainer("Open ABA Mobile", () => openDeeplinkUrl(data.abapay_deeplink));
+        showRedirectContainer("Open ABA Mobile", () => window.location.href = data.abapay_deeplink);
       }
     })
     .catch(function(error) {

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.2-pre37'.freeze
+  VERSION = '2.2.2-pre40'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/payway_v2/payment_request_updater.rb

@@ -52,13 +52,11 @@ module Vpago
       end
 
       def check_payway_status
-        trans_status = Vpago::PaywayV2::TransactionStatus.new(@payment)
-        trans_status.call
-        trans_status
+        @payment.payment_method.check_transaction(@payment)
       end
 
       def items_eligible?
-        @payment&.order&.line_items&.all?(&:sufficient_stock?) == true
+        @payment&.order&.line_items&.all?(&:sufficient_stock?) == true # rubocop:disable Style/SafeNavigationChainLength
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre37
+  version: 2.2.2.pre.pre40
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-23 00:00:00.000000000 Z
+date: 2026-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday