spree_vpago 2.3.10 → 2.3.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83977e379d14f72df6f9812c0053817ead75a9a29d9dbb26efbb505679fd34f1
-  data.tar.gz: d478a6a31649dba472adebefb5890c60a5222107252c71b9a835d7260e95cf97
+  metadata.gz: f7c6fc347bce48aed54a98bf47d4432f79ec1144a882f7c6cf14b55ad1f87663
+  data.tar.gz: c62d76d1e6661bc0460b3a4be75feeb6d4c6c8a3b1278d1b62dccb53324b6e1a
 SHA512:
-  metadata.gz: 9c76fd67f78cacde387d8b817ec6b2ff9707dc39fb31d1419498af347c8aee1bf12d4d533af79c0ad90efb44ae80517096a9578e803e6fd2fe937380eca8478b
-  data.tar.gz: 3d44c01a03c35f692ba70d5091a41ca03d9c7e3e9fdd37e0a87b984196e155c37534462b39d396e970462a2522fa6fdde9d60b525147689ccc1184c28e8cb42f
+  metadata.gz: 2973459504b60f1f6308e6f0db319c1b2e25f19747d2f94aeb3bf48f69b75e87c508f57c197a49440920464952df30e1cb3b6797ba9a782ff375ec1a7c0b0893
+  data.tar.gz: e8418cf6a8298850075104813a93da543ab148327d7ee6cafdd63be2c1ce5eb64fe457888d695af4931a1b459ee3e60282553e22875a7b530d3099d002c60b8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.10)
+    spree_vpago (2.3.12)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

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

@@ -0,0 +1,21 @@
+module Spree
+  module Admin
+    class PaymentAcledaV2BaseController < Spree::Admin::BaseController
+      include Spree::Backend::Callbacks
+
+      before_action :load_payment, only: %i[show update]
+      before_action :validate_order, only: [:update]
+
+      def validate_order
+        return unless @payment.order.completed?
+
+        flash[:error] = Spree.t('vpago.payments.not_allow_for_order_completed')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      def load_payment
+        @payment = Payment.find_by!(number: params[:id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class PaymentAcledaV2CheckersController < PaymentAcledaV2BaseController
+      include Spree::Backend::Callbacks
+
+      def update
+        options = {
+          updated_by_user_id: try_spree_current_user.id,
+          updated_reason: Spree.t('vpago.payments.checker_updated_by_description')
+        }
+        spree_updater = Vpago::AcledaV2::PaymentRequestUpdater.new(@payment, options)
+        spree_updater.call
+
+        @payment.reload
+
+        if @payment.order.completed?
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payments))
+        else
+          flash[:error] = Spree.t(:unsuccessfully_updated, resource: Spree.t(:payments))
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Spree
+  module Admin
+    class PaymentAcledaV2QueriersController < PaymentAcledaV2BaseController
+      include Spree::Backend::Callbacks
+
+      around_action :set_writing_role, only: %i[show]
+
+      def show
+        tran_status = @payment.payment_method.check_transaction(@payment)
+
+        if tran_status.success?
+          @payment.update_column(:gateway_status, true)
+          flash[:success] =
+            Spree.t('vpago.payments.payment_found_with_result', result: tran_status.json_response)
+        else
+          flash[:error] = Spree.t('vpago.payments.payment_not_found_with_error', error: tran_status.error_message)
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+        VpagoLogger.error(
+          label: 'Spree::Admin::PaymentAcledaV2QueriersController#show gateway_timeout',
+          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
+        )
+        flash[:error] = Spree.t('vpago.payments.gateway_timeout')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      private
+
+      def set_writing_role
+        ActiveRecord::Base.connected_to(role: :writing) do
+          yield if block_given?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Spree
+  module Admin
+    class PaymentVattanacBaseController < Spree::Admin::BaseController
+      include Spree::Backend::Callbacks
+
+      before_action :load_payment, only: %i[show update]
+      before_action :validate_order, only: [:update]
+
+      def validate_order
+        return unless @payment.order.completed?
+
+        flash[:error] = Spree.t('vpago.payments.not_allow_for_order_completed')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      def load_payment
+        @payment = Payment.find_by!(number: params[:id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class PaymentVattanacCheckersController < PaymentVattanacBaseController
+      include Spree::Backend::Callbacks
+
+      def update
+        options = {
+          updated_by_user_id: try_spree_current_user.id,
+          updated_reason: Spree.t('vpago.payments.checker_updated_by_description')
+        }
+        spree_updater = Vpago::Vattanac::PaymentRequestUpdater.new(@payment, options)
+        spree_updater.call
+
+        @payment.reload
+
+        if @payment.order.completed?
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payments))
+        else
+          flash[:error] = Spree.t(:unsuccessfully_updated, resource: Spree.t(:payments))
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Spree
+  module Admin
+    class PaymentVattanacQueriersController < PaymentVattanacBaseController
+      include Spree::Backend::Callbacks
+
+      around_action :set_writing_role, only: %i[show]
+
+      def show
+        tran_status = @payment.payment_method.check_transaction(@payment)
+
+        if tran_status.success?
+          @payment.update_column(:gateway_status, true)
+          flash[:success] =
+            Spree.t('vpago.payments.payment_found_with_result', result: tran_status.json_response)
+        else
+          flash[:error] = Spree.t('vpago.payments.payment_not_found_with_error', error: tran_status.error_message)
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+        VpagoLogger.error(
+          label: 'Spree::Admin::PaymentVattanacQueriersController#show gateway_timeout',
+          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
+        )
+        flash[:error] = Spree.t('vpago.payments.gateway_timeout')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      private
+
+      def set_writing_role
+        ActiveRecord::Base.connected_to(role: :writing) do
+          yield if block_given?
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/vpago_payments_controller.rb

@@ -23,6 +23,7 @@ module Spree
     # GET
     def processing
       @order = @payment.order
+      return redirect_to @payment.success_url, allow_other_host: true if @order.completed?
 
       VpagoLogger.log(label: 'Spree::VpagoPaymentsController#processing', data: vpago_log_context)
     end

data/app/models/vpago/payment_method_decorator.rb

@@ -80,6 +80,10 @@ module Vpago
         ::Vpago::Acleda::PaymentRequestUpdater
       elsif type_acleda_mobile?
         ::Vpago::AcledaMobile::PaymentRequestUpdater
+      elsif type_acleda_v2?
+        ::Vpago::AcledaV2::PaymentRequestUpdater
+      elsif type_vattanac?
+        ::Vpago::Vattanac::PaymentRequestUpdater
       end
     end
 
@@ -107,6 +111,10 @@ module Vpago
       type == Spree::PaymentMethod::TYPE_WINGSDK
     end
 
+    def type_vattanac?
+      type == Spree::PaymentMethod::TYPE_VATTANAC
+    end
+
     def type_vattanac_mini_app?
       type == Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP
     end

data/app/serializers/spree/v2/storefront/payment_method_serializer_decorator.rb

@@ -14,6 +14,12 @@ module Spree
 
             pref.blank? || pref[:payment_option].blank? ? payment_method.method_type : pref[:payment_option]
           end
+
+          # Overried the payment method type to show all payment methods as one list on App.
+          # Controlled by ENV["PAYMENT_METHOD_VIEW"] = "split" | "join" (default: "join").
+          base.attribute :type do |payment_method|
+            ENV.fetch('PAYMENT_METHOD_VIEW', 'join') == 'split' ? payment_method.type : 'payment_method'
+          end
         end
       end
     end

data/app/views/spree/admin/payments/source_views/_acleda_v2.html.erb

@@ -1,5 +1,5 @@
 <%= render 'spree/admin/payments/source_views/vpago_payment_tmpl',
     payment: payment,
-    check_status_url: '',
-    heal_payment_url: '',
+    check_status_url: admin_payment_acleda_v2_querier_path(payment),
+    heal_payment_url: admin_payment_acleda_v2_checker_path(payment),
     manual_update_payment_url: '' %>

data/app/views/spree/admin/payments/source_views/_vattanac.html.erb

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/payments/source_views/vpago_payment_tmpl',
-    payment: payment, 
-    check_status_url: '',
-    heal_payment_url: '',
+    payment: payment,
+    check_status_url: admin_payment_vattanac_querier_path(payment),
+    heal_payment_url: admin_payment_vattanac_checker_path(payment),
     manual_update_payment_url: ''
 %>

data/config/routes.rb

@@ -73,6 +73,12 @@ Spree::Core::Engine.add_routes do
     resources :payment_payway_checkers
     resources :payment_payway_markers
 
+    resources :payment_acleda_v2_queriers, only: [:show]
+    resources :payment_acleda_v2_checkers, only: [:update]
+
+    resources :payment_vattanac_queriers, only: [:show]
+    resources :payment_vattanac_checkers, only: [:update]
+
     resources :products do
       resources :payout_profile_products
     end

data/lib/spree_vpago/version.rb

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

data/lib/vpago/acleda_v2/payment_request_updater.rb

@@ -0,0 +1,54 @@
+module Vpago
+  module AcledaV2
+    class PaymentRequestUpdater < ::Vpago::PaymentRequestUpdater
+      def call
+        return if @payment.order.paid?
+
+        if items_eligible?
+          process_payment_status
+        else
+          mark_items_as_ineligible
+        end
+      end
+
+      private
+
+      def process_payment_status
+        checker = @payment.payment_method.check_transaction(@payment)
+
+        if checker.success?
+          mark_payment_as_success
+        elsif checker.failed? && !ignore_on_failed?
+          mark_payment_as_failed(checker.error_message)
+        end
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+        VpagoLogger.error(
+          label: 'Vpago::AcledaV2::PaymentRequestUpdater#process_payment_status gateway_timeout',
+          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
+        )
+      end
+
+      def items_eligible?
+        @payment&.order&.line_items&.all?(&:sufficient_stock?) == true # rubocop:disable Style/SafeNavigationChainLength
+      end
+
+      def mark_items_as_ineligible
+        @error_message = 'Items are not eligible due to insufficient stock'
+        marker_options = @options.merge(status: false, description: @error_message)
+        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
+      end
+
+      def mark_payment_as_success
+        @error_message = nil
+        marker_options = @options.merge(status: true, description: nil)
+        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
+      end
+
+      def mark_payment_as_failed(error_message)
+        @error_message = error_message
+        marker_options = @options.merge(status: false, description: @error_message)
+        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
+      end
+    end
+  end
+end

data/lib/vpago/vattanac/payment_request_updater.rb

@@ -0,0 +1,54 @@
+module Vpago
+  module Vattanac
+    class PaymentRequestUpdater < ::Vpago::PaymentRequestUpdater
+      def call
+        return if @payment.order.paid?
+
+        if items_eligible?
+          process_payment_status
+        else
+          mark_items_as_ineligible
+        end
+      end
+
+      private
+
+      def process_payment_status
+        checker = @payment.payment_method.check_transaction(@payment)
+
+        if checker.success?
+          mark_payment_as_success
+        elsif checker.failed? && !ignore_on_failed?
+          mark_payment_as_failed(checker.error_message)
+        end
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+        VpagoLogger.error(
+          label: 'Vpago::Vattanac::PaymentRequestUpdater#process_payment_status gateway_timeout',
+          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
+        )
+      end
+
+      def items_eligible?
+        @payment&.order&.line_items&.all?(&:sufficient_stock?) == true # rubocop:disable Style/SafeNavigationChainLength
+      end
+
+      def mark_items_as_ineligible
+        @error_message = 'Items are not eligible due to insufficient stock'
+        marker_options = @options.merge(status: false, description: @error_message)
+        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
+      end
+
+      def mark_payment_as_success
+        @error_message = nil
+        marker_options = @options.merge(status: true, description: nil)
+        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
+      end
+
+      def mark_payment_as_failed(error_message)
+        @error_message = error_message
+        marker_options = @options.merge(status: false, description: @error_message)
+        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
+      end
+    end
+  end
+end

data/lib/vpago/vattanac/transaction_status.rb

@@ -13,6 +13,22 @@ module Vpago
         @response.dig('data', 'status') == 'SUCCESS'
       end
 
+      def error_message
+        @response.dig('msgEntity', 'message') || @response.dig('data', 'message') || 'Unknown error'
+      end
+
+      # msgEntity.code is the API-envelope result code ("0" = call succeeded; check
+      # data.status for the actual transaction state). Any other code is a gateway-level
+      # error with no transaction data (e.g. "03" / "Transaction not found") and is
+      # treated as terminal failure.
+      def failed?
+        @response.dig('msgEntity', 'code').to_s != '0'
+      end
+
+      def pending?
+        !success? && !failed?
+      end
+
       private
 
       def payload
@@ -20,4 +36,4 @@ module Vpago
       end
     end
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.3.10
+  version: 2.3.12
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-08-27 00:00:00.000000000 Z
+date: 2026-09-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -151,11 +151,17 @@ files:
 - app/assets/javascripts/vpago/vpago_payments/user_informers/firebase.js
 - app/controllers/.gitkeep
 - app/controllers/spree/acleda_redirects_controller.rb
+- app/controllers/spree/admin/payment_acleda_v2_base_controller.rb
+- app/controllers/spree/admin/payment_acleda_v2_checkers_controller.rb
+- app/controllers/spree/admin/payment_acleda_v2_queriers_controller.rb
 - app/controllers/spree/admin/payment_methods_controller_decorator.rb
 - app/controllers/spree/admin/payment_payway_base_controller.rb
 - app/controllers/spree/admin/payment_payway_checkers_controller.rb
 - app/controllers/spree/admin/payment_payway_markers_controller.rb
 - app/controllers/spree/admin/payment_payway_queriers_controller.rb
+- app/controllers/spree/admin/payment_vattanac_base_controller.rb
+- app/controllers/spree/admin/payment_vattanac_checkers_controller.rb
+- app/controllers/spree/admin/payment_vattanac_queriers_controller.rb
 - app/controllers/spree/admin/payment_wing_sdk_base_controller.rb
 - app/controllers/spree/admin/payment_wing_sdk_checkers_controller.rb
 - app/controllers/spree/admin/payment_wing_sdk_markers_controller.rb
@@ -400,6 +406,7 @@ files:
 - lib/vpago/acleda_mobile/transaction_status.rb
 - lib/vpago/acleda_v2/base.rb
 - lib/vpago/acleda_v2/checkout.rb
+- lib/vpago/acleda_v2/payment_request_updater.rb
 - lib/vpago/acleda_v2/transaction_status.rb
 - lib/vpago/http_timeouts.rb
 - lib/vpago/payment_amount_calculator.rb
@@ -425,6 +432,7 @@ files:
 - lib/vpago/true_money/transaction_status.rb
 - lib/vpago/vattanac/base.rb
 - lib/vpago/vattanac/checkout.rb
+- lib/vpago/vattanac/payment_request_updater.rb
 - lib/vpago/vattanac/transaction_status.rb
 - lib/vpago/vattanac_mini_app/base.rb
 - lib/vpago/vattanac_mini_app/checkout.rb