spree_vpago 2.2.2.pre.pre9 → 2.2.2.pre.pre11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9955a0a95b06aa963cef321fffefdf9f129dccb2366887604a4e15958b87371a
-  data.tar.gz: 86ace8169e398c8ddcb3d40b17531d2403e5838157e94829c4ecd72686e362e5
+  metadata.gz: 89703ddc763dbab601246e10a41a1dd0bb4ca443ad6fd1f763fa1d4f120f74b5
+  data.tar.gz: 97e93bf3bcd95e7538b9472a96c86dc7cb6bad11165b100f698781ff53ec6d06
 SHA512:
-  metadata.gz: 7f15eb56fc4239f9cd4b476f700dc3bc7f2b94db0f100f200b5ea5861d64a1f7ba75a46da2362428cd83c51f7aca522351d17d2d6d34bfe2af39f124aafce1e9
-  data.tar.gz: 959f42a629dc7167c027755bd29b2cd3ae79563f91bc62bf0fe0835527beb2e002158f402f39d8375d1b89b2e5f795aab6381fdf7fecafa62815b0599f6bddc1
+  metadata.gz: 49a3f98690cff2d62d2168b4f08c1a15dcd44f318b8c83a69e658d1900068145ac564c076cd8d6aab8a73f6f84bb4a3d962e276492d03ecd99e5eff61b6ff738
+  data.tar.gz: 8050e93e978e43a0134d6e79d1d760aad60baf493032a514b72b2904466e9b76470a2a0a0279bcf6b894eaa5e36594a539c84ccf52c4f4457c57068358e4a784

data/Gemfile.lock

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

data/app/controllers/spree/vpago_payments_controller.rb

@@ -88,12 +88,10 @@ module Spree
     private
 
     def in_app_browser?
+      in_app_browsers = %w[FBAN FBAV Telegram FB_Messenger Messenger]
       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
+
+      in_app_browsers.any? { |browser| user_agent.include?(browser) }
     end
 
     def render_not_found

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

@@ -1,4 +1,4 @@
-<% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment) %>
+<% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment, request.user_agent) %>
 <% payment_option = @payment.payment_method.preferences[:payment_option] %>
 
 <form method="POST"
@@ -12,64 +12,82 @@
   <% end %>
 </form>
 
+<!-- WebView Container -->
+<div id="webViewContainer" style="display:none;"></div>
+
 <script>
-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 => {
-      // 🔹 Create webview container for better control
-      const webviewContainer = document.createElement('div');
-      webviewContainer.style.position = 'fixed';
-      webviewContainer.style.top = '0';
-      webviewContainer.style.left = '0';
-      webviewContainer.style.width = '100%';
-      webviewContainer.style.height = '100%';
-      webviewContainer.style.zIndex = '9999';
-      webviewContainer.style.backgroundColor = 'white';
-      
-      // 🔹 Load QR page in webview
-      if (data.checkout_qr_url) {
-        const qrFrame = document.createElement('iframe');
-        qrFrame.src = data.checkout_qr_url;
-        qrFrame.style.width = '100%';
-        qrFrame.style.height = '100%';
-        qrFrame.style.border = 'none';
-        webviewContainer.appendChild(qrFrame);
-        document.body.appendChild(webviewContainer);
-      }
-
-      // 🔹 Attempt ABA deeplink after QR page loads
-      if (data.abapay_deeplink) {
-        setTimeout(() => {
-          // Try direct navigation first (more reliable for deeplinks)
-          window.location.href = data.abapay_deeplink;
-          
-          // Fallback: try opening in new tab if direct fails
+  document.addEventListener("DOMContentLoaded", function () {
+    const form = document.getElementById("aba_merchant_request");
+    const paymentOption = form.dataset.paymentOption;
+    const webViewContainer = document.getElementById("webViewContainer");
+
+    // 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) {
+          console.error("Missing checkout_qr_url", data);
+          return;
+        }
+
+        // Setup container
+        webViewContainer.style.display = "block";
+        webViewContainer.style.position = "fixed";
+        webViewContainer.style.top = "0";
+        webViewContainer.style.left = "0";
+        webViewContainer.style.width = "100%";
+        webViewContainer.style.height = "100%";
+        webViewContainer.style.zIndex = "9999";
+
+        const checkoutIframe = document.createElement("iframe");
+        checkoutIframe.src = data.checkout_qr_url;
+        checkoutIframe.style.width = "100%";
+        checkoutIframe.style.height = "100%";
+        checkoutIframe.style.border = "none";
+
+        webViewContainer.appendChild(checkoutIframe);
+
+        // WAIT until checkout fully loads
+        checkoutIframe.onload = function () {
+
+          if (!data.abapay_deeplink) return;
+
+          console.log("Checkout loaded, attempting ABA deeplink...");
+
+          const deeplinkFrame = document.createElement("iframe");
+          deeplinkFrame.style.display = "none";
+          deeplinkFrame.src = data.abapay_deeplink;
+          document.body.appendChild(deeplinkFrame);
+
+          // Detect if user leaves browser (app opened)
+          let appOpened = false;
+
+          const visibilityHandler = () => {
+            appOpened = true;
+          };
+
+          document.addEventListener("visibilitychange", visibilityHandler);
+
           setTimeout(() => {
-            if (document.body.contains(webviewContainer)) {
-              window.open(data.abapay_deeplink, '_blank');
+            document.removeEventListener("visibilitychange", visibilityHandler);
+
+            if (!appOpened) {
+              console.log("ABA app not installed, staying on checkout page.");
             }
-          }, 500);
-        }, 2000);
-      }
-
-      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();
-  }
-});
+          }, 2000);
+        };
+      })
+      .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-pre9'.freeze
+  VERSION = '2.2.2-pre11'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/payway_v2/base.rb

@@ -1,9 +1,10 @@
 module Vpago
   module PaywayV2
     class Base
-      def initialize(payment, options = {})
+      def initialize(payment, user_agent = nil, options = {})
         @options = options
         @payment = payment
+        @user_agent = user_agent
       end
 
       def req_time
@@ -112,10 +113,32 @@ module Vpago
           uri.scheme = app_scheme
           uri.to_s
         else
-          continue_success_url
+          # For in-app browsers, use appropriate deeplink scheme
+          if in_app_browser_payment?
+            case @user_agent
+            when /FBAN|FBAV/
+              'fb://'
+            when /Telegram/
+              'tg://'
+            when /FB_Messenger|Messenger/
+              'fb-messenger://'
+            else
+              continue_success_url
+            end
+          else
+            continue_success_url
+          end
         end
       end
 
+      # Check if payment is from in-app browser
+      def in_app_browser_payment?
+        return false unless @user_agent.present?
+
+        in_app_browsers = %w[FBAN FBAV Telegram FB_Messenger Messenger]
+        in_app_browsers.any? { |browser| @user_agent.include?(browser) }
+      end
+
       def return_deeplink
         return nil unless return_deeplink_url.present?
 

metadata

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