spree_vpago 2.4.0.pre.pre1 → 2.4.0.pre.pre3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b281c3ae420620dbd3d1da80ed2bc713c9283292484c1812cd1e9c979e6bf52
-  data.tar.gz: 70b7603d37c2c5e8f434e1ab333e622619296fd1ced75642ea9c0512a7591eb1
+  metadata.gz: e361db28503471424737c1633bb7e5fcacccdc7c1a63faddd76ad3e226ceb6f7
+  data.tar.gz: cd5936a07fdfcfb314ac0d068d88b0e6137e6f5cb7e37295aa034368bcea33af
 SHA512:
-  metadata.gz: 718d7eb47ff0a91b7cbcd43d13bd28f4808e008bed9ebee489c913af2d18d5069b5bdc4f06cca8e57693559e96da51a7af8c6e8843e5e01952898c7853c919e1
-  data.tar.gz: dd5f68ec20858da961d36f88a488bd3906d0623baa9f88a3811bbe10957ebd93bf891d047df9b2b8123a549d6881ef8ef32e1c7674144e6dd7901c779e79ae8b
+  metadata.gz: e5691409e7f910c70fd1012358eafc766b45131e4db286106f5a58a8390c0f7bb2ad1fbba892805a6f7ab3b4ec75bb77f8df1e76ccde90f153efadc6e835bed0
+  data.tar.gz: 874db861928b7f5cd71ccd9d17172057de242748f2cc0c11735b03a49951c80151d02cde118ee4ea21961209113529bb1e89562c9e6e8e843f38c4369ef03f71

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.4.0.pre.pre1)
+    spree_vpago (2.4.0.pre.pre3)
       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.21)
+    bcrypt (3.1.22)
     bigdecimal (3.1.8)
     bootstrap (4.6.2.1)
       autoprefixer-rails (>= 9.1.0)
@@ -176,10 +176,11 @@ GEM
       rainbow (>= 2.1.0)
     diff-lcs (1.5.0)
     docile (1.4.0)
-    doorkeeper (5.8.2)
+    doorkeeper (5.9.9)
       railties (>= 5)
     erubi (1.12.0)
-    execjs (2.10.0)
+    execjs (2.10.2)
+      json (>= 2)
     factory_bot (4.11.1)
       activesupport (>= 3.0.0)
     faraday (2.7.4)
@@ -188,7 +189,7 @@ GEM
     faraday-http-cache (2.5.0)
       faraday (>= 0.8)
     faraday-net_http (3.0.2)
-    faraday-retry (2.3.2)
+    faraday-retry (2.4.0)
       faraday (~> 2.0)
     ffaker (2.21.0)
     ffi (1.15.5)
@@ -198,7 +199,7 @@ GEM
     flatpickr (4.6.13.1)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    gapic-common (1.2.0)
+    gapic-common (1.5.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
@@ -207,7 +208,7 @@ GEM
       googleapis-common-protos (~> 1.6)
       googleapis-common-protos-types (~> 1.15)
       googleauth (~> 1.12)
-      grpc (~> 1.66)
+      grpc (>= 1.83, < 2.a)
     gem-release (2.2.2)
     github_changelog_generator (1.16.4)
       activesupport
@@ -221,45 +222,45 @@ GEM
     globalid (1.1.0)
       activesupport (>= 5.0)
     glyphicons (1.0.2)
-    google-cloud-core (1.8.0)
+    google-cloud-core (1.9.0)
       google-cloud-env (>= 1.0, < 3.a)
       google-cloud-errors (~> 1.0)
-    google-cloud-env (2.3.1)
+    google-cloud-env (2.4.0)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
-    google-cloud-errors (1.5.0)
-    google-cloud-firestore (3.1.1)
+    google-cloud-errors (1.7.0)
+    google-cloud-firestore (3.2.0)
       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.3.0)
-      gapic-common (~> 1.2)
+    google-cloud-firestore-v1 (2.4.0)
+      gapic-common (~> 1.3)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)
-    google-cloud-location (1.2.1)
-      gapic-common (~> 1.2)
+    google-cloud-location (1.5.1)
+      gapic-common (~> 1.3)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.33.4)
+    google-protobuf (4.33.6)
       bigdecimal
       rake (>= 13)
-    googleapis-common-protos (1.9.0)
+    googleapis-common-protos (1.10.0)
       google-protobuf (~> 4.26)
       googleapis-common-protos-types (~> 1.21)
       grpc (~> 1.41)
-    googleapis-common-protos-types (1.22.0)
+    googleapis-common-protos-types (1.23.0)
       google-protobuf (~> 4.26)
-    googleauth (1.16.1)
+    googleauth (1.17.4)
       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.76.0)
+    grpc (1.84.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)
@@ -369,6 +370,7 @@ 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)
@@ -412,13 +414,13 @@ GEM
       activerecord (>= 6.0.4)
       activesupport (>= 6.0.4)
       i18n
-    rbtree (0.4.6)
+    rbtree (0.4.7)
     redis (5.0.6)
       redis-client (>= 0.9.0)
     redis-client (0.14.1)
       connection_pool
     regexp_parser (2.11.3)
-    responders (3.2.0)
+    responders (3.2.1)
       actionpack (>= 7.0)
       railties (>= 7.0)
     rexml (3.2.9)
@@ -492,11 +494,10 @@ GEM
       websocket (~> 1.0)
     shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
-    signet (0.21.0)
+    signet (0.22.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)

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_payway_queriers_controller.rb

@@ -16,6 +16,13 @@ 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/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

@@ -24,6 +24,12 @@ 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
 
@@ -60,6 +66,12 @@ 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
@@ -146,9 +158,9 @@ module Spree
       raise ActiveRecord::RecordNotFound unless @payment.present?
     end
 
-    # 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.
+    # 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.
     def allow_iframe_embedding
       response.headers.delete('X-Frame-Options')
     end

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -13,6 +13,12 @@ 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/payment_method/cash_on.rb

@@ -11,5 +11,12 @@ 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('DEFAULT_URL_HOST')
+      ENV.fetch('PAYMENT_BASE_URL')
     end
   end
 end

data/app/models/vpago/payment_decorator.rb

@@ -109,10 +109,6 @@ 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,7 +6,6 @@ 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
@@ -25,7 +24,6 @@ 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,
@@ -82,6 +80,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
 
@@ -97,10 +99,6 @@ 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
@@ -113,6 +111,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/serializers/spree/v2/storefront/payment_method_serializer_decorator.rb

@@ -14,6 +14,12 @@ 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/payment_redirect_handler.rb

@@ -50,7 +50,7 @@ module Vpago
 
     def process_acleda_gateway
       data = {
-        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/acleda_redirects?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', 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('DEFAULT_URL_HOST', nil)}/payway_v2_card_popups?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', 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('DEFAULT_URL_HOST', nil)
+        request.headers['Referer'] = ENV.fetch('PAYMENT_BASE_URL', nil)
       end
     end
 
@@ -127,7 +127,7 @@ module Vpago
     def process_payway_card
       ## TO DO: generate redirect url
       data = {
-        href: "#{ENV.fetch('DEFAULT_URL_HOST', nil)}/payway_card_popups?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', 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('DEFAULT_URL_HOST', nil)}/wing_redirects?payment_number=#{@payment.number}"
+        href: "#{ENV.fetch('PAYMENT_BASE_URL', 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('DEFAULT_URL_HOST', nil)
+        request.headers['Referer'] = ENV.fetch('PAYMENT_BASE_URL', 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: '',
-    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/_success_script.html.erb

@@ -0,0 +1,7 @@
+<script>
+  // processing redirects here without rendering once the order is complete, so its
+  // Firebase listener never posts this. success only renders for completed orders.
+  if (window.parent !== window) {
+    window.parent.postMessage("order_is_completed", "*");
+  }
+</script>

data/app/views/spree/vpago_payments/success.html.erb

@@ -1,3 +1,5 @@
 <h1>
   Success
 </h1>
+
+<%= render_success_script %>

data/config/locales/en.yml

@@ -35,5 +35,6 @@ 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,5 +31,6 @@ 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,13 +17,6 @@ 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
@@ -80,6 +73,12 @@ 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,7 +23,6 @@ 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.4.0-pre1'.freeze
+  VERSION = '2.4.0-pre3'.freeze
 
   def version
     Gem::Version.new VERSION