spree_vpago 2.2.2.pre.pre27 → 2.2.2.pre.pre28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 476c4860c0894a7c700356ffa0b13dab89d7acc84c181747e5ff2db708fe9bd4
-  data.tar.gz: ca1ad0fabdac23c21a27cb3f8e893ac1df94ef614ca8e0d82faacdf3dffa68d9
+  metadata.gz: f4223baa916c63136d13cdc1e6a10e0cab90401325df3fde6bcd05e837d28556
+  data.tar.gz: ffff5d2363666590557c939385c4d366a81abb05a05dd0b8914590c8e33af5cc
 SHA512:
-  metadata.gz: 30ac51ec124c828bcb706d56419d17de1dee46c234a11908258ef7cbe5274c1e56bba102683cac1e0e2ae797ab60d0cf718a7809c9359a2d8b874c31f23f8c85
-  data.tar.gz: 60875cae684fb890c347f30a2595d2157f7cb9597effe135429a84d003bd9ed95cd4231fa8892cb1cfd2fa037a534479067f90e7f6f90ca66cbbf791e2e5388a
+  metadata.gz: dcc8364443a80c55cb2f8b91212bbdf96dd7adf91b80802066bea239a6827759f4201f2f434dc65e1a60ec7106af1bbbafe2b10133cbd1379c704fcf8cf3e4f8
+  data.tar.gz: 6675fda061cd27a3b34057a304d5f5f7fb93830ee0698df9d7e0d83435668f59d867d1c6b4af22c638469e0075b96651ab899399ccebcf924f2d7a34f6c141a0

data/Gemfile.lock

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

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -22,32 +22,8 @@ module Vpago
       render partial: processing_script_partial_path if lookup_context.exists?(processing_script_partial_path, [], true)
     end
 
-    # when return nil, each payment method should use their default URL.
-    # eg. PayWayV2 will use the continue_success_url as deeplink back URL.
-    def custom_return_deeplink_url
-      if telegram_user_agent?
-        'tg://'
-      elsif facebook_user_agent?
-        'fb://'
-      elsif messenger_user_agent?
-        'fb-messenger://'
-      end
-    end
-
     def mobile_user_agent?
       request.user_agent.to_s.downcase.match?(/android|iphone|ipad|ipod/)
     end
-
-    def telegram_user_agent?
-      request.user_agent.to_s.downcase.include?('telegram')
-    end
-
-    def facebook_user_agent?
-      request.user_agent.to_s.downcase.include?('fban') || request.user_agent.to_s.downcase.include?('facebook')
-    end
-
-    def messenger_user_agent?
-      request.user_agent.to_s.downcase.include?('messenger')
-    end
   end
 end

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

@@ -1,4 +1,4 @@
-<% @checkout_options = { custom_return_deeplink_url: custom_return_deeplink_url } %>
+<% @checkout_options = { disable_return_deeplink: params[:platform] == 'web' } %>
 <% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment, @checkout_options) %>
 
 <form method="POST" action="<%= @checkout.checkout_url %>" id="aba_merchant_request">
@@ -8,7 +8,6 @@
 </form>
 
 <script>
-  const isTelegram = <%= telegram_user_agent? %>;
   const isMobile = <%= mobile_user_agent? %>;
 
   const abapayKhqrDeeplink = <%= @payment.payment_method.abapay_khqr_deeplink? %>;
@@ -16,11 +15,7 @@
   const shouldOpenCheckoutUrl = <%= @payment.payment_method.open_checkout_url? %>;
 
   function openDeeplinkUrl(deeplinkUrl) {
-    if(isTelegram){
-      window.open(deeplinkUrl, '_blank');
-    } else {
-      window.location.href = deeplinkUrl;
-    }
+    window.location.href = deeplinkUrl;
   }
 
   function openUrl(url, delay = 0) {

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/base.rb

@@ -4,7 +4,7 @@ module Vpago
       def initialize(payment, options = {})
         @options = options
         @payment = payment
-        @custom_return_deeplink_url = options[:custom_return_deeplink_url]
+        @disable_return_deeplink = options[:disable_return_deeplink] || false
       end
 
       def req_time
@@ -102,10 +102,10 @@ module Vpago
         end
       end
 
-      # 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 @custom_return_deeplink_url if @custom_return_deeplink_url.present?
+        # for some cases opening from telegram webview, fb, messenger webview, deeplink back to app doesn't work.
+        # so, return nil will ensure ABA won't return back to wrong app, for android, it will auto pop which to previous app and correct behavior, for ios, it will stuck, user can click back button to go back to app.
+        return nil if @disable_return_deeplink
 
         app_scheme = @payment.payment_method.preferences[:app_scheme]
 

metadata

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