spree_vpago 2.2.2.pre.pre11 → 2.2.2.pre.pre13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 89703ddc763dbab601246e10a41a1dd0bb4ca443ad6fd1f763fa1d4f120f74b5
-  data.tar.gz: 97e93bf3bcd95e7538b9472a96c86dc7cb6bad11165b100f698781ff53ec6d06
+  metadata.gz: 8e1146678e861bc1d84d97e922fb268148a45bb605d9d14414d121428e5c2dc6
+  data.tar.gz: fa89bb5e2bfec29f04d4fa31477b6f48d4f8ed0b970faa2bd51d1e828640b87d
 SHA512:
-  metadata.gz: 49a3f98690cff2d62d2168b4f08c1a15dcd44f318b8c83a69e658d1900068145ac564c076cd8d6aab8a73f6f84bb4a3d962e276492d03ecd99e5eff61b6ff738
-  data.tar.gz: 8050e93e978e43a0134d6e79d1d760aad60baf493032a514b72b2904466e9b76470a2a0a0279bcf6b894eaa5e36594a539c84ccf52c4f4457c57068358e4a784
+  metadata.gz: bc6d965090f34c46547385cae293652dbc453d2f50524e58d9320aa16bd85b3d8d9cb2e5a8ec8c496867377e133d9dbbbc99b1fa15a988dc6ead8da0a82e08e3
+  data.tar.gz: e1c7d30ac4be2adb539b1476c1f1d3aa9fdcd1e3650e09c333f617d463909c3986e2db43f48843e9db5eee17eb464b5a58d2fa68c81d5e0d664bb5ad55cf83e3

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre11)
+    spree_vpago (2.2.2.pre.pre13)
       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,15 +79,6 @@ module Spree
       sanitized_params
     end
 
-    private
-
-    def in_app_browser?
-      in_app_browsers = %w[FBAN FBAV Telegram FB_Messenger Messenger]
-      user_agent = request.user_agent.to_s
-
-      in_app_browsers.any? { |browser| user_agent.include?(browser) }
-    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,93 +1,51 @@
-<% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment, request.user_agent) %>
-<% payment_option = @payment.payment_method.preferences[:payment_option] %>
+<% @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' %>">
+      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 %>">
   <% 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;
-    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(() => {
-            document.removeEventListener("visibilitychange", visibilityHandler);
-
-            if (!appOpened) {
-              console.log("ABA app not installed, staying on checkout page.");
-            }
-          }, 2000);
-        };
-      })
-      .catch(err => console.error("ABA Deeplink Error:", err));
-
-    // CASE 2: Normal ABA KHQR → regular redirect form post
-    } else {
+document.addEventListener("DOMContentLoaded", function () {
+  const form = document.getElementById("aba_merchant_request");
+  const paymentOption = form.dataset.paymentOption;
+
+  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 && !data.abapay_deeplink) {
+        throw new Error("Missing payment URLs");
+      }
+
+      if (data.checkout_qr_url) {
+        window.open(data.checkout_qr_url, "_blank");
+      }
+
+      if (data.abapay_deeplink) {
+        window.location.href = data.abapay_deeplink;
+      }
+
+    })
+    .catch(err => {
+      console.error("Error:", err);
       form.submit();
-    }
-  });
-</script>
+    });
+
+  } else {
+    form.submit();
+  }
+});
+</script>

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/base.rb

@@ -1,10 +1,9 @@
 module Vpago
   module PaywayV2
     class Base
-      def initialize(payment, user_agent = nil, options = {})
+      def initialize(payment, options = {})
         @options = options
         @payment = payment
-        @user_agent = user_agent
       end
 
       def req_time
@@ -113,32 +112,10 @@ module Vpago
           uri.scheme = app_scheme
           uri.to_s
         else
-          # 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
+          continue_success_url
         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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre11
+  version: 2.2.2.pre.pre13
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-18 00:00:00.000000000 Z
+date: 2026-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday