spree_vpago 2.2.2.pre.pre4 → 2.2.2.pre.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a0ba07837392b1baedf9b89ea7e09de961d6176200c2ad7f9e1d76c81fca99b3
-  data.tar.gz: 852c658f7e0125dd1f730f7c1ffb07296c46376e8d536baaa298e5b209c9fe4a
+  metadata.gz: 1a10395ce29f627210dcc1d925b2f54084896dfe62232ea005e07aa02df3b5d8
+  data.tar.gz: 562854f5952bd693b6247b72db976fcb46efd0d3849e636b25bb634499b57b29
 SHA512:
-  metadata.gz: 9577ff4c2005f41930073a86daf4c7fb8b0a5ea0e9148b6fc26a910eb21a0ef3c798fbf65985c2e3a250c3aec342e4dc89b0bb4f4139d1e6738fd3394d620602
-  data.tar.gz: fd310d6641367ab174a74d9507edfcd90565aa1a3013b19fe16ced1f7079e0b1dd635665b4d2bd4c80af5fff690e117c3ba46d8ad0c9e8ca19ae549a4f536c43
+  metadata.gz: fadbe5c4d4b211817f9ca901c4c7f660692976d728897e81a85fb41caa158cb84dbd9f05fd1485823784af27d06243572898a4b123943e5a316b1702332f5d1b
+  data.tar.gz: 1ca3cace17a3897b31358871c4faf0a8a4b30287bb66f036de40278c297f81b6a4ff4b097efd13ea76901d4320e823b386f4ce5e61640219fc6e4c1fa70fb0d5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre4)
+    spree_vpago (2.2.2.pre.pre5)
       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.3.2)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
     ffaker (2.21.0)
     ffi (1.15.5)

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

@@ -1,13 +1,47 @@
 <% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment) %>
+<% payment_option = @payment.payment_method.preferences[:payment_option] %>
+
+<form method="POST"
+      action="<%= @checkout.checkout_url %>"
+      id="aba_merchant_request"
+      data-payment-option="<%= payment_option %>"
+      style="<%= 'display:none;' if payment_option == 'abapay_khqr_deeplink' %>">
 
-<form method="POST" action="<%= @checkout.checkout_url %>" id="aba_merchant_request">
   <% @checkout.gateway_params.each do |key, value| %>
-    <input type='hidden' name='<%= key %>' value='<%= value %>' />
+    <input type="hidden" name="<%= key %>" value="<%= value %>">
   <% end %>
 </form>
 
 <script>
   document.addEventListener("DOMContentLoaded", function () {
-    document.getElementById("aba_merchant_request").submit()
-  })
+    const form = document.getElementById("aba_merchant_request");
+    const paymentOption = form.dataset.paymentOption;
+
+    // 🔹 CASE 1: ABA KHQR Deeplink → fetch JSON then redirect
+    if (paymentOption === "abapay_khqr_deeplink") {
+      fetch(form.action, {
+        method: "POST",
+        body: new FormData(form)
+      })
+      .then(res => res.json())
+      .then(data => {
+        if (data.checkout_qr_url) {
+          window.location.href = data.checkout_qr_url;
+        }
+        if (data.abapay_deeplink) {
+          setTimeout(() => {
+            window.location.href = data.abapay_deeplink;
+          }, 1500);
+        }
+        if (!data.checkout_qr_url && !data.abapay_deeplink) {
+          console.error("checkout_qr_url and abapay_deeplink both missing", data);
+        }
+      })
+      .catch(err => console.error("ABA Deeplink Error:", err));
+
+    // 🔹 CASE 2: Normal ABA KHQR → regular redirect form post
+    } else {
+      form.submit();
+    }
+  });
 </script>

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

@@ -8,50 +8,32 @@ rescue => e
   Rails.logger.error("Vattanac checkout.create failed: #{e.message}")
   { deeplink_url: nil, web_url: nil }
 end
-
-@payment.user_informer.payment_is_processing(processing: true)
 %>
 
 <script>
-  document.addEventListener("DOMContentLoaded", () => {
-    const platform = "<%= params[:platform] %>";
-    const deeplinkUrl = "<%= raw(result[:deeplink_url]) %>";
-    const webUrl = "<%= raw(result[:web_url]) %>";
-    const paymentOption = "<%= payment_option %>";
-
-    const redirectTo = (url) => { if (url) window.location.href = url; };
-
-    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");
-      }
-    };
-
-    switch (paymentOption) {
-      case "khqr":
-        redirectTo(webUrl);
-        break;
-
-      case "deeplink":
-        redirectTo(deeplinkUrl);
-        break;
-
-      case "all":
-        if (platform === "app") redirectTo(deeplinkUrl);
-        else if (platform === "web") redirectTo(webUrl);
-        else console.error("Unknown platform:", platform);
-        break;
-
-      default:
-        console.error("Invalid payment option:", paymentOption);
-    }
-
-    setupPaymentProcessingListener();
-  });
+  const platform = "<%= params[:platform] %>";
+  const deeplinkUrl = "<%= raw(result[:deeplink_url]) %>";
+  const webUrl = "<%= raw(result[:web_url]) %>";
+  const paymentOption = "<%= payment_option %>";
+
+  const redirectTo = (url) => { if (url) window.location.href = url; };
+
+  switch (paymentOption) {
+    case "khqr":
+      redirectTo(webUrl);
+      break;
+
+    case "deeplink":
+      redirectTo(deeplinkUrl);
+      break;
+
+    case "all":
+      if (platform === "app") redirectTo(deeplinkUrl);
+      else if (platform === "web") redirectTo(webUrl);
+      else console.error("Unknown platform:", platform);
+      break;
+
+    default:
+      console.error("Invalid payment option:", paymentOption);
+  }
 </script>

data/lib/spree_vpago/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre4
+  version: 2.2.2.pre.pre5
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-16 00:00:00.000000000 Z
+date: 2026-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday