spree_vpago 2.3.12 → 2.4.0.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c6fc347bce48aed54a98bf47d4432f79ec1144a882f7c6cf14b55ad1f87663
-  data.tar.gz: c62d76d1e6661bc0460b3a4be75feeb6d4c6c8a3b1278d1b62dccb53324b6e1a
+  metadata.gz: 2b281c3ae420620dbd3d1da80ed2bc713c9283292484c1812cd1e9c979e6bf52
+  data.tar.gz: 70b7603d37c2c5e8f434e1ab333e622619296fd1ced75642ea9c0512a7591eb1
 SHA512:
-  metadata.gz: 2973459504b60f1f6308e6f0db319c1b2e25f19747d2f94aeb3bf48f69b75e87c508f57c197a49440920464952df30e1cb3b6797ba9a782ff375ec1a7c0b0893
-  data.tar.gz: e8418cf6a8298850075104813a93da543ab148327d7ee6cafdd63be2c1ce5eb64fe457888d695af4931a1b459ee3e60282553e22875a7b530d3099d002c60b8b
+  metadata.gz: 718d7eb47ff0a91b7cbcd43d13bd28f4808e008bed9ebee489c913af2d18d5069b5bdc4f06cca8e57693559e96da51a7af8c6e8843e5e01952898c7853c919e1
+  data.tar.gz: dd5f68ec20858da961d36f88a488bd3906d0623baa9f88a3811bbe10957ebd93bf891d047df9b2b8123a549d6881ef8ef32e1c7674144e6dd7901c779e79ae8b

data/Gemfile.lock

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

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/miniapp/acledas_controller.rb

@@ -0,0 +1,29 @@
+module Spree
+  module Miniapp
+    # Partner Session Initialization API (ACLEDA Mini App Integration Spec, Step 01).
+    # 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
+      # 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]
+        )
+
+        if result.success?
+          render json: { message: 'SUCCESS', miniAppUrl: result.value[:mini_app_url] }
+        else
+          render json: { message: 'FAILED', error: result.error.to_s }, status: :unprocessable_entity
+        end
+      end
+
+      private
+
+      def session_params
+        params.permit(:phone, :first_name, :last_name)
+      end
+    end
+  end
+end

data/app/controllers/spree/vpago_payments_controller.rb

@@ -23,7 +23,6 @@ module Spree
     # GET
     def processing
       @order = @payment.order
-      return redirect_to @payment.success_url, allow_other_host: true if @order.completed?
 
       VpagoLogger.log(label: 'Spree::VpagoPaymentsController#processing', data: vpago_log_context)
     end
@@ -61,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

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

@@ -0,0 +1,20 @@
+module Spree
+  # ACLEDA Mini App payment method.
+  #
+  # 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 uses the deeplink + JS bridge, so admins don't need to
+    # set the ACLEDA V2 mode.
+    def deeplink?
+      true
+    end
+  end
+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

@@ -109,6 +109,10 @@ module Vpago
       payment_method.type_vattanac_mini_app?
     end
 
+    def acleda_mini_app_payment?
+      payment_method.type_acleda_mini_app?
+    end
+
     def check_payment?
       payment_method.type_check?
     end

data/app/models/vpago/payment_method_decorator.rb

@@ -6,6 +6,7 @@ module Vpago
     TYPE_ACLEDA = 'Spree::Gateway::Acleda'.freeze
     TYPE_ACLEDA_V2 = 'Spree::Gateway::AcledaV2'.freeze
     TYPE_ACLEDA_MOBILE = 'Spree::Gateway::AcledaMobile'.freeze
+    TYPE_ACLEDA_MINI_APP = 'Spree::Gateway::AcledaMiniApp'.freeze
     TYPE_TRUE_MONEY = 'Spree::Gateway::TrueMoney'.freeze
     TYPE_VATTANAC = 'Spree::Gateway::Vattanac'.freeze
     TYPE_VATTANAC_MINI_APP = 'Spree::Gateway::VattanacMiniApp'.freeze
@@ -24,6 +25,7 @@ module Vpago
           Spree::PaymentMethod::TYPE_ACLEDA,
           Spree::PaymentMethod::TYPE_ACLEDA_V2,
           Spree::PaymentMethod::TYPE_ACLEDA_MOBILE,
+          Spree::PaymentMethod::TYPE_ACLEDA_MINI_APP,
           Spree::PaymentMethod::TYPE_VATTANAC,
           Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP,
           Spree::PaymentMethod::TYPE_TRUE_MONEY,
@@ -80,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
 
@@ -99,6 +97,10 @@ module Vpago
       type == Spree::PaymentMethod::TYPE_ACLEDA_V2
     end
 
+    def type_acleda_mini_app?
+      type == Spree::PaymentMethod::TYPE_ACLEDA_MINI_APP
+    end
+
     def type_payway?
       type == Spree::PaymentMethod::TYPE_PAYWAY
     end
@@ -111,10 +113,6 @@ 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/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

@@ -0,0 +1,99 @@
+module Vpago
+  module AcledaMiniApp
+    module Session
+      # Partner Session Initialization (ACLEDA Mini App Integration Spec, Step 01).
+      #
+      # 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
+
+        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
+
+          user = find_or_create_user
+          return failure(user, 'user creation failed') if user.nil? || !user.persisted?
+
+          success(mini_app_url: mini_app_url(user))
+        end
+
+        private
+
+        attr_reader :phone, :first_name, :last_name
+
+        def find_or_create_user
+          identity = acleda_identity
+
+          # Returning customer: the ACLEDA identity already points at a user.
+          return identity.user if identity.persisted?
+
+          # 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
+          user.save
+
+          user
+        end
+
+        def acleda_identity
+          SpreeCmCommissioner::UserIdentityProvider.acleda_bank.find_or_initialize_by(sub: phone)
+        end
+
+        def find_existing_user
+          return if intel_phone.blank?
+
+          Spree::User.by_non_tenant.find_by(intel_phone_number: intel_phone)
+        end
+
+        def build_user
+          Spree::User.new(
+            first_name: first_name,
+            last_name: last_name,
+            phone_number: phone,
+            intel_phone_number: intel_phone,
+            password: SecureRandom.base64(16),
+            confirmed_at: Time.zone.now
+          )
+        end
+
+        def mini_app_url(user)
+          # 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}&ds=#{CGI.escape(disable_services)}"
+        end
+
+        def full_name
+          [first_name, last_name].compact.join(' ').presence
+        end
+
+        def intel_phone
+          return @intel_phone if defined?(@intel_phone)
+
+          @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
+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_mini_app.html.erb

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

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

@@ -0,0 +1,93 @@
+<%
+  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 })
+
+  begin
+    checkout.call
+  rescue => e
+    Rails.logger.error("Acleda Mini App checkout.call failed: #{e.message}")
+  end
+%>
+
+<p id="unsupported-message"
+   style="margin-top: 10px; font-weight: bold; color: red; display: none;">
+</p>
+
+<% 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;
+      }
+    };
+
+    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');
+    }
+
+    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 %>

data/config/locales/en.yml

@@ -35,6 +35,5 @@ en:
         failed_require_updated_reason: "You must provide update reason"
         payment_found_with_result: "Found payment with result: %{result}"
         payment_not_found_with_error: "Payment not found with error: %{error}"
-        gateway_timeout: "The payment gateway did not respond in time. Please try again shortly."
         query_status: "Query payment status"
         confirm_manual_update: "Are you sure to update this order to complete"

data/config/locales/km.yml

@@ -31,6 +31,5 @@ spree:
       failed_require_updated_reason: "អ្នកត្រូវតែផ្តល់ហេតុផល"
       payment_found_with_result: "រកឃើញការទូទាត់ជាមួយលទ្ធផល %{result}"
       payment_not_found_with_error: "ការទូទាត់មិនត្រូវបានរកឃើញដោយកំហុស: %{error}"
-      gateway_timeout: "ផ្នែកទូទាត់មិនបានឆ្លើយតបទាន់ពេលទេ។ សូមព្យាយាមម្តងទៀតក្នុងពេលឆាប់ៗនេះ។"
       query_status: "សួរស្ថានភាពបង់ប្រាក់"
       confirm_manual_update: "តើអ្នកប្រាកដជាធ្វើបច្ចុប្បន្នភាពការបញ្ជាទិញនេះដើម្បីបញ្ចប់"

data/config/routes.rb

@@ -17,6 +17,13 @@ Spree::Core::Engine.add_routes do
     resources :transactions, only: [:show]
   end
 
+  # ACLEDA Mini App session init (ACLEDA Mini App Integration Spec, Step 01).
+  # ACLEDA calls POST /miniapp/acleda with { phone, first_name, last_name }
+  # and receives a session-based miniAppUrl.
+  namespace :miniapp do
+    resources :acleda, only: [:create], controller: 'acledas'
+  end
+
   resource :vpago_payments do
     collection do
       get :checkout
@@ -73,12 +80,6 @@ Spree::Core::Engine.add_routes do
     resources :payment_payway_checkers
     resources :payment_payway_markers
 
-    resources :payment_acleda_v2_queriers, only: [:show]
-    resources :payment_acleda_v2_checkers, only: [:update]
-
-    resources :payment_vattanac_queriers, only: [:show]
-    resources :payment_vattanac_checkers, only: [:update]
-
     resources :products do
       resources :payout_profile_products
     end

data/lib/spree_vpago/engine.rb

@@ -23,6 +23,7 @@ module SpreeVpago
         Spree::Gateway::Acleda,
         Spree::Gateway::AcledaV2,
         Spree::Gateway::AcledaMobile,
+        Spree::Gateway::AcledaMiniApp,
         Spree::Gateway::Vattanac,
         Spree::Gateway::VattanacMiniApp,
         Spree::Gateway::TrueMoney,

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.3.12'.freeze
+  VERSION = '2.4.0-pre1'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/acleda_mini_app/checkout.rb

@@ -0,0 +1,23 @@
+module Vpago
+  module AcledaMiniApp
+    # ACLEDA Mini App checkout. Reuses ACLEDA V2's openSessionV2 flow to obtain a
+    # deeplink, which is passed to the ACLEDA super-app via the acledaJSBridge
+    # (startPayment) instead of redirecting the page.
+    class Checkout < Vpago::AcledaV2::Checkout
+      # The mini app always uses the deeplink + JS bridge, regardless of the
+      # gateway's configured mode.
+      def deeplink?
+        true
+      end
+
+      # The deeplink string handed to
+      #   acledaJSBridge.call('startPayment', { acleda_deeplink: ... })
+      # Ensures openSessionV2 has run (persisting paymentTokenid for later
+      # getTxnStatus verification) before returning the deeplinkUrl.
+      def acleda_deeplink
+        call if @response.nil?
+        deeplink_url
+      end
+    end
+  end
+end

data/lib/vpago/payway_v2/payment_request_updater.rb

@@ -28,11 +28,6 @@ module Vpago
         elsif checker.failed?
           mark_payment_as_failed(checker.error_message)
         end
-      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
-        VpagoLogger.error(
-          label: 'Vpago::PaywayV2::PaymentRequestUpdater#process_payment_status gateway_timeout',
-          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
-        )
       end
 
       def mark_payment_as_success(checker)

data/lib/vpago/payway_v2/transaction_status.rb

@@ -37,8 +37,6 @@ module Vpago
       def check_remote_status
         conn = Faraday::Connection.new do |faraday|
           faraday.request :url_encoded
-          faraday.options.open_timeout = Vpago::HttpTimeouts::OPEN_TIMEOUT
-          faraday.options.timeout = Vpago::HttpTimeouts::TIMEOUT
         end
 
         data = {

data/lib/vpago/payway_v2/transaction_status_v2.rb

@@ -52,8 +52,6 @@ module Vpago
       def check_remote_status
         conn = Faraday::Connection.new do |faraday|
           faraday.request :url_encoded
-          faraday.options.open_timeout = Vpago::HttpTimeouts::OPEN_TIMEOUT
-          faraday.options.timeout = Vpago::HttpTimeouts::TIMEOUT
         end
 
         data = {

data/lib/vpago/true_money/base.rb

@@ -100,7 +100,7 @@ module Vpago
       end
 
       def fetch_access_token
-        response = Faraday.new(request: { open_timeout: Vpago::HttpTimeouts::OPEN_TIMEOUT, timeout: Vpago::HttpTimeouts::TIMEOUT }).post(
+        response = Faraday.post(
           access_token_url,
           URI.encode_www_form(
             grant_type: 'client_credentials',

data/lib/vpago/true_money/transaction_status.rb

@@ -2,7 +2,7 @@ module Vpago
   module TrueMoney
     class TransactionStatus < Base
       def call
-        @response = Faraday.new(request: { open_timeout: Vpago::HttpTimeouts::OPEN_TIMEOUT, timeout: Vpago::HttpTimeouts::TIMEOUT }).get(check_transaction_url, nil, default_headers)
+        @response = Faraday.get(check_transaction_url, nil, default_headers)
       end
 
       def success?

data/lib/vpago/vattanac/base.rb

@@ -70,8 +70,7 @@ module Vpago
       private
 
       def fetch_access_token
-        response = Faraday.new(request: { open_timeout: Vpago::HttpTimeouts::OPEN_TIMEOUT, timeout: Vpago::HttpTimeouts::TIMEOUT })
-                          .post(access_token_url, { username: username, password: password }.to_json, { 'Content-Type' => CONTENT_TYPE_JSON })
+        response = Faraday.post(access_token_url, { username: username, password: password }.to_json, { 'Content-Type' => CONTENT_TYPE_JSON })
 
         raise "Access Token Error: #{response.status} - #{response.body}" unless response.success?
 
@@ -79,7 +78,7 @@ module Vpago
       end
 
       def post(url, body)
-        response = Faraday.new(request: { open_timeout: Vpago::HttpTimeouts::OPEN_TIMEOUT, timeout: Vpago::HttpTimeouts::TIMEOUT }).post(url, body.to_json, default_headers)
+        response = Faraday.post(url, body.to_json, default_headers)
         parse_json(response.body)
       end
     end

data/lib/vpago/vattanac/transaction_status.rb

@@ -13,22 +13,6 @@ module Vpago
         @response.dig('data', 'status') == 'SUCCESS'
       end
 
-      def error_message
-        @response.dig('msgEntity', 'message') || @response.dig('data', 'message') || 'Unknown error'
-      end
-
-      # msgEntity.code is the API-envelope result code ("0" = call succeeded; check
-      # data.status for the actual transaction state). Any other code is a gateway-level
-      # error with no transaction data (e.g. "03" / "Transaction not found") and is
-      # treated as terminal failure.
-      def failed?
-        @response.dig('msgEntity', 'code').to_s != '0'
-      end
-
-      def pending?
-        !success? && !failed?
-      end
-
       private
 
       def payload
@@ -36,4 +20,4 @@ module Vpago
       end
     end
   end
-end
+end

data/lib/vpago/wing_sdk/base.rb

@@ -33,7 +33,7 @@ module Vpago
       end
 
       def return_url
-        "#{ENV.fetch('PAYMENT_BASE_URL', nil)}/webhook/wings/#{payment_number}/return?app_checkout=#{app_checkout}"
+        "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/webhook/wings/#{payment_number}/return?app_checkout=#{app_checkout}"
       end
 
       def app_checkout

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.3.12
+  version: 2.4.0.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-07 00:00:00.000000000 Z
+date: 2026-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -151,17 +151,11 @@ files:
 - app/assets/javascripts/vpago/vpago_payments/user_informers/firebase.js
 - app/controllers/.gitkeep
 - app/controllers/spree/acleda_redirects_controller.rb
-- app/controllers/spree/admin/payment_acleda_v2_base_controller.rb
-- app/controllers/spree/admin/payment_acleda_v2_checkers_controller.rb
-- app/controllers/spree/admin/payment_acleda_v2_queriers_controller.rb
 - app/controllers/spree/admin/payment_methods_controller_decorator.rb
 - app/controllers/spree/admin/payment_payway_base_controller.rb
 - app/controllers/spree/admin/payment_payway_checkers_controller.rb
 - app/controllers/spree/admin/payment_payway_markers_controller.rb
 - app/controllers/spree/admin/payment_payway_queriers_controller.rb
-- app/controllers/spree/admin/payment_vattanac_base_controller.rb
-- app/controllers/spree/admin/payment_vattanac_checkers_controller.rb
-- app/controllers/spree/admin/payment_vattanac_queriers_controller.rb
 - app/controllers/spree/admin/payment_wing_sdk_base_controller.rb
 - app/controllers/spree/admin/payment_wing_sdk_checkers_controller.rb
 - app/controllers/spree/admin/payment_wing_sdk_markers_controller.rb
@@ -173,6 +167,7 @@ files:
 - app/controllers/spree/admin/payouts_controller.rb
 - app/controllers/spree/admin/suspicious_orders_controller.rb
 - app/controllers/spree/api/v2/storefront/checkout_controller_decorator.rb
+- app/controllers/spree/miniapp/acledas_controller.rb
 - app/controllers/spree/payway_card_popups_controller.rb
 - app/controllers/spree/payway_results_controller.rb
 - app/controllers/spree/payway_v2_card_popups_controller.rb
@@ -198,6 +193,7 @@ files:
 - app/models/.gitkeep
 - app/models/concerns/vpago/payoutable.rb
 - app/models/spree/gateway/acleda.rb
+- app/models/spree/gateway/acleda_mini_app.rb
 - app/models/spree/gateway/acleda_mobile.rb
 - app/models/spree/gateway/acleda_v2.rb
 - app/models/spree/gateway/payway.rb
@@ -262,6 +258,7 @@ files:
 - app/serializers/spree/v2/storefront/payment_serializer_decorator.rb
 - app/serializers/spree/v2/storefront/vpago_payment_source_serializer.rb
 - app/services/.gitkeep
+- app/services/vpago/acleda_mini_app/session/create.rb
 - app/services/vpago/aes_encrypter.rb
 - app/services/vpago/payment_finder.rb
 - app/services/vpago/payment_processable.rb
@@ -289,6 +286,7 @@ files:
 - app/views/spree/admin/payments/source_forms/_payment_payway.html.erb
 - app/views/spree/admin/payments/source_forms/_payway_v2.html.erb
 - app/views/spree/admin/payments/source_views/_acleda.html.erb
+- app/views/spree/admin/payments/source_views/_acleda_mini_app.html.erb
 - app/views/spree/admin/payments/source_views/_acleda_mobile.html.erb
 - app/views/spree/admin/payments/source_views/_acleda_v2.html.erb
 - app/views/spree/admin/payments/source_views/_payment_payway.html.erb
@@ -346,6 +344,7 @@ files:
 - app/views/spree/payway_v2_card_popups/show.html.erb
 - app/views/spree/vpago_payments/_transaction_checker.html.erb
 - app/views/spree/vpago_payments/checkout.html.erb
+- app/views/spree/vpago_payments/forms/spree/gateway/_acleda_mini_app.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_acleda_v2.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_payway_v2.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_true_money.html.erb
@@ -397,6 +396,7 @@ files:
 - lib/vpago/acleda/deeplink_checkout.rb
 - lib/vpago/acleda/payment_request_updater.rb
 - lib/vpago/acleda/transaction_status.rb
+- lib/vpago/acleda_mini_app/checkout.rb
 - lib/vpago/acleda_mobile/base.rb
 - lib/vpago/acleda_mobile/callback_validator.php
 - lib/vpago/acleda_mobile/callback_validator.rb
@@ -406,9 +406,7 @@ files:
 - lib/vpago/acleda_mobile/transaction_status.rb
 - lib/vpago/acleda_v2/base.rb
 - lib/vpago/acleda_v2/checkout.rb
-- lib/vpago/acleda_v2/payment_request_updater.rb
 - lib/vpago/acleda_v2/transaction_status.rb
-- lib/vpago/http_timeouts.rb
 - lib/vpago/payment_amount_calculator.rb
 - lib/vpago/payment_request_updater.rb
 - lib/vpago/payment_status_marker.rb
@@ -432,7 +430,6 @@ files:
 - lib/vpago/true_money/transaction_status.rb
 - lib/vpago/vattanac/base.rb
 - lib/vpago/vattanac/checkout.rb
-- lib/vpago/vattanac/payment_request_updater.rb
 - lib/vpago/vattanac/transaction_status.rb
 - lib/vpago/vattanac_mini_app/base.rb
 - lib/vpago/vattanac_mini_app/checkout.rb
@@ -465,9 +462,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements:
 - none
 rubygems_version: 3.4.1

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

@@ -1,21 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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

@@ -1,21 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,38 +0,0 @@
-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/lib/vpago/acleda_v2/payment_request_updater.rb

@@ -1,54 +0,0 @@
-module Vpago
-  module AcledaV2
-    class PaymentRequestUpdater < ::Vpago::PaymentRequestUpdater
-      def call
-        return if @payment.order.paid?
-
-        if items_eligible?
-          process_payment_status
-        else
-          mark_items_as_ineligible
-        end
-      end
-
-      private
-
-      def process_payment_status
-        checker = @payment.payment_method.check_transaction(@payment)
-
-        if checker.success?
-          mark_payment_as_success
-        elsif checker.failed? && !ignore_on_failed?
-          mark_payment_as_failed(checker.error_message)
-        end
-      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
-        VpagoLogger.error(
-          label: 'Vpago::AcledaV2::PaymentRequestUpdater#process_payment_status gateway_timeout',
-          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
-        )
-      end
-
-      def items_eligible?
-        @payment&.order&.line_items&.all?(&:sufficient_stock?) == true # rubocop:disable Style/SafeNavigationChainLength
-      end
-
-      def mark_items_as_ineligible
-        @error_message = 'Items are not eligible due to insufficient stock'
-        marker_options = @options.merge(status: false, description: @error_message)
-        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
-      end
-
-      def mark_payment_as_success
-        @error_message = nil
-        marker_options = @options.merge(status: true, description: nil)
-        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
-      end
-
-      def mark_payment_as_failed(error_message)
-        @error_message = error_message
-        marker_options = @options.merge(status: false, description: @error_message)
-        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
-      end
-    end
-  end
-end

data/lib/vpago/http_timeouts.rb

@@ -1,6 +0,0 @@
-module Vpago
-  module HttpTimeouts
-    OPEN_TIMEOUT = 5
-    TIMEOUT = 15
-  end
-end

data/lib/vpago/vattanac/payment_request_updater.rb

@@ -1,54 +0,0 @@
-module Vpago
-  module Vattanac
-    class PaymentRequestUpdater < ::Vpago::PaymentRequestUpdater
-      def call
-        return if @payment.order.paid?
-
-        if items_eligible?
-          process_payment_status
-        else
-          mark_items_as_ineligible
-        end
-      end
-
-      private
-
-      def process_payment_status
-        checker = @payment.payment_method.check_transaction(@payment)
-
-        if checker.success?
-          mark_payment_as_success
-        elsif checker.failed? && !ignore_on_failed?
-          mark_payment_as_failed(checker.error_message)
-        end
-      rescue Faraday::TimeoutError, Faraday::ConnectionFailed => e
-        VpagoLogger.error(
-          label: 'Vpago::Vattanac::PaymentRequestUpdater#process_payment_status gateway_timeout',
-          data: { payment_number: @payment.number, error_class: e.class.name, error_message: e.message }
-        )
-      end
-
-      def items_eligible?
-        @payment&.order&.line_items&.all?(&:sufficient_stock?) == true # rubocop:disable Style/SafeNavigationChainLength
-      end
-
-      def mark_items_as_ineligible
-        @error_message = 'Items are not eligible due to insufficient stock'
-        marker_options = @options.merge(status: false, description: @error_message)
-        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
-      end
-
-      def mark_payment_as_success
-        @error_message = nil
-        marker_options = @options.merge(status: true, description: nil)
-        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
-      end
-
-      def mark_payment_as_failed(error_message)
-        @error_message = error_message
-        marker_options = @options.merge(status: false, description: @error_message)
-        ::Vpago::PaymentStatusMarker.new(@payment, marker_options).call
-      end
-    end
-  end
-end