spree_vpago 2.3.12 → 2.3.13.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7c6fc347bce48aed54a98bf47d4432f79ec1144a882f7c6cf14b55ad1f87663
-  data.tar.gz: c62d76d1e6661bc0460b3a4be75feeb6d4c6c8a3b1278d1b62dccb53324b6e1a
+  metadata.gz: 1a704b3b4c6172fcfac73d2b395be971f8706c137260c6d122e530160260f276
+  data.tar.gz: fc86b46f2cde8a9de6426b413196cc707b32dc141c78d756d17ae9de654893f3
 SHA512:
-  metadata.gz: 2973459504b60f1f6308e6f0db319c1b2e25f19747d2f94aeb3bf48f69b75e87c508f57c197a49440920464952df30e1cb3b6797ba9a782ff375ec1a7c0b0893
-  data.tar.gz: e8418cf6a8298850075104813a93da543ab148327d7ee6cafdd63be2c1ce5eb64fe457888d695af4931a1b459ee3e60282553e22875a7b530d3099d002c60b8b
+  metadata.gz: 229e3073db012f2f0a1ab6a9b47ea893eaf751b0d3937211490743d81a41800024e2263dd07269fdfdc3549449288bf13263df0737bf6a4dcda2a4a768acae53
+  data.tar.gz: a8ea4e06485c9bd95d6f6616379c6c8dee5e8b6090dddb1a30446ec16ea0697984db1480a027ad7150b68e801bf295c50e13998fcc8232eddeb2fe9e32605920

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.3.12)
+    spree_vpago (2.3.13.pre.pre1)
       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

data/app/assets/config/spree_vpago_manifest.js

@@ -1,4 +1,5 @@
 //= 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/assets/javascripts/vpago/vpago_payments/create_transaction.js

@@ -0,0 +1,35 @@
+/**
+ * Calls our own server, which creates the bank transaction on the browser's
+ * behalf and returns the bank's response as JSON.
+ *
+ * @param {Object} options
+ * @param {string} options.url
+ * @param {Function} options.onSuccess
+ * @param {Function} options.onError
+ */
+async function createTransaction({ url, onSuccess, onError }) {
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        "X-CSRF-Token": document
+          .querySelector('meta[name="csrf-token"]')
+          .getAttribute("content"),
+      },
+    });
+    const data = await response.json();
+
+    if (!response.ok || data.error) {
+      console.error("[Vpago] createTransaction failed:", JSON.stringify(data));
+      onError(data);
+      return;
+    }
+
+    onSuccess(data);
+  } catch (error) {
+    console.error("[Vpago] createTransaction request failed:", error);
+    onError(error);
+  }
+}
+
+window.createTransaction = createTransaction;

data/app/controllers/spree/vpago_payments_controller.rb

@@ -69,6 +69,27 @@ module Spree
       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
     def process_payment
       return render json: { status: :ok }, status: :ok if request.method != 'POST'

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

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

@@ -24,6 +24,7 @@ module Vpago
                     :success_url,
                     :success_deeplink_url,
                     :check_transaction_url,
+                    :create_transaction_url,
                     :process_payment_url,
                     to: :url_constructor
 

data/app/models/vpago/payment_method_decorator.rb

@@ -43,6 +43,12 @@ 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 = {})

data/app/services/vpago/payment_url_constructor.rb

@@ -18,6 +18,7 @@ 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,6 +11,7 @@
   <%= 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/vpago_payments/forms/spree/gateway/_payway_v2.html.erb

@@ -43,55 +43,48 @@
   }
 
   function submitFormViaJs(){
-    var formData = new FormData(document.getElementById("aba_merchant_request"));
-    var checkoutUrl = document.getElementById("aba_merchant_request").action;
-
-    fetch(checkoutUrl, {
-      method: "POST",
-      body: formData
-    })
-    .then(function(response) {
-      return response.json();
-    })
-    .then(function(data) {
-      console.log("[Vpago] checkout response data:", JSON.stringify(data));
-
-      // When status code is 4 (duplicated transaction),
-      // Possibly user refresh the checkout page even after the transaction is completed.
-      // So in this case, we should hide loading spinner and show redirect container UI
-      // While it check transaction status in the background. It will automatically redirect user to the result page after checking.
-      if (data.status.code === 4){
-        showRedirectContainer();
-        return;
-      }
+    window.createTransaction({
+      url: "<%= raw @payment.create_transaction_url %>&platform=<%= params[:platform] %>",
+      onSuccess: function(data) {
+        console.log("[Vpago] checkout response data:", JSON.stringify(data));
+
+        // When status code is 4 (duplicated transaction),
+        // Possibly user refresh the checkout page even after the transaction is completed.
+        // So in this case, we should hide loading spinner and show redirect container UI
+        // While it check transaction status in the background. It will automatically redirect user to the result page after checking.
+        if (data.status.code === 4){
+          showRedirectContainer();
+          return;
+        }
 
-      let deeplinkTriggered = false;
+        let deeplinkTriggered = false;
 
-      if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
-        window.location.href = data.abapay_deeplink;
-        deeplinkTriggered = true;
-      }
+        if (data.abapay_deeplink && shouldOpenAbaPayDeeplink) {
+          window.location.href = data.abapay_deeplink;
+          deeplinkTriggered = true;
+        }
 
-      if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
-        // If a deeplink is triggered, add a short delay before navigating to the checkout URL.
-        // Without this delay, some platforms (especially Android) may ignore or cancel the deeplink
-        // because a second navigation happens too quickly.
-        if (deeplinkTriggered){
-          setTimeout(() => {
+        if (data.checkout_qr_url && shouldOpenCheckoutUrl) {
+          // If a deeplink is triggered, add a short delay before navigating to the checkout URL.
+          // Without this delay, some platforms (especially Android) may ignore or cancel the deeplink
+          // because a second navigation happens too quickly.
+          if (deeplinkTriggered){
+            setTimeout(() => {
+              window.location.href = data.checkout_qr_url;
+            }, 300);
+          } else {
             window.location.href = data.checkout_qr_url;
-          }, 300);
-        } else {
-          window.location.href = data.checkout_qr_url;
+          }
         }
-      }
 
-      var shouldShowRedirectContainer = !shouldOpenCheckoutUrl && shouldOpenAbaPayDeeplink;
-      if(shouldShowRedirectContainer){
-        showRedirectContainer("Open ABA Mobile", () => window.location.href = data.abapay_deeplink);
+        var shouldShowRedirectContainer = !shouldOpenCheckoutUrl && shouldOpenAbaPayDeeplink;
+        if(shouldShowRedirectContainer){
+          showRedirectContainer("Open ABA Mobile", () => window.location.href = data.abapay_deeplink);
+        }
+      },
+      onError: function() {
+        document.getElementById('vpago_loading_container').textContent = "We couldn't start your payment. Please go back and try again.";
       }
-    })
-    .catch(function(error) {
-      console.error("Payment request failed:", error);
     });
   }
 

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

@@ -1,6 +1,3 @@
-<% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
-<% redirect_urls = @checkout.generate_payment_urls(params[:platform]) %>
-
 <script>
   function showRedirectContainer(buttonLabel, onClick) {
     const loadingContainer = document.getElementById('vpago_loading_container');
@@ -16,19 +13,22 @@
 
   document.addEventListener("DOMContentLoaded", () => {
     const platform = "<%= params[:platform] %>";
-    const redirectUrls = <%= redirect_urls.to_json.html_safe %>;
 
-    function setupConfirmPaymentButton() {
-      if (platform === "app") {
-        window.location.href = redirectUrls.deeplink;
-        setTimeout(() => {
-          window.location.href = redirectUrls.webview;
-        }, 1500);
-      } else {
-        window.open(redirectUrls.webview, '_blank');
+    window.createTransaction({
+      url: "<%= raw @payment.create_transaction_url %>&platform=<%= params[:platform] %>",
+      onSuccess: function(redirectUrls) {
+        if (platform === "app") {
+          window.location.href = redirectUrls.deeplink;
+          setTimeout(() => {
+            window.location.href = redirectUrls.webview;
+          }, 1500);
+        } else {
+          window.open(redirectUrls.webview, '_blank');
+        }
+      },
+      onError: function() {
+        document.getElementById('vpago_loading_container').textContent = "We couldn't start your payment. Please go back and try again.";
       }
-    }
-
-    setupConfirmPaymentButton();
+    });
   });
 </script>

data/config/routes.rb

@@ -24,6 +24,7 @@ Spree::Core::Engine.add_routes do
       get :success
 
       match :check_transaction, via: %i[get]
+      match :create_transaction, via: %i[post]
       match :process_payment, via: %i[get post]
       match :true_money_process_payment, via: %i[get post]
     end

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/transaction_creator.rb

@@ -0,0 +1,29 @@
+require 'faraday'
+
+module Vpago
+  module PaywayV2
+    class TransactionCreator < Checkout
+      def call
+        @response = submit_transaction
+      end
+
+      def json_response
+        @json_response ||= JSON.parse(@response.body)
+      rescue JSON::ParserError
+        {}
+      end
+
+      private
+
+      def submit_transaction
+        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
+
+        conn.post(checkout_url, gateway_params)
+      end
+    end
+  end
+end

data/spree_vpago.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'spree_api', spree_version
   s.add_dependency 'spree_backend', spree_version
   s.add_dependency 'spree_core', spree_version
-  s.add_dependency 'spree_extension'
+  s.add_dependency 'spree_extension', '< 1.0'
   s.add_dependency 'spree_multi_vendor', '>= 2.4.1'
 
   s.metadata['rubygems_mfa_required'] = 'true'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.3.12
+  version: 2.3.13.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-09-07 00:00:00.000000000 Z
+date: 2026-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -84,16 +84,16 @@ dependencies:
   name: spree_extension
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: spree_multi_vendor
   requirement: !ruby/object:Gem::Requirement
@@ -147,6 +147,7 @@ files:
 - app/assets/images/vpago/payway/abapay.png
 - app/assets/images/vpago/payway/cards.png
 - app/assets/javascripts/vpago/vpago_payments/check_transaction_periodically.js
+- app/assets/javascripts/vpago/vpago_payments/create_transaction.js
 - app/assets/javascripts/vpago/vpago_payments/request_process_payment.js
 - app/assets/javascripts/vpago/vpago_payments/user_informers/firebase.js
 - app/controllers/.gitkeep
@@ -424,6 +425,7 @@ files:
 - lib/vpago/payway_v2/payouts_params_constructor.rb
 - lib/vpago/payway_v2/pre_auth_canceler.rb
 - lib/vpago/payway_v2/pre_auth_completer.rb
+- lib/vpago/payway_v2/transaction_creator.rb
 - lib/vpago/payway_v2/transaction_status.rb
 - lib/vpago/payway_v2/transaction_status_v2.rb
 - lib/vpago/true_money/base.rb
@@ -465,9 +467,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