spree_vpago 2.2.2.pre.pre6 → 2.2.2.pre.pre7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bfb2ee6211441d6c66a5043ed3f5bf7fdb18eb4d68a70ee177ed633cfe6dc49e
-  data.tar.gz: eb8ddb4d7a0f46363a991dee8d2081ab7c01f7decec63e2305f42c7c260105a7
+  metadata.gz: d7793c0aec41fce672ee0633228351ac3aac2f42b2ddd130298796a67d1ad3f0
+  data.tar.gz: a50c7029f6a8420f60db25dccb15674f1bac7e4dad979874fbb968427f929ae1
 SHA512:
-  metadata.gz: afa0f05102aa05054c503842ba75ba96e414602df5c74595834560340a92801082053529cee425da3eb4ff32fbb387d68825161d22101d234d48605b21a20129
-  data.tar.gz: 3543272b442de44acbe4c4b82ac82a8212fd6b444998d699f3dcfb35213c22b5f271b6d98fdaf2165d9fa8a767e072c1f6ae0104fe635d3d7673822a8f5d07ab
+  metadata.gz: 6116d80f3f46d00c573e39fa1d57bf2c8edd5eb6e1b253244a1b40f561665b47d50b71480e063ce60fbf7f21d62e09ca0f2ce46c2962c3b330c4d8a760ad2970
+  data.tar.gz: 06d4f719cda898e6140ca8f0e449b32550540f96c4f1db3932e28924fb3e42afff25c972693f01eca0c76e841fd4462231df5d64716c34a8b530cc9959ca2e1d

data/Gemfile.lock

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

data/app/controllers/spree/vpago_payments_controller.rb

@@ -16,6 +16,12 @@ 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
@@ -79,6 +85,17 @@ 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,5 +8,9 @@ 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,7 +24,8 @@ module Vpago
         payment_number: payment.number,
         order_number: order.number,
         order_jwt_token: order_jwt_token,
-        offsite_payment: offsite_payment? ? true : nil
+        offsite_payment: offsite_payment? ? true : nil,
+        check_in_app_browser: aba_khqr_payment? ? true : nil
       }.compact.to_query
     end
 
@@ -33,6 +34,13 @@ 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

@@ -13,32 +13,37 @@
 </form>
 
 <script>
-  document.addEventListener("DOMContentLoaded", function () {
-    const form = document.getElementById("aba_merchant_request");
-    const paymentOption = form.dataset.paymentOption;
+document.addEventListener("DOMContentLoaded", function () {
+  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.abapay_deeplink) {
+  // 🔹 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.open(data.checkout_qr_url, "_blank");
+      }
+
+      if (data.abapay_deeplink) {
+        setTimeout(() => {
           window.location.href = data.abapay_deeplink;
-        } else if (data.checkout_qr_url) {
-          window.location.href = data.checkout_qr_url;
-        }
-        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));
+        }, 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();
-    }
-  });
+  // 🔹 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,32 +8,50 @@ 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>
-  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);
-  }
+  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();
+  });
 </script>

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.2-pre6'.freeze
+  VERSION = '2.2.2-pre7'.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.pre6
+  version: 2.2.2.pre.pre7
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-17 00:00:00.000000000 Z
+date: 2026-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday