spree_vpago 2.2.2.pre.pre20 → 2.2.2.pre.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 821936697cd70f073c9e150a8ad0158f9f14c61ced8298678f29e34705def9b6
-  data.tar.gz: 959d5f7ab9e0cb76af94dd105678cc6ac78309fb91e19158208e67b2dd8a195b
+  metadata.gz: '05536639cc3731496d0e01bd7ecccb56062d2b412ca795b7a924deac49c9c9a5'
+  data.tar.gz: f2dbe115e30add8edc1188b3c8a8ae855235d88197d45683615cb5dbe4b17445
 SHA512:
-  metadata.gz: d6b7fecf9f5c79916b72d08847e00d304945f4f9d551cf721128c7f898ba261f8961810d14ee0a6e586c3b0515073d6d17d41cfa3fbad75d4add051f16e75875
-  data.tar.gz: 918543e674ec44b62aa0e7a86df7c94393f472967c166f4d3e6c88a78c71969dbc64a0dd49a6ff6f5ffea430467f76354a1dfec767c535aee48a40b42b3179a8
+  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.pre20)
+    spree_vpago (2.2.2.pre.pre21)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

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/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/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/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.2-pre20'.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre20
+  version: 2.2.2.pre.pre21
 platform: ruby
 authors:
 - You
@@ -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;
-    },
-  });
-};