spree_vpago 2.3.11 → 2.3.13.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 135ae8e71835e73aacb8af2817bf0702b7a9b09e5e7a978380235b6e694b286e
-  data.tar.gz: a9d35bf4ce64a37c90e50217be487b218674ba1c7e5abdfbeb5117407371994e
+  metadata.gz: 1a704b3b4c6172fcfac73d2b395be971f8706c137260c6d122e530160260f276
+  data.tar.gz: fc86b46f2cde8a9de6426b413196cc707b32dc141c78d756d17ae9de654893f3
 SHA512:
-  metadata.gz: 51e6f6db2eee4946a21b5d344718432befd1ceb9f67a89c5d2af44dcd1ce707fc369a10d5a4c14aca07e20ac15904fd63581191623070fec92397eaea1efb12a
-  data.tar.gz: fd4dc35df53a19b819bcdb761d76d8badf59b6d1416232978167a4fab9733781c2a4bc5a5605319736c7bcb47ec1e82f805142fe3094b1562cb79b6c392e671f
+  metadata.gz: 229e3073db012f2f0a1ab6a9b47ea893eaf751b0d3937211490743d81a41800024e2263dd07269fdfdc3549449288bf13263df0737bf6a4dcda2a4a768acae53
+  data.tar.gz: a8ea4e06485c9bd95d6f6616379c6c8dee5e8b6090dddb1a30446ec16ea0697984db1480a027ad7150b68e801bf295c50e13998fcc8232eddeb2fe9e32605920

data/.github/workflows/test_and_publish_gem.yml

@@ -12,7 +12,7 @@ on:
       - 112-ci-cd
       - 245-build-and-publish-gem
     tags:
-      - "*"
+        - "*"
 jobs:
   test_and_publish_gem:
     runs-on: ubuntu-latest
@@ -66,11 +66,11 @@ jobs:
       #   run: |
       #     bundle exec brakeman
 
-      # - name: Run test
-      #   env:
-      #     DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
-      #   run: |
-      #     bundle exec rake
+      - name: Run test
+        env:
+          DATABASE_URL: postgres://myuser:mypassword@localhost:5432/test_db
+        run: |
+          bundle exec rake
 
       - name: Build gem
         env:

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.11)
+    spree_vpago (2.3.13.pre.pre1)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
       spree_backend (>= 4.5)
       spree_core (>= 4.5)
-      spree_extension
+      spree_extension (< 1.0)
       spree_multi_vendor (>= 2.4.1)
 
 GEM
@@ -128,7 +128,7 @@ GEM
       babel-source (>= 4.0, < 6)
       execjs (~> 2.0)
     base64 (0.3.0)
-    bcrypt (3.1.22)
+    bcrypt (3.1.21)
     bigdecimal (3.1.8)
     bootstrap (4.6.2.1)
       autoprefixer-rails (>= 9.1.0)
@@ -176,11 +176,10 @@ GEM
       rainbow (>= 2.1.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    doorkeeper (5.9.6)
+    doorkeeper (5.8.2)
       railties (>= 5)
     erubi (1.12.0)
-    execjs (2.10.2)
-      json (>= 2)
+    execjs (2.10.0)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     faraday (2.7.4)
@@ -189,7 +188,7 @@ GEM
     faraday-http-cache (2.5.0)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    faraday-retry (2.4.0)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
     ffaker (2.21.0)
     ffi (1.15.5)
@@ -199,7 +198,7 @@ GEM
     flatpickr (4.6.13.1)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    gapic-common (1.3.0)
+    gapic-common (1.2.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
@@ -222,45 +221,45 @@ GEM
     globalid (1.1.0)
       activesupport (>= 5.0)
     glyphicons (1.0.2)
-    google-cloud-core (1.9.0)
+    google-cloud-core (1.8.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.4.0)
+    google-cloud-env (2.3.1)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.7.0)
-    google-cloud-firestore (3.2.0)
+    google-cloud-errors (1.5.0)
+    google-cloud-firestore (3.1.1)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.7)
       google-cloud-firestore-v1 (~> 2.0)
       rbtree (~> 0.4.2)
-    google-cloud-firestore-v1 (2.4.0)
-      gapic-common (~> 1.3)
+    google-cloud-firestore-v1 (2.3.0)
+      gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)
-    google-cloud-location (1.5.1)
-      gapic-common (~> 1.3)
+    google-cloud-location (1.2.1)
+      gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.33.6)
+    google-protobuf (4.33.4)
       bigdecimal
       rake (>= 13)
-    googleapis-common-protos (1.10.0)
+    googleapis-common-protos (1.9.0)
       google-protobuf (~> 4.26)
       googleapis-common-protos-types (~> 1.21)
       grpc (~> 1.41)
-    googleapis-common-protos-types (1.23.0)
+    googleapis-common-protos-types (1.22.0)
       google-protobuf (~> 4.26)
-    googleauth (1.17.4)
+    googleauth (1.16.1)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
       jwt (>= 1.4, < 4.0)
+      multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
-      pstore (~> 0.1)
       signet (>= 0.16, < 2.a)
-    grpc (1.83.1)
+    grpc (1.76.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)
@@ -370,7 +369,6 @@ GEM
     pry (0.14.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pstore (0.2.1)
     public_suffix (5.0.1)
     puma (6.2.2)
       nio4r (~> 2.0)
@@ -414,13 +412,13 @@ GEM
       activerecord (>= 6.0.4)
       activesupport (>= 6.0.4)
       i18n
-    rbtree (0.4.7)
+    rbtree (0.4.6)
     redis (5.0.6)
       redis-client (>= 0.9.0)
     redis-client (0.14.1)
       connection_pool
     regexp_parser (2.11.3)
-    responders (3.2.1)
+    responders (3.2.0)
       actionpack (>= 7.0)
       railties (>= 7.0)
     rexml (3.2.9)
@@ -494,10 +492,11 @@ GEM
       websocket (~> 1.0)
     shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
-    signet (0.22.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
       jwt (>= 1.5, < 4.0)
+      multi_json (~> 1.10)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -594,8 +593,9 @@ GEM
       actionmailer
       spree_core (>= 4.5.3)
       sprockets (>= 4.0)
-    spree_extension (1.0.2)
-      thor (~> 1.0)
+    spree_extension (0.1.0)
+      activerecord (>= 4.2)
+      spree_core
     spree_multi_vendor (2.4.1)
       deface (~> 1.0)
       spree (>= 4.3.0.rc1)

data/app/assets/config/spree_vpago_manifest.js

@@ -1,4 +1,5 @@
 //= link_tree ../images
 //= link vpago/vpago_payments/check_transaction_periodically.js
+//= link vpago/vpago_payments/create_transaction.js
 //= link vpago/vpago_payments/request_process_payment.js
 //= link vpago/vpago_payments/user_informers/firebase.js

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

@@ -0,0 +1,35 @@
+/**
+ * Calls our own server, which creates the bank transaction on the browser's
+ * behalf and returns the bank's response as JSON.
+ *
+ * @param {Object} options
+ * @param {string} options.url
+ * @param {Function} options.onSuccess
+ * @param {Function} options.onError
+ */
+async function createTransaction({ url, onSuccess, onError }) {
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "X-CSRF-Token": document
+          .querySelector('meta[name="csrf-token"]')
+          .getAttribute("content"),
+      },
+    });
+    const data = await response.json();
+
+    if (!response.ok || data.error) {
+      console.error("[Vpago] createTransaction failed:", JSON.stringify(data));
+      onError(data);
+      return;
+    }
+
+    onSuccess(data);
+  } catch (error) {
+    console.error("[Vpago] createTransaction request failed:", error);
+    onError(error);
+  }
+}
+
+window.createTransaction = createTransaction;

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

@@ -0,0 +1,21 @@
+module Spree
+  module Admin
+    class PaymentAcledaV2BaseController < Spree::Admin::BaseController
+      include Spree::Backend::Callbacks
+
+      before_action :load_payment, only: %i[show update]
+      before_action :validate_order, only: [:update]
+
+      def validate_order
+        return unless @payment.order.completed?
+
+        flash[:error] = Spree.t('vpago.payments.not_allow_for_order_completed')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      def load_payment
+        @payment = Payment.find_by!(number: params[:id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class PaymentAcledaV2CheckersController < PaymentAcledaV2BaseController
+      include Spree::Backend::Callbacks
+
+      def update
+        options = {
+          updated_by_user_id: try_spree_current_user.id,
+          updated_reason: Spree.t('vpago.payments.checker_updated_by_description')
+        }
+        spree_updater = Vpago::AcledaV2::PaymentRequestUpdater.new(@payment, options)
+        spree_updater.call
+
+        @payment.reload
+
+        if @payment.order.completed?
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payments))
+        else
+          flash[:error] = Spree.t(:unsuccessfully_updated, resource: Spree.t(:payments))
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Spree
+  module Admin
+    class PaymentAcledaV2QueriersController < PaymentAcledaV2BaseController
+      include Spree::Backend::Callbacks
+
+      around_action :set_writing_role, only: %i[show]
+
+      def show
+        tran_status = @payment.payment_method.check_transaction(@payment)
+
+        if tran_status.success?
+          @payment.update_column(:gateway_status, true)
+          flash[:success] =
+            Spree.t('vpago.payments.payment_found_with_result', result: tran_status.json_response)
+        else
+          flash[:error] = Spree.t('vpago.payments.payment_not_found_with_error', error: tran_status.error_message)
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+        VpagoLogger.error(
+          label: 'Spree::Admin::PaymentAcledaV2QueriersController#show gateway_timeout',
+          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
+        )
+        flash[:error] = Spree.t('vpago.payments.gateway_timeout')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      private
+
+      def set_writing_role
+        ActiveRecord::Base.connected_to(role: :writing) do
+          yield if block_given?
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,21 @@
+module Spree
+  module Admin
+    class PaymentVattanacBaseController < Spree::Admin::BaseController
+      include Spree::Backend::Callbacks
+
+      before_action :load_payment, only: %i[show update]
+      before_action :validate_order, only: [:update]
+
+      def validate_order
+        return unless @payment.order.completed?
+
+        flash[:error] = Spree.t('vpago.payments.not_allow_for_order_completed')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      def load_payment
+        @payment = Payment.find_by!(number: params[:id])
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module Spree
+  module Admin
+    class PaymentVattanacCheckersController < PaymentVattanacBaseController
+      include Spree::Backend::Callbacks
+
+      def update
+        options = {
+          updated_by_user_id: try_spree_current_user.id,
+          updated_reason: Spree.t('vpago.payments.checker_updated_by_description')
+        }
+        spree_updater = Vpago::Vattanac::PaymentRequestUpdater.new(@payment, options)
+        spree_updater.call
+
+        @payment.reload
+
+        if @payment.order.completed?
+          flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:payments))
+        else
+          flash[:error] = Spree.t(:unsuccessfully_updated, resource: Spree.t(:payments))
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,38 @@
+module Spree
+  module Admin
+    class PaymentVattanacQueriersController < PaymentVattanacBaseController
+      include Spree::Backend::Callbacks
+
+      around_action :set_writing_role, only: %i[show]
+
+      def show
+        tran_status = @payment.payment_method.check_transaction(@payment)
+
+        if tran_status.success?
+          @payment.update_column(:gateway_status, true)
+          flash[:success] =
+            Spree.t('vpago.payments.payment_found_with_result', result: tran_status.json_response)
+        else
+          flash[:error] = Spree.t('vpago.payments.payment_not_found_with_error', error: tran_status.error_message)
+        end
+
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
+        VpagoLogger.error(
+          label: 'Spree::Admin::PaymentVattanacQueriersController#show gateway_timeout',
+          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
+        )
+        flash[:error] = Spree.t('vpago.payments.gateway_timeout')
+        redirect_to admin_order_payment_path(order_id: @payment.order.number, id: @payment.number)
+      end
+
+      private
+
+      def set_writing_role
+        ActiveRecord::Base.connected_to(role: :writing) do
+          yield if block_given?
+        end
+      end
+    end
+  end
+end

data/app/controllers/spree/vpago_payments_controller.rb

@@ -69,6 +69,27 @@ module Spree
       render json: { status: :pending }, status: :ok
     end
 
+    # POST
+    def create_transaction
+      @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify
+      raise ActiveRecord::RecordNotFound unless @payment.present?
+
+      return render json: { error: true, message: 'unsupported' }, status: :not_implemented unless @payment.payment_method.support_create_transaction_api?
+
+      result = VpagoLogger.log(
+        label: 'Spree::VpagoPaymentsController#create_transaction',
+        data: vpago_log_context
+      ) { @payment.payment_method.create_transaction(@payment, platform: params[:platform]) }
+
+      render json: result, status: :ok
+    rescue Faraday::Error, JSON::ParserError, NoMethodError => e
+      VpagoLogger.error(
+        label: 'Spree::VpagoPaymentsController#create_transaction failed',
+        data: vpago_log_context(error_class: e.class.name, error_message: e.message)
+      )
+      render json: { error: true, message: 'Failed to create transaction' }, status: :bad_gateway
+    end
+
     # POST
     def process_payment
       return render json: { status: :ok }, status: :ok if request.method != 'POST'

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

@@ -168,6 +168,12 @@ module Spree
       checker
     end
 
+    def create_transaction(payment, options = {})
+      creator = Vpago::PaywayV2::TransactionCreator.new(payment, disable_return_deeplink: options[:platform] == 'web')
+      creator.call
+      creator.json_response
+    end
+
     private
 
     def cancel_pre_auth(payment)

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

@@ -78,5 +78,9 @@ module Spree
       checker.call
       checker
     end
+
+    def create_transaction(payment, options = {})
+      Vpago::TrueMoney::Checkout.new(payment).generate_payment_urls(options[:platform])
+    end
   end
 end

data/app/models/vpago/payment_decorator.rb

@@ -24,6 +24,7 @@ module Vpago
                     :success_url,
                     :success_deeplink_url,
                     :check_transaction_url,
+                    :create_transaction_url,
                     :process_payment_url,
                     to: :url_constructor
 

data/app/models/vpago/payment_method_decorator.rb

@@ -43,6 +43,12 @@ module Vpago
       respond_to?(:check_transaction)
     end
 
+    # The payment method must implement `create_transaction(payment, options = {})`,
+    # returning a Hash suitable for `render json:` directly.
+    def support_create_transaction_api?
+      respond_to?(:create_transaction)
+    end
+
     # TODO: we have already implement purchase for payway_v2.
     # make sure to implement this on other payment method as well.
     def purchase(_amount, _source, _gateway_options = {})
@@ -80,6 +86,10 @@ module Vpago
         ::Vpago::Acleda::PaymentRequestUpdater
       elsif type_acleda_mobile?
         ::Vpago::AcledaMobile::PaymentRequestUpdater
+      elsif type_acleda_v2?
+        ::Vpago::AcledaV2::PaymentRequestUpdater
+      elsif type_vattanac?
+        ::Vpago::Vattanac::PaymentRequestUpdater
       end
     end
 
@@ -107,6 +117,10 @@ module Vpago
       type == Spree::PaymentMethod::TYPE_WINGSDK
     end
 
+    def type_vattanac?
+      type == Spree::PaymentMethod::TYPE_VATTANAC
+    end
+
     def type_vattanac_mini_app?
       type == Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP
     end

data/app/services/vpago/payment_url_constructor.rb

@@ -18,6 +18,7 @@ module Vpago
     def success_deeplink_url = "#{app_scheme}://#{URI(base_url).host}/book/payment?number=#{order.number}&tk=#{order.token}"
 
     def check_transaction_url = "#{base_url}/vpago_payments/check_transaction?#{query}"
+    def create_transaction_url = "#{base_url}/vpago_payments/create_transaction?#{query}"
     def process_payment_url = "#{base_url}/vpago_payments/process_payment?#{query}"
 
     def query

data/app/views/layouts/vpago_payments.html.erb

@@ -11,6 +11,7 @@
   <%= yield :head %>
 
   <%= javascript_include_tag "vpago/vpago_payments/check_transaction_periodically", 'data-turbo-track': 'reload' %>
+  <%= javascript_include_tag "vpago/vpago_payments/create_transaction", 'data-turbo-track': 'reload' %>
   <%= javascript_include_tag "vpago/vpago_payments/request_process_payment", 'data-turbo-track': 'reload' %>
   <%= javascript_include_tag "vpago/vpago_payments/user_informers/#{user_informer}", 'data-turbo-track': 'reload' %>
 </head>

data/app/views/spree/admin/payments/source_views/_acleda_v2.html.erb

@@ -1,5 +1,5 @@
 <%= render 'spree/admin/payments/source_views/vpago_payment_tmpl',
     payment: payment,
-    check_status_url: '',
-    heal_payment_url: '',
+    check_status_url: admin_payment_acleda_v2_querier_path(payment),
+    heal_payment_url: admin_payment_acleda_v2_checker_path(payment),
     manual_update_payment_url: '' %>

data/app/views/spree/admin/payments/source_views/_vattanac.html.erb

@@ -1,6 +1,6 @@
 <%= render 'spree/admin/payments/source_views/vpago_payment_tmpl',
-    payment: payment, 
-    check_status_url: '',
-    heal_payment_url: '',
+    payment: payment,
+    check_status_url: admin_payment_vattanac_querier_path(payment),
+    heal_payment_url: admin_payment_vattanac_checker_path(payment),
     manual_update_payment_url: ''
 %>

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

@@ -43,55 +43,48 @@
   }
 
   function submitFormViaJs(){
-    var formData = new FormData(document.getElementById("aba_merchant_request"));
-    var checkoutUrl = document.getElementById("aba_merchant_request").action;
-
-    fetch(checkoutUrl, {
-      method: "POST",
-      body: formData
-    })
-    .then(function(response) {
-      return response.json();
-    })
-    .then(function(data) {
-      console.log("[Vpago] checkout response data:", JSON.stringify(data));
-
-      // When status code is 4 (duplicated transaction),
-      // Possibly user refresh the checkout page even after the transaction is completed.
-      // So in this case, we should hide loading spinner and show redirect container UI
-      // While it check transaction status in the background. It will automatically redirect user to the result page after checking.
-      if (data.status.code === 4){
-        showRedirectContainer();
-        return;
-      }
+    window.createTransaction({
+      url: "<%= raw @payment.create_transaction_url %>&platform=<%= params[:platform] %>",
+      onSuccess: function(data) {
+        console.log("[Vpago] checkout response data:", JSON.stringify(data));
+
+        // When status code is 4 (duplicated transaction),
+        // Possibly user refresh the checkout page even after the transaction is completed.
+        // So in this case, we should hide loading spinner and show redirect container UI
+        // While it check transaction status in the background. It will automatically redirect user to the result page after checking.
+        if (data.status.code === 4){
+          showRedirectContainer();
+          return;
+        }
 
-      let deeplinkTriggered = false;
+        let deeplinkTriggered = false;
 
-      if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
-        window.location.href = data.abapay_deeplink;
-        deeplinkTriggered = true;
-      }
+        if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
+          window.location.href = data.abapay_deeplink;
+          deeplinkTriggered = true;
+        }
 
-      if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
-        // 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(() => {
+        if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
+          // 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;
-          }, 300);
-        } else {
-          window.location.href = data.checkout_qr_url;
+          }
         }
-      }
 
-      var shouldShowRedirectContainer = !shouldOpenCheckoutUrl && shouldOpenAbaPayDeeplink;
-      if(shouldShowRedirectContainer){
-        showRedirectContainer("Open ABA Mobile", () => window.location.href = data.abapay_deeplink);
+        var shouldShowRedirectContainer = !shouldOpenCheckoutUrl && shouldOpenAbaPayDeeplink;
+        if(shouldShowRedirectContainer){
+          showRedirectContainer("Open ABA Mobile", () => window.location.href = data.abapay_deeplink);
+        }
+      },
+      onError: function() {
+        document.getElementById('vpago_loading_container').textContent = "We couldn't start your payment. Please go back and try again.";
       }
-    })
-    .catch(function(error) {
-      console.error("Payment request failed:", error);
     });
   }