spree_vpago 2.2.2.pre.pre30 → 2.2.2.pre.pre31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1da347c462aa29d8e883eac4f4f8fca3c55d0c730cb656cfb6c87b274fa07c0
-  data.tar.gz: 56989c2482c31abac32a685f29c128a91f08ebe48994abafaf8a05e41756091a
+  metadata.gz: 0cac2ef6c704865b5ba2c236353fd764ba0907cff281f19925947b95954fc2b7
+  data.tar.gz: 007b70f2dae2a5f2d96bae4b6372ef4f0e671d38a8950111c1e14d49d1904b2f
 SHA512:
-  metadata.gz: c0ee2d20c391566c00d55b00f97c390dc4ac443b645df4fa7168e61a79dade2b22843bcc812246bf6baec858302b458ceb929c8e76726e3a887e093a4b335220
-  data.tar.gz: 3cf60b537f03640238d6b4b3c8bc91a55a27f154dc57dcca9eede815351b247caab82f22aaedcc994ed546a800e5040a868b295090fa731973e96cbc5f8809a1
+  metadata.gz: 2188cc7d99fe2b682bb1ad8326ab0558e7630d039c6409cd322249507905cc04ee5a7a20656f4fe33649831e36bd3ed2736017679330c66e4bb12b6ec3460bfa
+  data.tar.gz: 279f897282d2479e6eeb17feaf517e792cd0fe1fb66438ac413bfd5eab49d1605a6d9a471d1d35d93bc6a000b6610d74cfc2fe3dc91c9ba34720574c7f12a9da

data/.github/workflows/test_and_publish_gem.yml

@@ -66,6 +66,8 @@ jobs:
       #   run: |
       #     bundle exec brakeman
 
+      # Run all tests except for pre-release tags (e.g., *-pre)
+      # to keep those builds fast and allow faster deployment to our testing server.
       - name: Run test
         if: ${{ !startsWith(github.ref, 'refs/tags/') || !contains(github.ref_name, '-pre') }}
         env:

data/Gemfile.lock

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

data/app/assets/javascripts/vpago/vpago_payments/request_process_payment.js

@@ -18,7 +18,7 @@ async function requestProcessPayment({
             .querySelector('meta[name="csrf-token"]')
             .getAttribute("content"),
         },
-        body: JSON.stringify(params),
+        body: JSON.stringify({ ...params, internal_client: "true" }),
       });
 
       if (!response.ok) {

data/app/controllers/spree/vpago_payments_controller.rb

@@ -68,12 +68,13 @@ module Spree
 
       # for ABA reviewing mode, we can disable pushback from bank, and only process it from our app UI instead.
       # This will give ABA team to know that we don't rely on just pushback and have fallback to process payment.
-      if @payment.payment_method.type_payway_v2? && @payment.payment_method.reviewing_mode? && request_from_bank?
-        Rails.logger.info("[Vpago] Processing payment in reviewing mode: #{params}")
+      if @payment.payment_method.type_payway_v2? && @payment.payment_method.reviewing_mode? && request_from_external_server?
+        Rails.logger.info("[Vpago] Received payment notification from bank in reviewing mode, skipping processing: #{params}")
         return render json: { status: :ok }, status: :ok
       end
 
       unless @payment.order.paid?
+        Rails.logger.info("[Vpago] Enqueuing payment processor job for payment #{@payment.number}: #{params}")
         Vpago::PaymentProcessorJob.perform_later(
           payment_number: @payment.number
         )
@@ -123,8 +124,8 @@ module Spree
       end
     end
 
-    def request_from_bank?
-      request.headers['X-CSRF-Token'].nil?
+    def request_from_external_server?
+      params[:internal_client].blank? || params[:internal_client] == 'false'
     end
   end
 end

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

@@ -19,9 +19,13 @@
   }
 
   function openUrl(url, delay = 0) {
-    setTimeout(function() {
+    if(delay > 0) {
+      setTimeout(function() {
+        window.location.href = url;
+      }, delay);
+    } else {
       window.location.href = url;
-    }, delay);
+    }
   }
 
   function showRedirectContainer(buttonLabel = null, onClick = null) {
@@ -53,6 +57,7 @@
         return response.json();
       })
       .then(function(data) {
+        var shouldDelayBeforeOpenCheckoutUrl = false;
         var shouldShowRedirectContainer = false;
 
         console.log("[Vpago] checkout response data:", JSON.stringify(data));
@@ -69,11 +74,12 @@
 
         if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
           openDeeplinkUrl(data.abapay_deeplink);
+          shouldDelayBeforeOpenCheckoutUrl = true;
           shouldShowRedirectContainer = true;
         }
 
         if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
-          openUrl(data.checkout_qr_url);
+          openUrl(data.checkout_qr_url, shouldDelayBeforeOpenCheckoutUrl ? 50 : 0);
           shouldShowRedirectContainer = false;
         }
 

data/lib/spree_vpago/version.rb

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

metadata

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