spree_vpago 2.2.2.pre.pre10 → 2.2.2.pre.pre12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd56e9a7ecb7d8d5ca0abaf1232b9d92233bd025043e06b763dbb89d675e0412
-  data.tar.gz: 757343200d1e61cbe263a684d24ce2fa1fdd112c87b0d696bf27842132066378
+  metadata.gz: 0d5ee57baf6e2451847466adba567cf8922799e54575e0aa690758416ad14ed1
+  data.tar.gz: 2998d1e7883e8c1bd041bc2eb9abc4c8f3dcb45ee21a3c8d6958c838ffa57bfa
 SHA512:
-  metadata.gz: 6ef89ccf97395357c1f766648af7fc48891494fc9b2b14d159edfd01c6e7a88f456bb8865bae8a76cde9821122badd3932d6516c6dc78c0c6903c7f25684591e
-  data.tar.gz: 97718367ab37d76e0d9898278df202752167c2b4056954e6bb37534a23e6b57d60a5b200c6395e98f3c332e5e5eb94a74e4c771c9887155a448f385716adf316
+  metadata.gz: f4fac23a6529811d3fc71c6ac9128a2c2c93fad05cc3bab1e09878d7d9ccc67ecb4482075893162ce1568524ab364dc6c7bc763c2c56615122083c74dc4d21d3
+  data.tar.gz: 75f328a206a6a6deeb0a62d3bc41286188ebc931c36299ac35b07bc9e0a087d6631fb1c6615d9ef8f5b50fda2c187c4fdcae63fd6a30c0358b9bc7d20f3d292e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre10)
+    spree_vpago (2.2.2.pre.pre12)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -259,7 +259,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.78.0)
+    grpc (1.78.1)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)

data/app/controllers/spree/vpago_payments_controller.rb

@@ -16,12 +16,6 @@ module Spree
       return redirect_to @payment.processing_url, allow_other_host: true unless @payment.checkout?
 
       @order = @payment.order
-
-      # Set offsite_payment flag based on payment method and browser
-      # True Money: always true (from params)
-      # ABA KHQR: only true when in in-app browsers
-      @offsite_payment = params[:offsite_payment] == 'true' ||
-                         (params[:check_in_app_browser] == 'true' && in_app_browser?)
     end
 
     # GET
@@ -85,17 +79,6 @@ module Spree
       sanitized_params
     end
 
-    private
-
-    def in_app_browser?
-      user_agent = request.user_agent.to_s
-      user_agent.include?('FBAN') || user_agent.include?('FBAV') || # Facebook
-      user_agent.include?('Telegram') || # Telegram
-      user_agent.include?('MicroMessenger') || # WeChat
-      user_agent.include?('Line') || # Line
-      user_agent.include?('WhatsApp') # WhatsApp
-    end
-
     def render_not_found
       respond_to do |format|
         format.html { render file: Rails.public_path.join('404.html'), status: :not_found, layout: false }

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -8,9 +8,5 @@ module Vpago
     def render_form
       render partial: "spree/vpago_payments/forms/#{@payment.payment_method.class.to_s.underscore}"
     end
-
-    def offsite_payment?
-      @offsite_payment || false
-    end
   end
 end

data/app/services/vpago/payment_url_constructor.rb

@@ -24,8 +24,7 @@ module Vpago
         payment_number: payment.number,
         order_number: order.number,
         order_jwt_token: order_jwt_token,
-        offsite_payment: offsite_payment? ? true : nil,
-        check_in_app_browser: aba_khqr_payment? ? true : nil
+        offsite_payment: offsite_payment? ? true : nil
       }.compact.to_query
     end
 
@@ -34,13 +33,6 @@ module Vpago
       payment.payment_method.type_true_money?
     end
 
-    def aba_khqr_payment?
-      return false unless payment.payment_method.is_a?(Spree::Gateway::PaywayV2)
-
-      payment_option = payment.payment_method.preferred_payment_option
-      payment_option.in?(%w[abapay_khqr abapay_khqr_deeplink])
-    end
-
     private
 
     def app_scheme

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

@@ -1,11 +1,11 @@
 <% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment) %>
-<% payment_option = @payment.payment_method.preferences[:payment_option] %>
+<% @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' %>">
+      data-payment-option="<%= @payment_option %>"
+      style="<%= 'display:none;' if @payment_option == 'abapay_khqr_deeplink' %>">
 
   <% @checkout.gateway_params.each do |key, value| %>
     <input type="hidden" name="<%= key %>" value="<%= value %>">
@@ -21,18 +21,37 @@
     const paymentOption = form.dataset.paymentOption;
     const webViewContainer = document.getElementById("webViewContainer");
 
-    // CASE 1: ABA KHQR Deeplink → fetch JSON then redirect
-    if (paymentOption === "abapay_khqr_deeplink") {
+    // CASE 1: ABA KHQR Deeplink → fetch JSON then render checkout + optional deeplink
+    // 1. Check if response is OK and has JSON content
+    // 2. Validate required fields
+    // 3. WAIT until checkout fully loads before attempting deeplink
+    // 4. Detect if user leaves browser (app opened)
+    // 5. Fallback: show form and submit normally
 
+    if (paymentOption === "abapay_khqr_deeplink") {
       fetch(form.action, {
         method: "POST",
         body: new FormData(form)
       })
-      .then(res => res.json())
-      .then(data => {
-
-        // Load QR page inside webViewContainer
-        if (data.checkout_qr_url) {
+        .then(res => {
+          if (!res.ok) {
+            throw new Error(`HTTP ${res.status}: ${res.statusText}`);
+          }
+
+          const contentType = res.headers.get("content-type");
+          if (!contentType || !contentType.includes("application/json")) {
+            throw new Error("Response is not JSON");
+          }
+
+          return res.json();
+        })
+        .then(data => {
+          // Validate required fields
+          if (!data.checkout_qr_url && !data.abapay_deeplink) {
+            throw new Error("Missing checkout_qr_url and abapay_deeplink");
+          }
+
+          // Setup container as full-screen overlay
           webViewContainer.style.display = "block";
           webViewContainer.style.position = "fixed";
           webViewContainer.style.top = "0";
@@ -40,6 +59,7 @@
           webViewContainer.style.width = "100%";
           webViewContainer.style.height = "100%";
           webViewContainer.style.zIndex = "9999";
+          webViewContainer.style.backgroundColor = "#fff";
 
           const checkoutIframe = document.createElement("iframe");
           checkoutIframe.src = data.checkout_qr_url;
@@ -48,40 +68,41 @@
           checkoutIframe.style.border = "none";
 
           webViewContainer.appendChild(checkoutIframe);
-        }
 
-        // Attempt ABA Deeplink (hidden iframe)
-        if (data.abapay_deeplink) {
+          checkoutIframe.onload = function () {
+            if (!data.abapay_deeplink) return;
 
-          const deeplinkFrame = document.createElement("iframe");
-          deeplinkFrame.style.display = "none";
-          deeplinkFrame.src = data.abapay_deeplink;
-          document.body.appendChild(deeplinkFrame);
+            console.log("Checkout loaded, attempting ABA deeplink...");
 
-          // Detect if app opened
-          let appOpened = false;
+            const deeplinkFrame = document.createElement("iframe");
+            deeplinkFrame.style.display = "none";
+            deeplinkFrame.src = data.abapay_deeplink;
+            document.body.appendChild(deeplinkFrame);
 
-          const visibilityHandler = () => {
-            appOpened = true;
-          };
+            let appOpened = false;
 
-          document.addEventListener("visibilitychange", visibilityHandler);
+            const visibilityHandler = () => {
+              appOpened = true;
+            };
 
-          setTimeout(() => {
-            document.removeEventListener("visibilitychange", visibilityHandler);
+            document.addEventListener("visibilitychange", visibilityHandler);
 
-            if (!appOpened) {
-              console.log("ABA app not installed, staying inside webViewContainer");
-            }
-          }, 2000);
-        }
+            setTimeout(() => {
+              document.removeEventListener("visibilitychange", visibilityHandler);
 
-        if (!data.checkout_qr_url && !data.abapay_deeplink) {
-          console.error("Missing checkout_qr_url and abapay_deeplink", data);
-        }
-
-      })
-      .catch(err => console.error("ABA Deeplink Error:", err));
+              if (!appOpened) {
+                console.log("ABA app not installed, staying on checkout page.");
+              }
+            }, 2000);
+          };
+        })
+        .catch(err => {
+          console.error("ABA Deeplink Error:", err);
+          console.log("Falling back to regular form submission...");
+
+          form.style.display = "block";
+          form.submit();
+        });
 
     // CASE 2: Normal ABA KHQR → regular redirect form post
     } else {

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-pre10'.freeze
+  VERSION = '2.2.2-pre12'.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.pre10
+  version: 2.2.2.pre.pre12
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-18 00:00:00.000000000 Z
+date: 2026-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday