spree_vpago 2.1.4.pre.beta2 → 2.1.4.pre.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c7d879f66187b0dc1ad98a8a9530e93e8783af2407832ea3604a9c9ae1e5d7
-  data.tar.gz: 2937b5f057dcda1802b875663aa2cf989ab18e100cc0161c28ef47b5962b84d2
+  metadata.gz: 54ada56aa2da14e1dcc11960a2172ec2010b6f3d6e9c98d3d9a9aa3250859969
+  data.tar.gz: a5814414f32583c1751850d23f4e9151acd8a885f2dd3730132d39be72623115
 SHA512:
-  metadata.gz: 84115ee094881bb1df4792bf384ba5029726188cabddb826504757905a650e3d7aaae81359fd190d69af7715ac694452238468f0deb662d9b542b223d510b288
-  data.tar.gz: 7f719b638dd3204832f191175b89ceebb71571bbda923b76448d9ce812fa100db0a79ce173e3744cc445a6616e75c484d0c627003311ed9b30cba371959a4b59
+  metadata.gz: 01ee171943fbc46335ef5c48b214aabf9afb9fa9533d6f213ad15edd20aec6e733c252f32fc720af6b41a81d91bbaa23977d412c6819ece507c8e17a0669a773
+  data.tar.gz: 27b4e56951e99dc7807a1ffe5e2bb78f863423d8a072d7d8155e2a184a51ff6a34998a017fd812e2e2e06ddaa88e5ea458e7c6c361b2e8af9fe80fdb492a369d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.1.4.pre.beta2)
+    spree_vpago (2.1.4.pre.beta4)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

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

@@ -36,9 +36,9 @@ module Spree
       params[:payment_response] = payment.transaction_response
 
       if success
-        ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Purchased', params)
+        ActiveMerchant::Billing::Response.new(true, 'Vattanac Gateway: Purchased', params)
       else
-        ActiveMerchant::Billing::Response.new(false, 'Payway Gateway: Purchasing Failed', params)
+        ActiveMerchant::Billing::Response.new(false, 'Vattanac Gateway: Purchasing Failed', params)
       end
     end
 

data/app/models/vpago/payment_decorator.rb

@@ -9,7 +9,7 @@ module Vpago
                     :processing_url,
                     :success_url,
                     :process_payment_url,
-                    :processing_deeplink_url,
+                    :success_deeplink_url,
                     to: :url_constructor
     end
 
@@ -73,6 +73,10 @@ module Vpago
     def check_payment?
       payment_method.type_check?
     end
+
+    def can_redirect_to_app?
+      payment_method.can_redirect_to_app?
+    end
   end
 end
 

data/app/models/vpago/payment_method_decorator.rb

@@ -11,7 +11,7 @@ module Vpago
 
     def self.prepended(base)
       base.preference :icon_name, :string, default: 'cheque'
-      base.preference :app_scheme, :string, default: 'bookmeplus://'
+      base.preference :app_scheme, :string
       base.belongs_to :vendor, class_name: 'Spree::Vendor', optional: true, inverse_of: :payment_methods
 
       def base.vpago_payments
@@ -105,6 +105,10 @@ module Vpago
       type == 'Spree::PaymentMethod::Check'
     end
 
+    def can_redirect_to_app?
+      preferred_app_scheme.present?
+    end
+
     # @return [String] the image asset path, e.g. "payment_logos/payway-abapay-khqr.png"
     def payment_icon_path
       "payment_logos/#{preferred_icon_name.tr('_', ' ').parameterize}.png"

data/app/services/vpago/payment_url_constructor.rb

@@ -11,10 +11,13 @@ module Vpago
 
     def checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=app"
     def web_checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=web"
+
     def processing_url = "#{base_url}/vpago_payments/processing?#{query}"
+
     def success_url = "#{base_url}/vpago_payments/success?#{query}"
+    def success_deeplink_url = "#{app_scheme}://#{URI(base_url).host}/book/payment?number=#{order.number}&tk=#{order.token}"
+
     def process_payment_url = "#{base_url}/vpago_payments/process_payment?#{query}"
-    def processing_deeplink_url = "#{app_scheme}#{URI(base_url).host}/vpago_payments/processing?#{query}"
 
     def query
       {
@@ -25,6 +28,7 @@ module Vpago
       }.compact.to_query
     end
 
+    # true money use case
     def offsite_payment?
       payment.payment_method.type_true_money?
     end

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

@@ -1,6 +1,11 @@
 <%
-  checkout = Vpago::Vattanac::Checkout.new(@payment)
-  result = checkout.create
+checkout = Vpago::Vattanac::Checkout.new(@payment)
+result = begin
+  checkout.create
+rescue => e
+  Rails.logger.error("Vattanac checkout.create failed: #{e.message}")
+  { mobile_url: nil, web_url: nil }
+end
 %>
 
 <script>
@@ -8,7 +13,10 @@
   const mobileUrl = "<%= raw(result[:mobile_url]) %>";
   const webUrl = "<%= raw(result[:web_url]) %>";
   if (platform === "app" && mobileUrl) {
-    window.location.href = mobileUrl;
+       window.location.href = mobileUrl;
+        setTimeout(() => {
+          window.location.href = webUrl
+        }, 1500);
   } else if (platform === "web" && webUrl) {
     window.location.href = webUrl;
   } else {

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.1.4-beta2'.freeze
+  VERSION = '2.1.4-beta4'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/payway_v2/base.rb

@@ -105,9 +105,15 @@ module Vpago
       # redirect to continue URL, let it handle redirecting to app.
       # allowed override to specific app eg. from tg://t.me
       def return_deeplink_url
-        return @options[:override_return_deeplink_url] if @options[:override_return_deeplink_url].present?
-
-        continue_success_url
+        app_scheme = @payment.payment_method.preferences[:app_scheme]
+
+        if app_scheme.present?
+          uri = URI.parse(continue_success_url)
+          uri.scheme = app_scheme
+          uri.to_s
+        else
+          continue_success_url
+        end
       end
 
       def return_deeplink

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.1.4.pre.beta2
+  version: 2.1.4.pre.beta4
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-11 00:00:00.000000000 Z
+date: 2025-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday