spree_vpago 2.2.2.pre.pre21 → 2.2.2.pre.pre22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '05536639cc3731496d0e01bd7ecccb56062d2b412ca795b7a924deac49c9c9a5'
-  data.tar.gz: f2dbe115e30add8edc1188b3c8a8ae855235d88197d45683615cb5dbe4b17445
+  metadata.gz: 2d70bc15b67880e1692ffb0c280621daafd28df520510b0fff216a53b7bb1710
+  data.tar.gz: 19d5a1cbafe2721e7cbbb3b8083e16dd459e700161f9c7e303f18373c47c956d
 SHA512:
-  metadata.gz: 43688b89eab0f758808875722761c47b35d460c2c76501b3ff0218ea25b60d2b7859183cf4733a66704ae0f10b72b4f7bc9a75a6b1e97a1139f893c08b5cf008
-  data.tar.gz: 5642262ac80774489724678f53fb027e09c2257dbed79ae9fa32c3cf9f806baee60315120053f97feb272779d8fda1b3497c4cdf7e0941e1c9c9dbffbd838012
+  metadata.gz: 8780510cf6589ccf04f91e90d4c733e362990a7c7b411a395a204aae35b465718a88b95f212f2187d615e2c44763813024dddf5435d47cb2b5f0fa8bdc809374
+  data.tar.gz: ba85a0bf2a52acac93d1bc278baa09fa69925f328b1110c4003dee2f51a693ad54615bcb5436724ffed34c4027608a3db24e6a257a323019a724cb1e6e9bf051

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.2.pre.pre21)
+    spree_vpago (2.2.2.pre.pre22)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

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

@@ -11,9 +11,9 @@ async function checkTransactionPeriodically({
   checkTransactionUrl,
   onSuccess,
   onFailure,
+  maxDurationMs = 10 * 60 * 1000,
+  pollIntervalMs = 5000,
 }) {
-  var pollIntervalMs = 5000;
-  var maxDurationMs = 10 * 60 * 1000;
   var shouldPoll = true;
   var intervalId;
   var startTime = Date.now();

data/app/controllers/spree/vpago_payments_controller.rb

@@ -39,7 +39,7 @@ module Spree
     def check_transaction
       @payment = Vpago::PaymentFinder.new(params.permit!.to_h).find_and_verify
       raise ActiveRecord::RecordNotFound unless @payment.present?
-      
+
       return render json: { status: :success }, status: :ok if @payment.completed?
       return render json: { status: :failed }, status: :ok if @payment.failed?
 

data/app/helpers/vpago/vpago_payments_helper.rb

@@ -4,6 +4,24 @@ module Vpago
       'firebase'
     end
 
+    # eg. forms/spree/gateway/payway_v2
+    def render_checkout_form
+      render partial: "spree/vpago_payments/forms/#{@payment.payment_method.class.to_s.underscore}"
+    end
+
+    def render_transaction_checker
+      render partial: 'spree/vpago_payments/transaction_checker'
+    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.
+    # 
+    # eg. processing_scripts/spree/gateway/payway_v2
+    def render_additional_processing_script(payment)
+      processing_script_partial_path = "spree/vpago_payments/processing_scripts/#{payment.payment_method.class.to_s.underscore}"
+      render partial: processing_script_partial_path if lookup_context.exists?(processing_script_partial_path, [], true)
+    end
+
     # when return nil, each payment method should use their default URL.
     # eg. PayWayV2 will use the continue_success_url as deeplink back URL.
     def custom_return_deeplink_url

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

@@ -12,6 +12,9 @@ module Spree
     preference :public_key, :text
     preference :abapay_khqr_deeplink_option, :string, default: 'open_both'
 
+    # For reviewing purpose, not used in actual flow
+    preference :reviewing, :boolean, default: false
+
     validates :preferred_public_key, presence: true, if: :enable_pre_auth?
     validates :preferred_abapay_khqr_deeplink_option, inclusion: { in: ABAPAY_KHQR_DEEPLINK_OPTIONS }, if: :abapay_khqr_deeplink?
     validates :preferred_payment_option, inclusion: { in: PAYMENT_OPTIONS }

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

@@ -7,4 +7,4 @@
       onSuccess: () =>  window.location.replace(processingUrl),
     });
   });
-</script>
+</script>

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

@@ -11,5 +11,5 @@
   </button>
 </div>
 
-<%= render partial: "spree/vpago_payments/forms/#{@payment.payment_method.class.to_s.underscore}" %>
-<%= render partial: 'spree/vpago_payments/transaction_checker' %>
+<%= render_checkout_form %>
+<%= render_transaction_checker %>

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

@@ -3,6 +3,8 @@
 <p id="processing"></p>
 <p id="reason_message"></p>
 
+<%= render_additional_processing_script(@payment) %>
+
 <script>
   document.addEventListener("DOMContentLoaded", function() {
     let firebaseConfigs = <%= Rails.application.credentials.firebase_web_config.to_json.html_safe %>;
@@ -14,29 +16,9 @@
       retryDelayMs: 1000,
     })
 
-    // This block in /processing is purely JUST for review/audit purposes (ABA requirement).
-    // It checks the bank transaction status periodically without actually
-    // triggering payment processing again. By the time the user lands
-    // on this page, the transaction is normally complete or failed.
-    //
-    // What it does:
-    // 1. Logs or updates the UI with transaction status for review.
-    // 2. Provides reassurance that the bank transaction was confirmed.
-    // 3. Optionally, could allow a manual retry button if needed.
-    //
-    // What it does NOT do:
-    // - It does NOT call requestProcessPayment again (payment job is
-    //   already unique and idempotent elsewhere).
-    // - It does NOT retry processing unnecessarily.
-    window.checkTransactionPeriodically({
-      checkTransactionUrl: "<%= raw @payment.check_transaction_url %>",
-      onFailure: () => console.log("Bank transaction failed"),
-      onSuccess: () => console.log("Bank transaction confirmed"),
-    })
-
     window.listenToProcessingState({
       firebaseConfigs: firebaseConfigs,
-      documentReferencePath: "<%= payment.user_informer.document_reference_path %>",
+      documentReferencePath: "<%= @payment.user_informer.document_reference_path %>",
       onPaymentIsProcessing: function (orderState, paymentState, processing, reasonCode, reasonMessage) {
         document.getElementById("status").innerText = "Payment is processing";
         document.getElementById("reason_code").innerText = reasonCode;

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

@@ -0,0 +1,27 @@
+<% if @payment.payment_method.preferred_reviewing? %>
+  <script>
+    // This block in /processing is purely JUST for review/audit purposes (ABA requirement).
+    // It checks the bank transaction status periodically without actually
+    // triggering payment processing again. By the time the user lands
+    // on this page, the transaction is normally complete or failed.
+    //
+    // What it does:
+    // 1. Logs or updates the UI with transaction status for review.
+    // 2. Provides reassurance that the bank transaction was confirmed.
+    // 3. Optionally, could allow a manual retry button if needed.
+    //
+    // What it does NOT do:
+    // - It does NOT call requestProcessPayment again (payment job is
+    //   already unique and idempotent elsewhere).
+    // - It does NOT retry processing unnecessarily.
+    document.addEventListener("DOMContentLoaded", function() {
+      window.checkTransactionPeriodically({
+        checkTransactionUrl: "<%= raw @payment.check_transaction_url %>",
+        onFailure: () => console.log("Bank transaction failed"),
+        onSuccess: () => console.log("Bank transaction confirmed"),
+        maxDurationMs: 5 * 60 * 1000, // 5 minutes,
+        pollIntervalMs: 5000, // 5 seconds
+      })
+    });
+  </script>
+<% end %>

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.2.2-pre21'.freeze
+  VERSION = '2.2.2-pre22'.freeze
 
   def version
     Gem::Version.new VERSION

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.2.pre.pre21
+  version: 2.2.2.pre.pre22
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-03-19 00:00:00.000000000 Z
+date: 2026-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -336,6 +336,7 @@ files:
 - app/views/spree/vpago_payments/forms/spree/gateway/_vattanac.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_vattanac_mini_app.html.erb
 - app/views/spree/vpago_payments/processing.html.erb
+- app/views/spree/vpago_payments/processing_scripts/spree/gateway/_payway_v2.html.erb
 - app/views/spree/vpago_payments/success.html.erb
 - app/views/spree/wing_redirects/show.html.erb
 - bin/rails