spree_vpago 2.3.0 → 2.3.1.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a7ada27fbff4e24f884836fe4a37ec7bb187f24366cd657b7611b8a4cfac5b2
-  data.tar.gz: 36df26111882ca8171272455e6b53ca420e199fb25c590975c2c8961ddf53046
+  metadata.gz: bab3806e6c7ff83a83c403b9e05fc27ec43314e9a23a9856e850cf9235f0b15f
+  data.tar.gz: 67e45376ac85892bbf43215916bd9fc85994f1d1baa3e871687063cfb9c78446
 SHA512:
-  metadata.gz: 998dc20da1342ee30b3af17b96be1f5cd406cb92a182d18cd3abc92d5358c2787c03edcd22ddf1c8524630fdca5c9e04c7b4e3798518b4c6fd3e770b054307dc
-  data.tar.gz: 1489be00f087c7cf9799e5fd847386eef0e961e40274392947ad04af86f2d97df13c4c1911b5bf7419559a775a37756f127f49d3a9ee44c30cba5ac2483b5574
+  metadata.gz: 89fe788fbb4845d4ecfe884043e5e714a11a8f09f3e53b1d1c941960bdbf761cb693da0ea18bf9ca83df222be1c92c08bbfc4392e861f880ba5c6a7b576e3399
+  data.tar.gz: c0f18dda30ec14cddf791824399634ec3f4c0fed0f796a993134352c20a6f643f009dece8c72295af253cb51e29ae83942422282db4846e7e32172d230857ce1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.0)
+    spree_vpago (2.3.1.pre.pre1)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/controllers/spree/admin/payment_methods_controller_decorator.rb

@@ -6,10 +6,12 @@ module Spree
 
         if params[:tab] == 'vendors'
           scope.where.not(vendor_id: nil)
+               .includes(:vendor)
         elsif params[:tab] == 'tenants'
           scope.joins(:vendor)
                .where.not(vendor_id: nil)
                .where.not(spree_vendors: { tenant_id: nil })
+               .includes(vendor: :tenant)
         else
           scope.where(vendor_id: nil)
         end

data/app/models/spree/gateway/payway_v2.rb

@@ -6,7 +6,7 @@ module Spree
     preference :host, :string
     preference :api_key, :string
     preference :merchant_id, :string
-    preference :payment_option, :string
+    preference :payment_option, :string, default: 'abapay_khqr_deeplink'
     preference :transaction_fee_fix, :string
     preference :transaction_fee_percentage, :string
     preference :public_key, :text
@@ -17,6 +17,8 @@ module Spree
 
     validates :preferred_public_key, presence: true, if: :enable_pre_auth?
     validates :preferred_abapay_khqr_deeplink_option, inclusion: { in: ABAPAY_KHQR_DEEPLINK_OPTIONS }, if: :abapay_khqr_deeplink?
+
+    # For initial save, there is no preferences yet, so validating them would failed. Only validate along with host or api key.
     validates :preferred_payment_option, inclusion: { in: PAYMENT_OPTIONS }
 
     def reviewing_mode?

data/app/overrides/spree/admin/payment_methods/index/tenant_body.html.erb.deface

@@ -1,5 +1,11 @@
 <!-- insert_before "[data-hook='admin_payment_methods_index_row_actions']" -->
 
 <% if params[:tab] == 'tenants' %>
-  <td class="text-center"><%= method.vendor&.name || 'N/A' %></td>
+  <td class="text-center">
+    <% if method.vendor&.tenant %>
+      <%= link_to method.vendor.tenant.name, edit_admin_tenant_path(method.vendor.tenant), target: "_blank" %>
+    <% else %>
+      N/A
+    <% end %>
+  </td>
 <% end %>

data/app/overrides/spree/admin/payment_methods/index/vendor_body.html.erb.deface

@@ -1,5 +1,11 @@
 <!-- insert_before "[data-hook='admin_payment_methods_index_row_actions']" -->
 
 <% if params[:tab] == 'vendors' %>
-  <td class="text-center"><%= method.vendor&.name || 'N/A' %></td>
+  <td class="text-center">
+    <% if method.vendor %>
+      <%= link_to method.vendor.name, edit_admin_vendor_path(method.vendor), target: "_blank" %>
+    <% else %>
+      N/A
+    <% end %>
+  </td>
 <% end %>

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

@@ -13,12 +13,6 @@
 </form>
 
 <script>
-  const isMobile = <%= mobile_user_agent? %>;
-
-  const abapayKhqrDeeplink = <%= @payment.payment_method.abapay_khqr_deeplink? %>;
-  const shouldOpenAbaPayDeeplink = isMobile && <%= @payment.payment_method.open_abapay_deeplink? %>;
-  const shouldOpenCheckoutUrl = <%= @payment.payment_method.open_checkout_url? %>;
-
   function showRedirectContainer(buttonLabel = null, onClick = null) {
     const loadingContainer = document.getElementById('vpago_loading_container');
     const redirectContainer = document.getElementById('vpago_redirect_container');
@@ -40,6 +34,17 @@
   }
 
   function submitFormViaJs(){
+    const isMobile = <%= mobile_user_agent? %>;
+
+    const abapayKhqrDeeplink = <%= @payment.payment_method.abapay_khqr_deeplink? %>;
+    const shouldOpenAbaPayDeeplink = isMobile && <%= @payment.payment_method.open_abapay_deeplink? %>;
+
+    // If the device is not mobile, deeplinks won't work anyway,
+    // so we always open the checkout URL (KHQR page) for desktop users.
+    // 
+    // On mobile, only open the checkout URL if explicitly enabled.
+    const shouldOpenCheckoutUrl = !isMobile || <%= @payment.payment_method.open_checkout_url? %>;
+
     var formData = new FormData(document.getElementById("aba_merchant_request"));
     var checkoutUrl = document.getElementById("aba_merchant_request").action;
 
@@ -62,12 +67,24 @@
         return;
       }
 
+      let deeplinkTriggered = false;
+
       if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
         window.location.href = data.abapay_deeplink;
+        deeplinkTriggered = true;
       }
 
       if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
-        window.location.href = data.checkout_qr_url;
+        // If a deeplink is triggered, add a short delay before navigating to the checkout URL.
+        // Without this delay, some platforms (especially Android) may ignore or cancel the deeplink
+        // because a second navigation happens too quickly.
+        if (deeplinkTriggered){
+          setTimeout(() => {
+            window.location.href = data.checkout_qr_url;
+          }, 300);
+        } else {
+          window.location.href = data.checkout_qr_url;
+        }
       }
 
       var shouldShowRedirectContainer = !shouldOpenCheckoutUrl && shouldOpenAbaPayDeeplink;

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.3.0'.freeze
+  VERSION = '2.3.1-pre1'.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.3.0
+  version: 2.3.1.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-24 00:00:00.000000000 Z
+date: 2026-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -442,9 +442,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1