spree_vpago 2.2.2.pre.pre24 → 2.2.2.pre.pre25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 721ccf1d49ec1dd4bcd47d1c138ed9b5ed02010db7144c1d37c510328e2abf4e
-  data.tar.gz: b343853dacfeb78766c319b51145f9d5afc05369046148d4a8d6d1d70d45ed3b
+  metadata.gz: 29529e321925044873800efe95fe7c33f3a160eb6e1834bc559a13643312e611
+  data.tar.gz: f981b34874e102697eabcc34c99241ceb1cde1f173c2606ba4c60e971c74e481
 SHA512:
-  metadata.gz: 63c77347467d2b76d8400f99e11c1b4c9292b030b59a4a3a30bfac7eec77a3a0081ba0ead43c18e3066fdf47b8875899ab0a2484e0187591a23f6d18ab0a5e89
-  data.tar.gz: 498ce7bcc24ebc63b318c882e9de4a48850175474b7c4b04176f1ff2c8e2c6eaffd6b0f66d039d889c75da792d6f2bc646b7b29d80a2903a9ed9332e747b67d2
+  metadata.gz: 388ee4b184d978d3c618418e67371e7dc7117a86dad1a55e58241d06cf903d037282cd3cad479bcff2bfab8af57bda450c657a91a4ce468b223eed55b04aadc0
+  data.tar.gz: a2565dfd78710e26b006cceb23f2d6b5218f7d27cd728443894df95af5c00c4f615a134582e67d93e7c5e0e6e5174321e6a0d0f2ea0561d2b706bced8f23c688

data/Gemfile.lock

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

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

@@ -17,15 +17,31 @@ async function checkTransactionPeriodically({
   var shouldPoll = true;
   var intervalId;
   var startTime = Date.now();
+  var pollCount = 0;
+
+  console.log("[Vpago] Starting transaction status polling", {
+    url: checkTransactionUrl,
+    maxDurationMs,
+    pollIntervalMs,
+  });
 
   var pollStatus = function () {
-    if (shouldPoll) return;
+    if (!shouldPoll) return;
 
     if (Date.now() - startTime >= maxDurationMs) {
+      console.warn(
+        "[Vpago] Polling timeout reached after " + pollCount + " attempts",
+      );
       if (intervalId) clearInterval(intervalId);
       return;
     }
 
+    pollCount++;
+    var elapsedMs = Date.now() - startTime;
+    console.log(
+      "[Vpago] Poll attempt #" + pollCount + " (elapsed: " + elapsedMs + "ms)",
+    );
+
     fetch(checkTransactionUrl, {
       method: "GET",
       headers: { Accept: "application/json" },
@@ -42,6 +58,8 @@ async function checkTransactionPeriodically({
             ? String(result.body.status)
             : "pending";
 
+        console.log("[Vpago] Transaction status:", JSON.stringify(result.body));
+
         if (status === "success" || status === "failed") {
           shouldPoll = false;
           if (intervalId) clearInterval(intervalId);
@@ -50,7 +68,9 @@ async function checkTransactionPeriodically({
           if (status === "failed") onFailure(status);
         }
       })
-      .catch(function () {});
+      .catch(function (error) {
+        console.error("[Vpago] Transaction status polling failed:", error);
+      });
   };
 
   intervalId = window.setInterval(pollStatus, pollIntervalMs);

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

@@ -19,6 +19,10 @@ module Spree
     validates :preferred_abapay_khqr_deeplink_option, inclusion: { in: ABAPAY_KHQR_DEEPLINK_OPTIONS }, if: :abapay_khqr_deeplink?
     validates :preferred_payment_option, inclusion: { in: PAYMENT_OPTIONS }
 
+    def reviewing_mode?
+      preferred_reviewing
+    end
+
     # override: partial to render in admin
     def method_type
       'payway_v2'

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

@@ -33,13 +33,17 @@
     }
   }
 
-  function showRedirectContainer(buttonLabel, onClick) {
+  function showRedirectContainer(buttonLabel = null, onClick = null) {
     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);
+    if (buttonLabel && onClick) {
+      redirectButton.textContent = buttonLabel;
+      redirectButton.addEventListener('click', onClick);
+    } else {
+      redirectButton.style.display = 'none';
+    }
 
     loadingContainer.style.display = 'none';
     redirectContainer.style.removeProperty('display');
@@ -61,6 +65,18 @@
         var shouldDelayBeforeOpenCheckoutUrl = false;
         var shouldShowRedirectContainer = false;
 
+        console.log("[Vpago] checkout response data:", JSON.stringify(data));
+
+        // When status code is 4 (dublicated transaction),
+        // Possibly user refresh the checkout page even after the transaction is completed.
+        // So in this case, we should hide loading spinner and show redirect container UI
+        // While it check transaction status in the background. It will automatically redirect user to the result page after checking.
+        if (data.status.code === 4){
+          shouldShowRedirectContainer = true;
+          showRedirectContainer();
+          return;
+        }
+
         if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
           openDeeplinkUrl(data.abapay_deeplink);
           shouldDelayBeforeOpenCheckoutUrl = true;

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

@@ -1,4 +1,4 @@
-<% if @payment.payment_method.preferred_reviewing? %>
+<% if @payment.payment_method.reviewing_mode? %>
   <script>
     // This block in /processing is purely JUST for review/audit purposes (ABA requirement).
     // It checks the bank transaction status periodically without actually
@@ -17,8 +17,8 @@
     document.addEventListener("DOMContentLoaded", function() {
       window.checkTransactionPeriodically({
         checkTransactionUrl: "<%= raw @payment.check_transaction_url %>",
-        onFailure: () => console.log("ABA Review Mode: bank transaction failed ❌"),
-        onSuccess: () => console.log("ABA Review Mode: bank transaction confirmed ✅"),
+        onFailure: () => console.log("[Vpago] ABA Review Mode: bank transaction failed ❌"),
+        onSuccess: () => console.log("[Vpago] ABA Review Mode: bank transaction confirmed ✅"),
         maxDurationMs: 5 * 60 * 1000, // 5 minutes,
         pollIntervalMs: 5000, // 5 seconds
       })

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/transaction_status.rb

@@ -1,37 +1,52 @@
 require 'faraday'
 
+# API documentation:
+# https://developer.payway.com.kh/check-transaction-14530826e0
 module Vpago
   module PaywayV2
     class TransactionStatus < Base
-      # status:
-      # 0 – Approved, PRE_AUTH, PREAUTH_APPROVED
-      # 1 – Created
-      # 2 – Pending
-      # 3 – Declined
-      # 4 – Refunded
-      # 5 – Wrong Hash
-      # 7 - Cancelled
-      # 11 – Other Server-side Error
       def call
         @response = check_remote_status
       end
 
-      def status
-        json_response['status']&.to_s
+      # 00 : Success!
+      # 5 : Invalid hash
+      # 6 : Transaction not found
+      # 8 : Invalid merchant profile
+      # 11 : Internal server error
+      # 429 : Reach request limit
+      def status_code
+        status_data = json_response['status']
+        return nil unless status_data.is_a?(Hash)
+
+        status_data['code']
+      end
+
+      # APPROVED : Transaction successfully completed with the full purchase amount.
+      # PRE-AUTH : Transaction successfully processed with a pre-authorization hold on funds pending final capture.
+      # REFUNDED : Transaction has been fully or partially refunded.
+      # PENDING : Transaction is awaiting payment completion by the payer.
+      # DECLINED : Transaction has been declined.
+      # CANCELLED : Merchant canceled the pre-authorization or closed the transaction.
+      def payment_status
+        data = json_response['data']
+        return nil unless data.is_a?(Hash)
+
+        data['payment_status']
       end
 
       def success?
-        status == '0'
+        %w[APPROVED PRE-AUTH].include?(payment_status)
       end
 
       # request failed does not mean payment failed.
       # but it failed when status is failed.
       def pending?
-        %w[1 2].include?(status)
+        %w[PENDING].include?(payment_status)
       end
 
       def failed?
-        %w[3 4 5 7].include?(status)
+        %w[5 6 8].include?(status_code) || %w[DECLINED CANCELLED].include?(payment_status)
       end
 
       def check_remote_status
@@ -76,7 +91,7 @@ module Vpago
         # somehow php counter part are not able to decode if the \n present.
         hash.delete("\n")
       end
-      
+
       def check_transaction_url
         "#{host}/api/payment-gateway/v1/payments/check-transaction-2"
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre24
+  version: 2.2.2.pre.pre25
 platform: ruby
 authors:
 - You