spree_vpago 2.2.2.pre.pre19 → 2.2.2.pre.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe27a3c3be7d021399478823880839edf3366fa5a8b9a3395e813f584a27cfac
-  data.tar.gz: b6966f5ee14676a590ea06e05cebb411aa5a4500fe6c38a2f100b7c69c2cb5d4
+  metadata.gz: '05536639cc3731496d0e01bd7ecccb56062d2b412ca795b7a924deac49c9c9a5'
+  data.tar.gz: f2dbe115e30add8edc1188b3c8a8ae855235d88197d45683615cb5dbe4b17445
 SHA512:
-  metadata.gz: 5abfe727cad505307d532928096edb04925ce2aed86469f3ace8b881db910c570f9c4a2514f10311b9d307127ae15e548fee258964066cdf1a131ec507e9ac34
-  data.tar.gz: e397f93cd854c21f9de913b73799cdd7330d33a55fa9720106cc1ab2dcd80fe7f6d0c181e5f99036ae7ae9a110c69eda02df80831a283f85b2a459d9511457bc
+  metadata.gz: 43688b89eab0f758808875722761c47b35d460c2c76501b3ff0218ea25b60d2b7859183cf4733a66704ae0f10b72b4f7bc9a75a6b1e97a1139f893c08b5cf008
+  data.tar.gz: 5642262ac80774489724678f53fb027e09c2257dbed79ae9fa32c3cf9f806baee60315120053f97feb272779d8fda1b3497c4cdf7e0941e1c9c9dbffbd838012

data/.env.example

@@ -1,7 +1,3 @@
-#pre-auth 
-PAYWAY_V2_PRE_AUTH_COMPLETE_PATH=""
-PAYWAY_V2_PRE_AUTH_CANCEL_PATH=""
-
 #vattanac-mini-app 
 VATTANAC_PUBLIC_KEY=""
 VATTANAC_AES_SECRET_KEY=""

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre19)
+    spree_vpago (2.2.2.pre.pre21)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -188,7 +188,7 @@ GEM
     faraday-http-cache (2.5.0)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    faraday-retry (2.4.0)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
     ffaker (2.21.0)
     ffi (1.15.5)
@@ -242,7 +242,7 @@ GEM
       gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.33.5)
+    google-protobuf (4.33.4)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.9.0)
@@ -259,7 +259,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.78.1)
+    grpc (1.76.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)

data/README.md

@@ -95,14 +95,6 @@ ENV configuration:
 
 ```ruby
 ENV['PAYWAY_MERCHANT_PROFILE_CONTENT_TYPE'] # html, json
-ENV['PAYWAY_CHECKOUT_PATH']
-ENV['PAYWAY_CHECK_TRANSACTION_PATH']
-ENV['PAYWAY_RETURN_CALLBACK_URL']
-ENV['PAYWAY_CONTINUE_SUCCESS_CALLBACK_URL']
-
-#pre-auth
-ENV['PAYWAY_V2_PRE_AUTH_COMPLETE_PATH']
-ENV['PAYWAY_V2_PRE_AUTH_CANCEL_PATH']
 ```
 
 Payment method configuration:

data/app/assets/javascripts/vpago/vpago_payments/check_transaction_periodically.js

@@ -0,0 +1,59 @@
+/**
+ * Polls the transaction status endpoint until the payment succeeds, fails, or
+ * the maximum polling duration is reached.
+ *
+ * @param {Object} options
+ * @param {string} options.checkTransactionUrl
+ * @param {Function} options.onSuccess
+ * @param {Function} options.onFailure
+ */
+async function checkTransactionPeriodically({
+  checkTransactionUrl,
+  onSuccess,
+  onFailure,
+}) {
+  var pollIntervalMs = 5000;
+  var maxDurationMs = 10 * 60 * 1000;
+  var shouldPoll = true;
+  var intervalId;
+  var startTime = Date.now();
+
+  var pollStatus = function () {
+    if (shouldPoll) return;
+
+    if (Date.now() - startTime >= maxDurationMs) {
+      if (intervalId) clearInterval(intervalId);
+      return;
+    }
+
+    fetch(checkTransactionUrl, {
+      method: "GET",
+      headers: { Accept: "application/json" },
+      credentials: "same-origin",
+    })
+      .then(function (response) {
+        return response.json().then(function (body) {
+          return { ok: response.ok, body: body };
+        });
+      })
+      .then(function (result) {
+        var status =
+          result.body && result.body.status
+            ? String(result.body.status)
+            : "pending";
+
+        if (status === "success" || status === "failed") {
+          shouldPoll = false;
+          if (intervalId) clearInterval(intervalId);
+
+          if (status === "success") onSuccess(status);
+          if (status === "failed") onFailure(status);
+        }
+      })
+      .catch(function () {});
+  };
+
+  intervalId = window.setInterval(pollStatus, pollIntervalMs);
+}
+
+window.checkTransactionPeriodically = checkTransactionPeriodically;

data/app/controllers/spree/vpago_payments_controller.rb

@@ -19,36 +19,43 @@ module Spree
     end
 
     # GET
-    def check_transaction
+    def processing
       @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify
       raise ActiveRecord::RecordNotFound unless @payment.present?
 
-      checker = @payment.payment_method.check_transaction(@payment)
-
-      if checker.success?
-        render json: { status: :success }, status: :ok
-      elsif checker.failed?
-        render json: { status: :failed }, status: :payment_required
-      else
-        render json: { status: :pending }, status: :accepted
-      end
+      @order = @payment.order
     end
 
     # GET
-    def processing
+    def success
       @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify
       raise ActiveRecord::RecordNotFound unless @payment.present?
 
       @order = @payment.order
+      raise CanCan::AccessDenied unless @order.completed?
     end
 
     # GET
-    def success
+    def check_transaction
       @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify
       raise ActiveRecord::RecordNotFound unless @payment.present?
-
-      @order = @payment.order
-      raise CanCan::AccessDenied unless @order.completed?
+      
+      return render json: { status: :success }, status: :ok if @payment.completed?
+      return render json: { status: :failed }, status: :ok if @payment.failed?
+
+      if @payment.payment_method.support_check_transaction_api?
+        checker = @payment.payment_method.check_transaction(@payment)
+
+        if checker.success?
+          render json: { status: :success }, status: :ok
+        elsif checker.try(:failed?) == true
+          render json: { status: :failed }, status: :ok
+        else
+          render json: { status: :pending }, status: :ok
+        end
+      else
+        render json: { status: :pending }, status: :ok
+      end
     end
 
     # POST

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -4,17 +4,6 @@ module Vpago
       'firebase'
     end
 
-    # eg. forms/spree/gateway/payway_v2
-    def render_form
-      render partial: "spree/vpago_payments/forms/#{@payment.payment_method.class.to_s.underscore}"
-    end
-
-    def render_transaction_checker
-      if @payment.payment_method.support_check_transaction_api?
-        render partial: 'spree/vpago_payments/transaction_checker'
-      end
-    end
-
     # when return nil, each payment method should use their default URL.
     # eg. PayWayV2 will use the continue_success_url as deeplink back URL.
     def custom_return_deeplink_url

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

@@ -33,11 +33,6 @@ module Spree
       preferred_abapay_khqr_deeplink_option.in?(%w[open_both open_checkout_url_only])
     end
 
-    # override
-    def support_check_transaction_api?
-      true
-    end
-
     # override
     def default_payout_profile
       Spree::PayoutProfiles::PaywayV2.default
@@ -72,12 +67,6 @@ module Spree
       !enable_pre_auth?
     end
 
-    # override
-    def check_status(payment)
-      checker = check_transaction(payment)
-      checker.success?
-    end
-
     # override
     # authorize is used when pre auth enabled
     def authorize(_amount, _source, gateway_options = {})
@@ -159,7 +148,6 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Payment has been canceled.')
     end
 
-    # override
     def check_transaction(payment)
       checker = Vpago::PaywayV2::TransactionStatus.new(payment)
       checker.call

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

@@ -73,8 +73,6 @@ module Spree
       [refund_issuer.success?, refund_issuer.parsed_response]
     end
 
-    private
-
     def check_transaction(payment)
       checker = Vpago::TrueMoney::TransactionStatus.new(payment)
       checker.call

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

@@ -51,8 +51,6 @@ module Spree
       ActiveMerchant::Billing::Response.new(true, '')
     end
 
-    private
-
     def check_transaction(payment)
       checker = Vpago::Vattanac::TransactionStatus.new(payment)
       checker.call

data/app/models/vpago/payment_decorator.rb

@@ -20,11 +20,11 @@ module Vpago
 
       base.delegate :checkout_url,
                     :web_checkout_url,
-                    :check_transaction_url,
                     :processing_url,
                     :success_url,
-                    :process_payment_url,
                     :success_deeplink_url,
+                    :check_transaction_url,
+                    :process_payment_url,
                     to: :url_constructor
 
       # Add state machine event for payment retry

data/app/models/vpago/payment_method_decorator.rb

@@ -35,11 +35,10 @@ module Vpago
     def support_payout? = false
     def support_pre_auth? = false
 
-    # Must be explicitly overridden to true by each payment method.
-    # Payment method must implement check_transaction(payment), and its response
-    # must provide: success?, failed?, pending?.
+    # The payment method must implement `check_transaction(payment)`.
+    # The returned object should respond to `.success?`, and optionally `.failed?` and `.pending?`.
     def support_check_transaction_api?
-      false
+      respond_to?(:check_transaction)
     end
 
     # TODO: we have already implement purchase for payway_v2.

data/app/services/vpago/payment_url_constructor.rb

@@ -12,12 +12,12 @@ module Vpago
     def checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=app"
     def web_checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=web"
 
-    def check_transaction_url = "#{base_url}/vpago_payments/check_transaction?#{query}"
     def processing_url = "#{base_url}/vpago_payments/processing?#{query}"
 
     def success_url = "#{base_url}/vpago_payments/success?#{query}"
     def success_deeplink_url = "#{app_scheme}://#{URI(base_url).host}/book/payment?number=#{order.number}&tk=#{order.token}"
 
+    def check_transaction_url = "#{base_url}/vpago_payments/check_transaction?#{query}"
     def process_payment_url = "#{base_url}/vpago_payments/process_payment?#{query}"
 
     def query

data/app/views/layouts/vpago_payments.html.erb

@@ -8,7 +8,7 @@
   <%= csrf_meta_tags %>
   <%= csp_meta_tag %>
 
-  <%= javascript_include_tag "vpago/vpago_payments/payment_processing_listener", 'data-turbo-track': 'reload' %>
+  <%= javascript_include_tag "vpago/vpago_payments/check_transaction_periodically", 'data-turbo-track': 'reload' %>
   <%= javascript_include_tag "vpago/vpago_payments/request_process_payment", 'data-turbo-track': 'reload' %>
   <%= javascript_include_tag "vpago/vpago_payments/user_informers/#{user_informer}", 'data-turbo-track': 'reload' %>
 </head>

data/app/views/spree/vpago_payments/_transaction_checker.html.erb

@@ -1,40 +1,10 @@
-<%# This partial listens to payment status changes from bank and does not process the payment. %>
-<%# When it detects a status change, it automatically redirects to the processing URL for actual processing. %>
-<%# Designed to be used in checkout.html.erb %>
-
 <script>
   document.addEventListener("DOMContentLoaded", function() {
-    var checkTransactionUrl = "<%= j @payment.check_transaction_url %>";
-    var processingUrl = "<%= j @payment.processing_url %>";
-    var pollIntervalMs = 5000;
-    var hasRedirected = false;
-    var intervalId;
-
-    var pollStatus = function() {
-      if (hasRedirected) return;
-
-      fetch(checkTransactionUrl, {
-        method: "GET",
-        headers: { "Accept": "application/json" },
-        credentials: "same-origin"
-      })
-        .then(function(response) {
-          return response.json().then(function(body) {
-            return { ok: response.ok, body: body };
-          });
-        })
-        .then(function(result) {
-          var status = result.body && result.body.status ? String(result.body.status) : "pending";
-
-          if (status === "success" || status === "failed") {
-            hasRedirected = true;
-            if (intervalId) clearInterval(intervalId);
-            window.location.replace(processingUrl);
-          }
-        })
-        .catch(function() {});
-    };
-
-    intervalId = window.setInterval(pollStatus, pollIntervalMs);
+    var processingUrl = "<%= raw @payment.processing_url %>";
+    window.checkTransactionPeriodically({
+      checkTransactionUrl: "<%= raw @payment.check_transaction_url %>",
+      onFailure: () => window.location.replace(processingUrl),
+      onSuccess: () =>  window.location.replace(processingUrl),
+    });
   });
-</script>
+</script>

data/app/views/spree/vpago_payments/checkout.html.erb

@@ -1,9 +1,15 @@
-<h1>Checkout...</h1>
+<div id="vpago_loading_container">
+  Loading...
+</div>
 
-<%# Primary action button fixed at bottom of screen %>
-<%# Each payment method can customize this button (title, onclick) for their specific action. %>
-<%# See: app/views/spree/vpago_payments/forms/spree/gateway/_payway_v2.html.erb for example %>
-<button id="vpago_primary_button" style="display: none;"></button>
+<div id="vpago_redirect_container" style="display: none;">
+  <h1>We're redirecting you to your bank</h1>
+  <p>You'll be returned here after confirming your <strong><%= @payment.display_amount %></strong> payment.</p>
 
-<%= render_transaction_checker %>
-<%= render_form %>
+  <button id="vpago_redirect_button">
+    <!-- Use JS to modify button label and callback -->
+  </button>
+</div>
+
+<%= render partial: "spree/vpago_payments/forms/#{@payment.payment_method.class.to_s.underscore}" %>
+<%= render partial: 'spree/vpago_payments/transaction_checker' %>

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

@@ -11,38 +11,40 @@
   const isTelegram = <%= telegram_user_agent? %>;
   const isMobile = <%= mobile_user_agent? %>;
 
-  const abapayKhqrDeeplink = "<%= @payment.payment_method.abapay_khqr_deeplink? %>";
+  const abapayKhqrDeeplink = <%= @payment.payment_method.abapay_khqr_deeplink? %>;
   const shouldOpenAbaPayDeeplink = isMobile && <%= @payment.payment_method.open_abapay_deeplink? %>;
   const shouldOpenCheckoutUrl = <%= @payment.payment_method.open_checkout_url? %>;
 
-  function openDeeplink(abapay_deeplink) {
+  function openDeeplinkUrl(deeplinkUrl) {
     if(isTelegram){
-      window.open(abapay_deeplink, '_blank');
+      window.open(deeplinkUrl, '_blank');
     } else {
-      window.location.href = abapay_deeplink;
+      window.location.href = deeplinkUrl;
     }
   }
 
-  function openAbapayDeeplink(abapay_deeplink) {
-    document.getElementById("vpago_primary_button").style.display = "block";
-    document.getElementById("vpago_primary_button").innerText = "Open ABA Pay";
-    document.getElementById("vpago_primary_button").addEventListener("click", function() {
-      openDeeplink(abapay_deeplink)
-    });
-
-    openDeeplink(abapay_deeplink)
-  }
-
-  function openCheckoutUrl(checkout_qr_url, delay = 0) {
+  function openUrl(url, delay = 0) {
     if(delay > 0) {
       setTimeout(function() {
-        window.location.href = checkout_qr_url;
+        window.location.href = url;
       }, delay);
     } else {
-      window.location.href = checkout_qr_url;
+      window.location.href = url;
     }
   }
 
+  function showRedirectContainer(buttonLabel, onClick) {
+    const loadingContainer = document.getElementById('vpago_loading_container');
+    const redirectContainer = document.getElementById('vpago_redirect_container');
+    const redirectButton = document.getElementById('vpago_redirect_button');
+
+    redirectButton.textContent = buttonLabel;
+    redirectButton.addEventListener('click', onClick);
+
+    loadingContainer.style.display = 'none';
+    redirectContainer.style.removeProperty('display');
+  }
+
   document.addEventListener("DOMContentLoaded", function () {
     if (abapayKhqrDeeplink) {
       var formData = new FormData(document.getElementById("aba_merchant_request"));
@@ -57,14 +59,21 @@
       })
       .then(function(data) {
         var shouldDelayBeforeOpenCheckoutUrl = false;
+        var shouldShowRedirectContainer = false;
 
         if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
-          openAbapayDeeplink(data.abapay_deeplink);
+          openDeeplinkUrl(data.abapay_deeplink);
           shouldDelayBeforeOpenCheckoutUrl = true;
+          shouldShowRedirectContainer = true;
         }
 
         if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
-          openCheckoutUrl(data.checkout_qr_url, shouldDelayBeforeOpenCheckoutUrl ? 500 : 0);
+          openUrl(data.checkout_qr_url, shouldDelayBeforeOpenCheckoutUrl ? 500 : 0);
+          shouldShowRedirectContainer = false;
+        }
+
+        if(shouldShowRedirectContainer){
+          showRedirectContainer("Open ABA Mobile", () => openDeeplinkUrl(data.abapay_deeplink));
         }
       })
       .catch(function(error) {

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

@@ -1,15 +1,22 @@
 <% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
 <% redirect_urls = @checkout.generate_payment_urls(params[:platform]) %>
-<% @payment.user_informer.payment_is_processing(processing: true) %>
 
 <script>
+  function showRedirectContainer(buttonLabel, onClick) {
+    const loadingContainer = document.getElementById('vpago_loading_container');
+    const redirectContainer = document.getElementById('vpago_redirect_container');
+    const redirectButton = document.getElementById('vpago_redirect_button');
+
+    redirectButton.textContent = buttonLabel;
+    redirectButton.addEventListener('click', onClick);
+
+    loadingContainer.style.display = 'none';
+    redirectContainer.style.removeProperty('display');
+  }
+
   document.addEventListener("DOMContentLoaded", () => {
     const platform = "<%= params[:platform] %>";
     const redirectUrls = <%= redirect_urls.to_json.html_safe %>;
-    const confirmButton = document.getElementById("confirm-payment-button");
-    const firebaseConfigs = <%= Rails.application.credentials.firebase_web_config.to_json.html_safe %>;
-    const docRefPath = "<%= @payment.user_informer.document_reference_path %>";
-    const successUrl = "<%= @payment.success_url %>";
 
     function setupConfirmPaymentButton() {
       if (platform === "app") {
@@ -17,21 +24,11 @@
         setTimeout(() => {
           window.location.href = redirectUrls.webview;
         }, 1500);
-      } else if (confirmButton) {
-        confirmButton.addEventListener("click", () => {
-          window.open(redirectUrls.webview, '_blank');
-        });
-      }
-    }
-
-    function setupPaymentProcessingListener() {
-      if (window.initPaymentProcessingListener) {
-        window.initPaymentProcessingListener(firebaseConfigs, docRefPath, successUrl);
       } else {
-        console.warn("initPaymentProcessingListener is not defined");
+        window.open(redirectUrls.webview, '_blank');
       }
     }
+
     setupConfirmPaymentButton();
-    setupPaymentProcessingListener();
   });
 </script>

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

@@ -11,6 +11,18 @@ end
 %>
 
 <script>
+  function showRedirectContainer(buttonLabel, onClick) {
+    const loadingContainer = document.getElementById('vpago_loading_container');
+    const redirectContainer = document.getElementById('vpago_redirect_container');
+    const redirectButton = document.getElementById('vpago_redirect_button');
+
+    redirectButton.textContent = buttonLabel;
+    redirectButton.addEventListener('click', onClick);
+
+    loadingContainer.style.display = 'none';
+    redirectContainer.style.removeProperty('display');
+  }
+
   const platform = "<%= params[:platform] %>";
   const deeplinkUrl = "<%= raw(result[:deeplink_url]) %>";
   const webUrl = "<%= raw(result[:web_url]) %>";
@@ -25,12 +37,14 @@ end
 
     case "deeplink":
       redirectTo(deeplinkUrl);
+      showRedirectContainer("Continue", () => redirectTo(deeplinkUrl));
       break;
 
     case "all":
-      if (platform === "app") redirectTo(deeplinkUrl);
-      else if (platform === "web") redirectTo(webUrl);
-      else console.error("Unknown platform:", platform);
+      redirectTo(deeplinkUrl);
+      setTimeout(() => {
+        redirectTo(webUrl);
+      }, 1500);
       break;
 
     default:

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

@@ -1,13 +1,23 @@
 <% @checkout = ::Vpago::VattanacMiniApp::Checkout.new(@payment) %>
-<% @payment.user_informer.payment_is_processing(processing: true) %>
 
 <p id="unsupported-message"
    style="margin-top: 10px; font-weight: bold; color: red; display: none;">
 </p>
 
 <script>
-  document.addEventListener("DOMContentLoaded", () => {
+  function showRedirectContainer(buttonLabel, onClick) {
+    const loadingContainer = document.getElementById('vpago_loading_container');
+    const redirectContainer = document.getElementById('vpago_redirect_container');
+    const redirectButton = document.getElementById('vpago_redirect_button');
+
+    redirectButton.textContent = buttonLabel;
+    redirectButton.addEventListener('click', onClick);
 
+    loadingContainer.style.display = 'none';
+    redirectContainer.style.removeProperty('display');
+  }
+
+  document.addEventListener("DOMContentLoaded", () => {
     const setupMiniAppPayment = () => {
       const detectMobileOS = () => {
         const ua = navigator.userAgent || navigator.vendor || window.opera;
@@ -24,8 +34,10 @@
 
       if (os === 'iOS' && window.webkit?.messageHandlers?.startPayment) {
         window.webkit.messageHandlers.startPayment.postMessage(JSON.stringify(payload));
+        showRedirectContainer("Continue", () => window.webkit.messageHandlers.startPayment.postMessage(JSON.stringify(payload)));
       } else if (os === 'Android' && window.AndroidInterface?.startPayment) {
         window.AndroidInterface.startPayment(JSON.stringify(payload));
+        showRedirectContainer("Continue", () => window.AndroidInterface.startPayment(JSON.stringify(payload)));
       } else {
         const unsupported = document.getElementById('unsupported-message');
         unsupported.style.display = 'block';
@@ -33,20 +45,6 @@
       }
     };
 
-    const setupPaymentProcessingListener = () => {
-      const firebaseConfigs = <%= Rails.application.credentials.firebase_web_config.to_json.html_safe %>;
-      const documentReferencePath = "<%= @payment.user_informer.document_reference_path %>";
-      const successUrl = "<%= @payment.success_url %>";
-
-      if (window.initPaymentProcessingListener) {
-        window.initPaymentProcessingListener(firebaseConfigs, documentReferencePath, successUrl);
-      } else {
-        console.log("initPaymentProcessingListener is not defined");
-      }
-    };
-    
-    setupMiniAppPayment();
-    setupPaymentProcessingListener();
-    
+    setupMiniAppPayment();    
   });
 </script>

data/app/views/spree/vpago_payments/processing.html.erb

@@ -14,6 +14,26 @@
       retryDelayMs: 1000,
     })
 
+    // This block in /processing is purely JUST for review/audit purposes (ABA requirement).
+    // It checks the bank transaction status periodically without actually
+    // triggering payment processing again. By the time the user lands
+    // on this page, the transaction is normally complete or failed.
+    //
+    // What it does:
+    // 1. Logs or updates the UI with transaction status for review.
+    // 2. Provides reassurance that the bank transaction was confirmed.
+    // 3. Optionally, could allow a manual retry button if needed.
+    //
+    // What it does NOT do:
+    // - It does NOT call requestProcessPayment again (payment job is
+    //   already unique and idempotent elsewhere).
+    // - It does NOT retry processing unnecessarily.
+    window.checkTransactionPeriodically({
+      checkTransactionUrl: "<%= raw @payment.check_transaction_url %>",
+      onFailure: () => console.log("Bank transaction failed"),
+      onSuccess: () => console.log("Bank transaction confirmed"),
+    })
+
     window.listenToProcessingState({
       firebaseConfigs: firebaseConfigs,
       documentReferencePath: "<%= payment.user_informer.document_reference_path %>",

data/config/routes.rb

@@ -20,10 +20,10 @@ Spree::Core::Engine.add_routes do
   resource :vpago_payments do
     collection do
       get :checkout
-      get :check_transaction
       get :processing
       get :success
 
+      match :check_transaction, via: %i[get]
       match :process_payment, via: %i[get post]
       match :true_money_process_payment, via: %i[get post]
     end

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/checkout.rb

@@ -27,7 +27,7 @@ module Vpago
       end
 
       def checkout_url
-        "#{host}#{ENV.fetch('PAYWAY_CHECKOUT_PATH', nil)}"
+        "#{host}/api/payment-gateway/v1/payments/purchase"
       end
 
       alias action_url checkout_url

data/lib/vpago/payway_v2/pre_auth_canceler.rb

@@ -36,7 +36,7 @@ module Vpago
       end
 
       def cancel_url
-        "#{host}#{ENV.fetch('PAYWAY_V2_PRE_AUTH_CANCEL_PATH')}"
+        "#{host}/api/merchant-portal/merchant-access/online-transaction/pre-auth-cancellation"
       end
     end
   end

data/lib/vpago/payway_v2/pre_auth_completer.rb

@@ -58,7 +58,7 @@ module Vpago
       end
 
       def complete_url
-        "#{host}#{ENV.fetch('PAYWAY_V2_PRE_AUTH_COMPLETE_PATH')}"
+        "#{host}/api/merchant-portal/merchant-access/online-transaction/pre-auth-completion"
       end
 
       def success?

data/lib/vpago/payway_v2/transaction_status.rb

@@ -76,9 +76,9 @@ module Vpago
         # somehow php counter part are not able to decode if the \n present.
         hash.delete("\n")
       end
-
+      
       def check_transaction_url
-        "#{host}#{ENV.fetch('PAYWAY_CHECK_TRANSACTION_PATH', nil)}"
+        "#{host}/api/payment-gateway/v1/payments/check-transaction-2"
       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.pre19
+  version: 2.2.2.pre.pre21
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-25 00:00:00.000000000 Z
+date: 2026-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -146,7 +146,7 @@ files:
 - app/assets/images/payment_logos/wingpay.png
 - app/assets/images/vpago/payway/abapay.png
 - app/assets/images/vpago/payway/cards.png
-- app/assets/javascripts/vpago/vpago_payments/payment_processing_listener.js
+- app/assets/javascripts/vpago/vpago_payments/check_transaction_periodically.js
 - app/assets/javascripts/vpago/vpago_payments/request_process_payment.js
 - app/assets/javascripts/vpago/vpago_payments/user_informers/firebase.js
 - app/controllers/.gitkeep

data/app/assets/javascripts/vpago/vpago_payments/payment_processing_listener.js

@@ -1,95 +0,0 @@
-window.initPaymentProcessingListener = async function (
-  firebaseConfigs,
-  documentReferencePath,
-  successUrl
-) {
-  function log(status, processing, reasonCode, reasonMessage) {
-    console.log(`Status: ${status}`);
-    console.log(`Reason Code: ${reasonCode}`);
-    console.log(
-      `Processing: ${processing ? "Processing..." : "No more process."}`
-    );
-    console.log(`Reason Message: ${reasonMessage}`);
-  }
-
-  window.listenToProcessingState({
-    firebaseConfigs,
-    documentReferencePath,
-
-    onPaymentIsProcessing(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log("Payment is processing", processing, reasonCode, reasonMessage);
-    },
-
-    onPaymentIsRetrying(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log("Payment is retrying", processing, reasonCode, reasonMessage);
-    },
-
-    onOrderIsProcessing(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log("Order is processing", processing, reasonCode, reasonMessage);
-    },
-
-    onOrderIsCompleted(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log("Order is completed", processing, reasonCode, reasonMessage);
-    },
-
-    onOrderProcessFailed(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log("Order process failed", processing, reasonCode, reasonMessage);
-    },
-
-    onPaymentProcessFailed(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log("Payment process failed", processing, reasonCode, reasonMessage);
-    },
-
-    onCompleted(
-      orderState,
-      paymentState,
-      processing,
-      reasonCode,
-      reasonMessage
-    ) {
-      log(
-        "Completed — redirecting to success URL",
-        processing,
-        reasonCode,
-        reasonMessage
-      );
-      window.location.href = successUrl;
-    },
-  });
-};