spree_vpago 2.3.14.pre.pre1 → 2.4.0.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c9bf6d8bf472a0e5c04edafc4a8b12713b2c4576a814d75a88fbbe3da8d807e
-  data.tar.gz: 27e3a3394b762dc160e77f37740722e6142e3c61d64faae197c3320de77092dc
+  metadata.gz: 2b281c3ae420620dbd3d1da80ed2bc713c9283292484c1812cd1e9c979e6bf52
+  data.tar.gz: 70b7603d37c2c5e8f434e1ab333e622619296fd1ced75642ea9c0512a7591eb1
 SHA512:
-  metadata.gz: 78302ef6b401c653e4923a343d5d1883d9708cbed5996a899aa62302e0109cc04bce03f8a1f915347cf6d437d2b8d282af8600006c3398bc83e722b6cc0320e3
-  data.tar.gz: 3569b2e226550873e45c449ad72a3cd70d1889a9665a9bebb0f2632f55d4f4a4824239b9a9ad25fedb1bc11bc70882315d23ee7400cff77aea4b008218bc17b8
+  metadata.gz: 718d7eb47ff0a91b7cbcd43d13bd28f4808e008bed9ebee489c913af2d18d5069b5bdc4f06cca8e57693559e96da51a7af8c6e8843e5e01952898c7853c919e1
+  data.tar.gz: dd5f68ec20858da961d36f88a488bd3906d0623baa9f88a3811bbe10957ebd93bf891d047df9b2b8123a549d6881ef8ef32e1c7674144e6dd7901c779e79ae8b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.14.pre.pre1)
+    spree_vpago (2.4.0.pre.pre1)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/assets/config/spree_vpago_manifest.js

@@ -2,5 +2,3 @@
 //= link vpago/vpago_payments/check_transaction_periodically.js
 //= link vpago/vpago_payments/request_process_payment.js
 //= link vpago/vpago_payments/user_informers/firebase.js
-//= link vpago/wing_mini_app/web_jsbridge.bundle.js
-//= link vpago/wing_mini_app/login.js

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

@@ -16,13 +16,6 @@ module Spree
           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::PaymentPaywayQueriersController#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
 

data/app/controllers/spree/{mini_app → miniapp}/acledas_controller.rb

@@ -1,27 +1,21 @@
 module Spree
-  module MiniApp
+  module Miniapp
     # Partner Session Initialization API (ACLEDA Mini App Integration Spec, Step 01).
-    # ACLEDA POSTs { phone, first_name, last_name } signed with X-Acleda-Signature, and
-    # gets back a session-based miniAppUrl to open in the WebView.
+    # ACLEDA (server-to-server) POSTs { phone, first_name, last_name }; we return a
+    # session-based miniAppUrl for ACLEDA to open in the WebView.
     class AcledasController < Spree::Api::V2::BaseController
-      include Spree::MiniAppConcern
-
-      PROVIDER = 'acleda_bank'.freeze
-
-      # POST /mini_app/acleda
+      # POST /miniapp/acleda
       def create
         result = ::Vpago::AcledaMiniApp::Session::Create.call(
           phone: session_params[:phone],
           first_name: session_params[:first_name],
-          last_name: session_params[:last_name],
-          signature: request.headers['X-Acleda-Signature'],
-          gate: session_gate(PROVIDER)
+          last_name: session_params[:last_name]
         )
 
         if result.success?
           render json: { message: 'SUCCESS', miniAppUrl: result.value[:mini_app_url] }
         else
-          render json: { message: 'FAILED', error: result.error.to_s }, status: failure_status(result)
+          render json: { message: 'FAILED', error: result.error.to_s }, status: :unprocessable_entity
         end
       end
 

data/app/controllers/spree/vpago_payments_controller.rb

@@ -24,12 +24,6 @@ module Spree
     def processing
       @order = @payment.order
 
-      # Common, not an edge case: the gateway callback or the checkout page's transaction
-      # checker often completes the order before the browser lands here. Skipping this page
-      # also skips its Firebase listener, so success must post order_is_completed itself
-      # (render_success_script) or an embedding iframe modal never closes.
-      return redirect_to @payment.success_url, allow_other_host: true if @order.completed?
-
       VpagoLogger.log(label: 'Spree::VpagoPaymentsController#processing', data: vpago_log_context)
     end
 
@@ -66,12 +60,6 @@ module Spree
       else
         render json: { status: :pending }, status: :ok
       end
-    rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
-      VpagoLogger.error(
-        label: 'Spree::VpagoPaymentsController#check_transaction gateway_timeout',
-        data: vpago_log_context(error_class: e.class.name, error_message: e.message)
-      )
-      render json: { status: :pending }, status: :ok
     end
 
     # POST
@@ -158,9 +146,9 @@ module Spree
       raise ActiveRecord::RecordNotFound unless @payment.present?
     end
 
-    # These pages are embedded in iframes on many partner sites we don't
-    # enumerate, so framing is left unrestricted: no frame-ancestors policy, and
-    # Rails' default SAMEORIGIN header is dropped for the iframe actions.
+    # frame-ancestors (set above) supersedes X-Frame-Options in modern
+    # browsers, but the default SAMEORIGIN header would still block legacy
+    # browsers from embedding these pages, so drop it for the iframe actions.
     def allow_iframe_embedding
       response.headers.delete('X-Frame-Options')
     end

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -13,12 +13,6 @@ module Vpago
       render partial: 'spree/vpago_payments/transaction_checker'
     end
 
-    # Host apps override success.html.erb; call this from every override so an
-    # embedding iframe modal still learns the order completed.
-    def render_success_script
-      render partial: 'spree/vpago_payments/success_script'
-    end
-
     # Each payment method may have their own additional processing script,
     # so we will look for the partial based on the payment method class name.
     #

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

@@ -1,16 +1,18 @@
 module Spree
   # ACLEDA Mini App payment method.
   #
-  # Reuses the ACLEDA V2 integration in deeplink mode: openSessionV2 returns a deeplink the
-  # payment page opens as a top-frame navigation, which ACLEDA's own WebView turns into an app
-  # launch. Server-side verification reuses AcledaV2's #check_transaction (getTxnStatus).
+  # Reuses the ACLEDA V2 integration in deeplink mode: the deeplink produced by
+  # ACLEDA's openSessionV2 API is handed to the ACLEDA super-app through the
+  # `acledaJSBridge` (startPayment) instead of redirecting the page. Server-side
+  # verification reuses AcledaV2's #check_transaction (getTxnStatus).
   class Gateway::AcledaMiniApp < Gateway::AcledaV2
     # override: partial to render in admin / checkout form lookup
     def method_type
       'acleda_mini_app'
     end
 
-    # The mini app always pays by deeplink, so admins don't need to set the ACLEDA V2 mode.
+    # The mini app always uses the deeplink + JS bridge, so admins don't need to
+    # set the ACLEDA V2 mode.
     def deeplink?
       true
     end

data/app/models/spree/payment_method/cash_on.rb

@@ -11,12 +11,5 @@ module Spree
     def auto_capture?
       true
     end
-
-    # override: Spree::Payment#cancel! calls payment_method.cancel(response_code, payment).
-    # Cash has no gateway to void against, so acknowledge success and let the payment
-    # transition to `void`.
-    def cancel(_response_code, _payment = nil)
-      ActiveMerchant::Billing::Response.new(true, 'Cash On: Payment has been canceled.')
-    end
   end
 end

data/app/models/vpago/order_decorator.rb

@@ -102,7 +102,7 @@ module Vpago
     # override this method if you want flexibility
     # for example, host per payment method or tenant
     def payment_host
-      ENV.fetch('PAYMENT_BASE_URL')
+      ENV.fetch('DEFAULT_URL_HOST')
     end
   end
 end

data/app/models/vpago/payment_decorator.rb

@@ -113,10 +113,6 @@ module Vpago
       payment_method.type_acleda_mini_app?
     end
 
-    def wing_mini_app_payment?
-      payment_method.type_wing_mini_app?
-    end
-
     def check_payment?
       payment_method.type_check?
     end

data/app/models/vpago/payment_method_decorator.rb

@@ -10,7 +10,6 @@ module Vpago
     TYPE_TRUE_MONEY = 'Spree::Gateway::TrueMoney'.freeze
     TYPE_VATTANAC = 'Spree::Gateway::Vattanac'.freeze
     TYPE_VATTANAC_MINI_APP = 'Spree::Gateway::VattanacMiniApp'.freeze
-    TYPE_WING_MINI_APP = 'Spree::Gateway::WingMiniApp'.freeze
     TYPE_CASH_ON = 'Spree::PaymentMethod::CashOn'.freeze
 
     def self.prepended(base)
@@ -29,7 +28,6 @@ module Vpago
           Spree::PaymentMethod::TYPE_ACLEDA_MINI_APP,
           Spree::PaymentMethod::TYPE_VATTANAC,
           Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP,
-          Spree::PaymentMethod::TYPE_WING_MINI_APP,
           Spree::PaymentMethod::TYPE_TRUE_MONEY,
           Spree::PaymentMethod::TYPE_CASH_ON
         ]
@@ -84,10 +82,6 @@ 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
 
@@ -119,18 +113,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
 
-    def type_wing_mini_app?
-      type == Spree::PaymentMethod::TYPE_WING_MINI_APP
-    end
-
     def type_true_money?
       type == Spree::PaymentMethod::TYPE_TRUE_MONEY
     end

data/app/serializers/spree/v2/storefront/payment_method_serializer_decorator.rb

@@ -14,12 +14,6 @@ module Spree
 
             pref.blank? || pref[:payment_option].blank? ? payment_method.method_type : pref[:payment_option]
           end
-
-          # Overried the payment method type to show all payment methods as one list on App.
-          # Controlled by ENV["PAYMENT_METHOD_VIEW"] = "split" | "join" (default: "join").
-          base.attribute :type do |payment_method|
-            ENV.fetch('PAYMENT_METHOD_VIEW', 'join') == 'split' ? payment_method.type : 'payment_method'
-          end
         end
       end
     end

data/app/services/vpago/acleda_mini_app/session/create.rb

@@ -3,32 +3,20 @@ module Vpago
     module Session
       # Partner Session Initialization (ACLEDA Mini App Integration Spec, Step 01).
       #
-      # ACLEDA POSTs { phone, first_name, last_name } with an X-Acleda-Signature HMAC
-      # (see SessionHashValidator), checked before we touch the user so nobody can mint
-      # a session for an arbitrary phone. We then find or create the customer, tag them
-      # with the acleda_bank identity, and hand back a miniAppUrl carrying a session JWT.
+      # ACLEDA calls POST /miniapp/acleda with { phone, first_name, last_name }.
+      # We find or create the customer (tagged with the acleda_bank identity),
+      # mint a session JWT, and return a session-based miniAppUrl for ACLEDA to
+      # open in the WebView. The generic session_id OAuth grant validates the JWT
+      # when the WebView later authenticates.
       class Create
         prepend Spree::ServiceModule::Base
 
-        # `signature`, not `hash`: an attr_reader named `hash` overrides Object#hash and
-        # silently breaks this object as a Hash key.
-        #
-        # `gate` answers who is calling, from where and how often. The controller builds it:
-        # the key header and the address exist only on the request.
-        def call(gate:, phone: nil, first_name: nil, last_name: nil, signature: nil)
+        def call(phone: nil, first_name: nil, last_name: nil)
           return failure(nil, 'phone is required') if phone.blank?
 
           @phone = phone
           @first_name = first_name
           @last_name = last_name
-          @signature = signature
-          @gate = gate
-
-          return failure({ status: :unauthorized }, 'missing or unknown api key') unless gate.api_key_accepted?
-          return failure({ status: :forbidden }, 'address not allowed') unless gate.address_allowed?
-          return failure(nil, 'invalid signature') unless valid_signature?
-          return failure(nil, 'phone is invalid') if intel_phone.blank?
-          return failure({ status: :too_many_requests }, 'too many requests') if gate.session_exceeded?(phone: intel_phone)
 
           user = find_or_create_user
           return failure(user, 'user creation failed') if user.nil? || !user.persisted?
@@ -38,20 +26,7 @@ module Vpago
 
         private
 
-        attr_reader :phone, :first_name, :last_name, :signature, :gate
-
-        # Only asked where this call would mint an account — the damage a leaked key does.
-        # Returning customers never spend that quota.
-        def new_user_throttled?
-          !acleda_identity.persisted? && find_existing_user.nil? && gate.new_user_exceeded?(phone: intel_phone)
-        end
-
-        def valid_signature?
-          ::Vpago::AcledaMiniApp::SessionHashValidator.new(
-            phone: phone, first_name: first_name, last_name: last_name, hash: signature,
-            secret_key: gate.mini_app&.preferred_secret_key
-          ).call
-        end
+        attr_reader :phone, :first_name, :last_name
 
         def find_or_create_user
           identity = acleda_identity
@@ -59,10 +34,9 @@ module Vpago
           # Returning customer: the ACLEDA identity already points at a user.
           return identity.user if identity.persisted?
 
-          return nil if new_user_throttled?
-
-          # New to ACLEDA: reuse a customer matched by phone, otherwise build one, then
-          # tag them so the lookup above hits next time.
+          # New to ACLEDA: reuse a customer matched by phone, otherwise build one,
+          # then tag them with the acleda_bank identity so the lookup above hits
+          # next time.
           user = find_existing_user || build_user
           identity.name = full_name
           user.user_identity_providers << identity
@@ -71,17 +45,14 @@ module Vpago
           user
         end
 
-        # Memoized: #new_user_throttled? asks the same questions, and this row is the one
-        # that gets tagged onto the user.
         def acleda_identity
-          @acleda_identity ||= SpreeCmCommissioner::UserIdentityProvider.acleda_bank.find_or_initialize_by(sub: phone)
+          SpreeCmCommissioner::UserIdentityProvider.acleda_bank.find_or_initialize_by(sub: phone)
         end
 
         def find_existing_user
-          return @find_existing_user if defined?(@find_existing_user)
-          return @find_existing_user = nil if intel_phone.blank?
+          return if intel_phone.blank?
 
-          @find_existing_user = Spree::User.by_non_tenant.find_by(intel_phone_number: intel_phone)
+          Spree::User.by_non_tenant.find_by(intel_phone_number: intel_phone)
         end
 
         def build_user
@@ -96,14 +67,15 @@ module Vpago
         end
 
         def mini_app_url(user)
-          # A JWT signed with the user's secure_token. `session_key`, not `session_id`, so
-          # the OAuth grant routes it to the ACLEDA authenticator.
+          # A JWT signed with the user's secure_token. Passed as `session_key` (not
+          # `session_id`) so the OAuth grant routes it to the ACLEDA authenticator,
+          # which enforces the signature.
           session_key = SpreeCmCommissioner::UserSessionJwtToken.encode(
             { user_id: user.id },
             user.reload.secure_token
           )
 
-          "#{Spree::Store.default.formatted_url}/mini_app/acleda?session_key=#{session_key}"
+          "#{Spree::Store.default.formatted_url}/mini_app/acleda?session_key=#{session_key}&ds=#{CGI.escape(disable_services)}"
         end
 
         def full_name
@@ -115,6 +87,12 @@ module Vpago
 
           @intel_phone = SpreeCmCommissioner::PhoneNumberParser.call(phone_number: phone).intel_phone_number
         end
+
+        # Services to disable in the mini app storefront. Configurable per ACLEDA's
+        # requirement; defaults to none.
+        def disable_services
+          ENV.fetch('ACLEDA_MINI_APP_DISABLE_SERVICES', '')
+        end
       end
     end
   end

data/app/services/vpago/payment_finder.rb

@@ -19,13 +19,6 @@ module Vpago
         payment = Spree::Payment.find_by!(number: payload['paymentId'])
         payment.update(transaction_response: payload)
         payment
-      elsif wing_mini_app_callback?
-        payment = Spree::Payment.find_by!(number: params_hash[:orderRef])
-        verifier = Vpago::WingMiniApp::WebhookVerifier.new(params_hash, payment)
-        raise "Wing Mini App webhook: verification failed for payment #{payment.number}" unless verifier.valid?
-
-        payment.update(transaction_response: params_hash)
-        payment
       elsif acleda_v2_callback?
         # ACLEDA V2's static portal callback echoes back _transactionid, which is
         # the payment number we sent as transactionID/txid at openSessionV2.
@@ -49,9 +42,5 @@ module Vpago
     def acleda_v2_callback?
       params_hash[:_paymenttokenid].present?
     end
-
-    def wing_mini_app_callback?
-      params_hash[:orderRef].present? && params_hash[:secretKey].present?
-    end
   end
 end

data/app/services/vpago/payment_redirect_handler.rb

@@ -50,7 +50,7 @@ module Vpago
 
     def process_acleda_gateway
       data = {
-        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/acleda_redirects?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/acleda_redirects?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -81,7 +81,7 @@ module Vpago
     def process_payway_v2_card
       ## TO DO: generate redirect url
       data = {
-        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/payway_v2_card_popups?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/payway_v2_card_popups?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -115,7 +115,7 @@ module Vpago
       end
 
       conn.post(abapay_payment.checkout_url, gateway_params) do |request|
-        request.headers['Referer'] = ENV.fetch('PAYMENT_BASE_URL', nil)
+        request.headers['Referer'] = ENV.fetch('DEFAULT_URL_HOST', nil)
       end
     end
 
@@ -127,7 +127,7 @@ module Vpago
     def process_payway_card
       ## TO DO: generate redirect url
       data = {
-        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/payway_card_popups?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/payway_card_popups?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -135,7 +135,7 @@ module Vpago
 
     def process_wing_gateway
       data = {
-        href: "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/wing_redirects?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/wing_redirects?payment_number=#{@payment.number}"
       }
 
       @redirect_options = data
@@ -169,7 +169,7 @@ module Vpago
       end
 
       @response = conn.post(abapay_payment.action_url, gateway_params) do |request|
-        request.headers['Referer'] = ENV.fetch('PAYMENT_BASE_URL', nil)
+        request.headers['Referer'] = ENV.fetch('DEFAULT_URL_HOST', nil)
       end
     end
 

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: admin_payment_acleda_v2_querier_path(payment),
-    heal_payment_url: admin_payment_acleda_v2_checker_path(payment),
+    check_status_url: '',
+    heal_payment_url: '',
     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: admin_payment_vattanac_querier_path(payment),
-    heal_payment_url: admin_payment_vattanac_checker_path(payment),
+    payment: payment, 
+    check_status_url: '',
+    heal_payment_url: '',
     manual_update_payment_url: ''
 %>

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

@@ -2,93 +2,92 @@
   opr_device = request.user_agent.to_s.downcase.match?(/iphone|ipad|ipod/) ? 'ios' : 'android'
   checkout = ::Vpago::AcledaMiniApp::Checkout.new(@payment, { platform: 'app', opr_device: opr_device })
 
-  # openSessionV2 runs here and persists paymentTokenid for the later getTxnStatus check.
-  # Rejected session or transport error both end with no deeplink — the one failure to render.
-  acleda_deeplink =
-    begin
-      checkout.acleda_deeplink
-    rescue StandardError => e
-      Rails.logger.error("[Acleda] openSessionV2 raised: #{e.message}")
-      nil
-    end
-
-  Rails.logger.error("[Acleda] openSessionV2 failed: #{checkout.error_message}") if checkout.failed?
+  begin
+    checkout.call
+  rescue => e
+    Rails.logger.error("Acleda Mini App checkout.call failed: #{e.message}")
+  end
 %>
 
-<p id="acleda-message"
+<p id="unsupported-message"
    style="margin-top: 10px; font-weight: bold; color: red; display: none;">
 </p>
 
-<script>
-  function showRedirectContainer(buttonLabel, onClick) {
-    const loadingContainer = document.getElementById('vpago_loading_container');
-    const redirectContainer = document.getElementById('vpago_redirect_container');
-    const redirectButton = document.getElementById('vpago_redirect_button');
-
-    redirectButton.textContent = buttonLabel;
-    redirectButton.addEventListener('click', onClick);
-
-    loadingContainer.style.display = 'none';
-    redirectContainer.style.removeProperty('display');
-  }
-
-  function showError(detail) {
-    console.error('[Acleda] ' + detail);
-
-    const message = document.getElementById('acleda-message');
-    message.innerText = "We couldn't start your ACLEDA payment.";
-    message.style.display = 'block';
-  }
-
-  document.addEventListener('DOMContentLoaded', () => {
-    const acledaDeeplink = "<%= raw acleda_deeplink %>";
-
-    if (!acledaDeeplink) {
-      showError('openSessionV2 returned no deeplinkUrl');
-      return;
-    }
-
-    const framed = window.top !== window.self;
-    const android = <%= (opr_device == 'android').to_json %>;
-
-    // The spec's `acledaJSBridge` does not exist in ACLEDA's Mini App (`window.webkit` is
-    // undefined), so they proposed this deeplink instead. getTxnStatus still confirms the
-    // payment, already polled by check_transaction_periodically.js.
-
-    // The three below open the wallet for the customer, so they tap Pay once and not twice.
-    // Two rules shape them: ACLEDA's WebView only launches the app for a navigation on the
-    // *top* frame, and a cross-origin iframe may navigate the top only while a tap's
-    // activation lasts — which the button has and the automatic run does not.
-    const openWallet = () => {
-      window.top.location.href = acledaDeeplink;
-    };
-
-    // So ask our web app, the page embedding this one, which *is* the top frame. It obeys
-    // only inside a bank mini app: anywhere else nothing intercepts the link and the checkout
-    // would really travel to ACLEDA's Play Store listing. Silence is fine — the button still works.
-    const askWebAppToOpen = () => {
-      window.parent.postMessage({ code: 'open_deeplink', url: acledaDeeplink }, '*');
+<% if checkout.failed? %>
+  <script>
+    console.error("[Vpago] Acleda Mini App checkout error: <%= j checkout.error_message.to_s %>");
+    document.addEventListener("DOMContentLoaded", () => {
+      const loadingContainer = document.getElementById('vpago_loading_container');
+      if (loadingContainer) {
+        loadingContainer.textContent = "We couldn't start your payment. Please go back and try again.";
+      }
+    });
+  </script>
+<% else %>
+  <script>
+    // ACLEDA JS bridge (unified iOS + Android). Defined before use so it is
+    // available when the native layer injects its handlers.
+    window.acledaJSBridge = window.acledaJSBridge || {
+      call: function (action, data = {}) {
+        const payload = { action, data };
+
+        // iOS WKWebView
+        if (
+          window.webkit &&
+          window.webkit.messageHandlers &&
+          window.webkit.messageHandlers.acledaIOSJSBridge
+        ) {
+          window.webkit.messageHandlers.acledaIOSJSBridge.postMessage(payload);
+          return true;
+        }
+
+        // Android WebView
+        if (
+          window.acledaAndroidJSBridge &&
+          typeof window.acledaAndroidJSBridge.postMessage === "function"
+        ) {
+          window.acledaAndroidJSBridge.postMessage(JSON.stringify(payload));
+          return true;
+        }
+
+        console.warn("[acledaJSBridge] Native bridge not found");
+        return false;
+      }
     };
 
-    // iOS resolves the universal link before the request is made, so a throwaway frame opens
-    // it. Android cannot: ACLEDA serves `frame-ancestors` on the link, so Chromium refuses to
-    // frame it at all.
-    const openThroughHiddenFrame = () => {
-      const frame = document.createElement('iframe');
-
-      frame.style.display = 'none';
-      frame.src = acledaDeeplink;
+    function showRedirectContainer(buttonLabel, onClick) {
+      const loadingContainer = document.getElementById('vpago_loading_container');
+      const redirectContainer = document.getElementById('vpago_redirect_container');
+      const redirectButton = document.getElementById('vpago_redirect_button');
 
-      document.body.appendChild(frame);
-      setTimeout(() => frame.remove(), 1000);
-    };
+      redirectButton.textContent = buttonLabel;
+      redirectButton.addEventListener('click', onClick);
 
-    if (!framed) openWallet();
-    else if (android) askWebAppToOpen();
-    else openThroughHiddenFrame();
+      loadingContainer.style.display = 'none';
+      redirectContainer.style.removeProperty('display');
+    }
 
-    // Straight away, not on re-show: opening the bank app only backgrounds this page, and
-    // waiting for it to come back left the customer stuck on "Loading..." with no way out.
-    showRedirectContainer('Pay with ACLEDA', openWallet);
-  });
-</script>
+    document.addEventListener("DOMContentLoaded", () => {
+      const acledaDeeplink = "<%= raw checkout.acleda_deeplink %>";
+      const processingUrl = "<%= raw @payment.processing_url %>";
+
+      // Native -> JS after payment completes. Primary completion signal; the
+      // transaction checker polling is the fallback.
+      window.onPaymentResult = function (result) {
+        console.log("[acledaJSBridge] Payment result:", result);
+        // result.batchId, result.status = "success" | "failed" | "cancelled"
+        window.location.href = processingUrl;
+      };
+
+      const startPayment = () => window.acledaJSBridge.call("startPayment", { acleda_deeplink: acledaDeeplink });
+
+      if (startPayment()) {
+        showRedirectContainer("Continue", startPayment);
+      } else {
+        const unsupported = document.getElementById('unsupported-message');
+        unsupported.style.display = 'block';
+        unsupported.innerText = 'Unsupported environment';
+      }
+    });
+  </script>
+<% end %>