spree_vpago 2.3.13.pre.pre1 → 2.4.0.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a704b3b4c6172fcfac73d2b395be971f8706c137260c6d122e530160260f276
-  data.tar.gz: fc86b46f2cde8a9de6426b413196cc707b32dc141c78d756d17ae9de654893f3
+  metadata.gz: 2b281c3ae420620dbd3d1da80ed2bc713c9283292484c1812cd1e9c979e6bf52
+  data.tar.gz: 70b7603d37c2c5e8f434e1ab333e622619296fd1ced75642ea9c0512a7591eb1
 SHA512:
-  metadata.gz: 229e3073db012f2f0a1ab6a9b47ea893eaf751b0d3937211490743d81a41800024e2263dd07269fdfdc3549449288bf13263df0737bf6a4dcda2a4a768acae53
-  data.tar.gz: a8ea4e06485c9bd95d6f6616379c6c8dee5e8b6090dddb1a30446ec16ea0697984db1480a027ad7150b68e801bf295c50e13998fcc8232eddeb2fe9e32605920
+  metadata.gz: 718d7eb47ff0a91b7cbcd43d13bd28f4808e008bed9ebee489c913af2d18d5069b5bdc4f06cca8e57693559e96da51a7af8c6e8843e5e01952898c7853c919e1
+  data.tar.gz: dd5f68ec20858da961d36f88a488bd3906d0623baa9f88a3811bbe10957ebd93bf891d047df9b2b8123a549d6881ef8ef32e1c7674144e6dd7901c779e79ae8b

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.13.pre.pre1)
+    spree_vpago (2.4.0.pre.pre1)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
       spree_backend (>= 4.5)
       spree_core (>= 4.5)
-      spree_extension (< 1.0)
+      spree_extension
       spree_multi_vendor (>= 2.4.1)
 
 GEM

data/app/assets/config/spree_vpago_manifest.js

@@ -1,5 +1,4 @@
 //= 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/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,33 +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
-    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

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/gateway/payway_v2.rb

@@ -168,12 +168,6 @@ 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,9 +78,5 @@ 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/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

@@ -24,7 +24,6 @@ module Vpago
                     :success_url,
                     :success_deeplink_url,
                     :check_transaction_url,
-                    :create_transaction_url,
                     :process_payment_url,
                     to: :url_constructor
 
@@ -110,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,
@@ -43,12 +45,6 @@ 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 = {})
@@ -86,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
 
@@ -105,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
@@ -117,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/services/vpago/payment_url_constructor.rb

@@ -18,7 +18,6 @@ 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,7 +11,6 @@
   <%= 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_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 %>