spree_vpago 2.1.4.pre.beta2 → 2.1.4.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c7d879f66187b0dc1ad98a8a9530e93e8783af2407832ea3604a9c9ae1e5d7
-  data.tar.gz: 2937b5f057dcda1802b875663aa2cf989ab18e100cc0161c28ef47b5962b84d2
+  metadata.gz: e2751ee764f57d6e508418ca26559d541bc3b96b13d3b7191edf94f500cf0e5c
+  data.tar.gz: 8542aa29b54bfd73e825669d3df6c2a2f76a3110119d441f077ef12663b61b62
 SHA512:
-  metadata.gz: 84115ee094881bb1df4792bf384ba5029726188cabddb826504757905a650e3d7aaae81359fd190d69af7715ac694452238468f0deb662d9b542b223d510b288
-  data.tar.gz: 7f719b638dd3204832f191175b89ceebb71571bbda923b76448d9ce812fa100db0a79ce173e3744cc445a6616e75c484d0c627003311ed9b30cba371959a4b59
+  metadata.gz: 07a440440c01e69082a4ed486eea234ca4bc55970fc5258b7dc7d846275edfee8cc55f630b8151c7eab09e7218541357bc42257ed4fc015c93596e0c9fa87752
+  data.tar.gz: '06864d9808178cd1fb68d978a09e8cea7b32ba15158814a4773c5f4e841c71528c6c96dcf950c248df73ce1613b6729684276f13ff9ddbd229af826dfb56484b'

data/Gemfile.lock

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

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/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.1.4-beta2'.freeze
+  VERSION = '2.1.4-beta3'.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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.1.4.pre.beta2
+  version: 2.1.4.pre.beta3
 platform: ruby
 authors:
 - You