spree_vpago 2.2.1 → 2.2.2.pre.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c798525a2a23d0f61689431f2e4c630a6a947ce683339fa416f38d1a457cc403
-  data.tar.gz: 35f0e6cf960e666fcf1a25afe8afc32bf8c91e680dd35e9d5fcf2da3f4e644ef
+  metadata.gz: 34f988ac706caee9ab0414c2af33a8694157e2a61ef2f0e8bbd2078f4f84f6b7
+  data.tar.gz: 695bb8a11c50fba8cca3098509f9001df921cd07347541aa286d5475ca6cc998
 SHA512:
-  metadata.gz: 0152b17d28c14ae4204bfafb6f80799fb1118e2354155de84de3f0f1431e61778c085a3ee378f1f55c5f30def318f5e96570d4c756a7e48e6f07616a98461e35
-  data.tar.gz: 76b6bd5ab261e6497b89288ded4fac0a9fe28e61116a139db5c67da8a960f26ccea6e1f679f199e9c168ec13cb28d45b166a723a628f7a2c0148fa24d129f629
+  metadata.gz: 2d5597af9933d549fb87f3f8523246561e51ddcefad4a972aecb99e81dfbd9a9961710d0013fa3be6bba6c4f848cc191c05413ea3ce6c2200f69cdeb8d8f1c96
+  data.tar.gz: c97478d640a636fed25fa67a6476685fc481dd6b2db5d875b71b6c35a79c5b88aa2f0ff07525d34ae74f2886fb7f47e8fc7bf7c3a90d6d0b67cb843d9cf67926

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.2.1)
+    spree_vpago (2.2.2.pre.pre1)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -242,7 +242,7 @@ GEM
       gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.33.4)
+    google-protobuf (4.33.5)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.9.0)
@@ -259,7 +259,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.76.0)
+    grpc (1.78.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)

data/app/controllers/spree/vpago_payments_controller.rb

@@ -44,15 +44,14 @@ module Spree
       return render_not_found unless @payment.present?
 
       unless @payment.order.paid?
-        enqueued_at = Time.now.to_f
-        log_enqueue_start(@payment, enqueued_at, return_params)
-
-        Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number, enqueued_at: enqueued_at)
+        Vpago::PaymentProcessorJob.perform_later(
+          payment_number: @payment.number
+        )
       end
 
       render json: { status: :ok }, status: :ok
     rescue StandardError => e
-      log_enqueue_error(e)
+      Rails.logger.error("Failed to enqueued payment processor job: #{params} #{e.message}")
       render json: { status: :internal_server_error, message: 'Failed to enqueue payment processor job' }, status: :internal_server_error
     end
 
@@ -63,21 +62,14 @@ module Spree
       @payment = Spree::Payment.find_by(number: params.dig(:data, :external_ref_id))
       return render_not_found unless @payment
 
-      unless @payment.order.paid?
-        enqueued_at = Time.now.to_f
-        log_enqueue_start(@payment, enqueued_at)
-
-        Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number, enqueued_at: enqueued_at)
-      end
+      Vpago::PaymentProcessorJob.perform_later(payment_number: @payment.number) unless @payment.order.paid?
 
       render json: { status: { code: '000001', message: 'success' }, data: nil }, status: :ok
     rescue StandardError => e
-      log_enqueue_error(e)
+      Rails.logger.error("Payment error: #{e.message}")
       render json: { status: :internal_server_error, message: 'Failed to enqueue payment processor job' }, status: :internal_server_error
     end
 
-    private
-
     def sanitize_return_params
       sanitized_params = params.permit!.to_h
 
@@ -100,41 +92,5 @@ module Spree
         format.json { render json: { status: :unauthorized }, status: :unauthorized }
       end
     end
-
-    def log_enqueue_start(payment, enqueued_at, return_params = {})
-      VpagoLogger.log(
-        event: 'vpago.payment_processor_job.enqueue',
-        data: {
-          payment_number: payment.number,
-          order_number: payment.order&.number,
-          request_id: request.request_id,
-          payment_method_type: payment.payment_method&.type,
-          payment_method_name: payment.payment_method&.name,
-          gateway: detect_payway_gateway_version(payment.payment_method),
-          tran_id: (return_params[:tran_id] || return_params['tran_id']),
-          enqueued_at: enqueued_at
-        }
-      )
-    end
-
-    def log_enqueue_error(error)
-      VpagoLogger.error(
-        event: 'vpago.payment_processor_job.enqueue.error',
-        data: {
-          request_id: request.request_id,
-          payment_number: @payment&.number,
-          error_class: error.class.name,
-          error_message: error.message
-        }
-      )
-    end
-
-    def detect_payway_gateway_version(payment_method)
-      return nil unless payment_method
-      return 'payway_v2' if payment_method.type_payway_v2?
-      return 'payway_v1' if payment_method.type_payway?
-
-      nil
-    end
   end
 end

data/app/controllers/spree/webhook/payways_controller.rb

@@ -4,7 +4,7 @@ module Spree
       skip_before_action :verify_authenticity_token, only: %i[return v2_return continue v2_continue]
 
       # match via: [:get, :post]
-      # {"response"=>"{\"tran_id\":\"PE13LXT1\",\"status\":0}"}
+      # {"response"=>"{\"tran_id\":\"PE13LXT1\",\"status\":0"}"}
       def v2_return
         handler_service = v2_request_updater_service
 
@@ -48,7 +48,7 @@ module Spree
         request_updater.call
 
         order = payment.order
-        order.reload
+        order = order.reload
 
         if order.paid? || payment.pending?
           render plain: :success

data/app/jobs/vpago/payment_processor_job.rb

@@ -1,71 +1,11 @@
 # Put :payment_processing at a higher priority in your project: config/sidekiq.yml
-require 'vpago/timing_helper'
-
 module Vpago
   class PaymentProcessorJob < ::ApplicationUniqueJob
     queue_as :payment_processing
 
     def perform(options)
-      started_at = Vpago::TimingHelper.current_time
-      enqueued_at = options[:enqueued_at]
-      queue_wait_ms = calculate_queue_wait_ms(enqueued_at)
-
-      log_job_start(options[:payment_number], queue_wait_ms)
-
       payment = Spree::Payment.find_by!(number: options[:payment_number])
       Vpago::PaymentProcessor.new(payment: payment).call
-
-      log_job_finish(options[:payment_number], queue_wait_ms, started_at)
-    rescue StandardError => e
-      log_job_error(options[:payment_number], queue_wait_ms, started_at, e)
-      raise
-    end
-
-    private
-
-    def calculate_queue_wait_ms(enqueued_at)
-      return nil unless enqueued_at
-
-      ((Time.now.to_f - enqueued_at.to_f) * 1000.0).round(1)
-    end
-
-    def log_job_start(payment_number, queue_wait_ms)
-      VpagoLogger.log(
-        event: 'vpago.payment_processor_job.start',
-        data: {
-          payment_number: payment_number,
-          queue: self.class.queue_name,
-          queue_wait_ms: queue_wait_ms
-        }
-      )
-    end
-
-    def log_job_finish(payment_number, queue_wait_ms, started_at)
-      runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
-      VpagoLogger.log(
-        event: 'vpago.payment_processor_job.finish',
-        data: {
-          payment_number: payment_number,
-          queue: self.class.queue_name,
-          queue_wait_ms: queue_wait_ms,
-          runtime_ms: runtime_ms
-        }
-      )
-    end
-
-    def log_job_error(payment_number, queue_wait_ms, started_at, error)
-      runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
-      VpagoLogger.error(
-        event: 'vpago.payment_processor_job.error',
-        data: {
-          payment_number: payment_number,
-          queue: self.class.queue_name,
-          queue_wait_ms: queue_wait_ms,
-          runtime_ms: runtime_ms,
-          error_class: error.class.name,
-          error_message: error.message
-        }
-      )
     end
   end
 end

data/app/services/vpago/payment_redirect_handler.rb

@@ -66,7 +66,7 @@ module Vpago
     def process_aba_v2_gateway
       payment_option = @payment.payment_method.preferences[:payment_option]
 
-      if %w[abapay abapay_khqr_deeplink].include?(payment_option)
+      if payment_option == 'abapay'
         process_abapay_v2_deeplink
       else
         # construct web url for render web view.

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

@@ -1,13 +1,41 @@
 <% @checkout = ::Vpago::PaywayV2::Checkout.new(@payment) %>
+<% payment_option = @payment.payment_method.preferences[:payment_option] %>
+
+<form method="POST"
+      action="<%= @checkout.checkout_url %>"
+      id="aba_merchant_request"
+      data-payment-option="<%= payment_option %>"
+      style="<%= 'display:none;' if payment_option == 'abapay_khqr_deeplink' %>">
 
-<form method="POST" action="<%= @checkout.checkout_url %>" id="aba_merchant_request">
   <% @checkout.gateway_params.each do |key, value| %>
-    <input type='hidden' name='<%= key %>' value='<%= value %>' />
+    <input type="hidden" name="<%= key %>" value="<%= value %>">
   <% end %>
 </form>
 
 <script>
-  document.addEventListener("DOMContentLoaded", function () {
-    document.getElementById("aba_merchant_request").submit()
-  })
+document.addEventListener("DOMContentLoaded", function () {
+  const form = document.getElementById("aba_merchant_request");
+  const paymentOption = form.dataset.paymentOption;
+
+  // 🔹 CASE 1: ABA KHQR Deeplink → fetch JSON then redirect
+  if (paymentOption === "abapay_khqr_deeplink") {
+    fetch(form.action, {
+      method: "POST",
+      body: new FormData(form)
+    })
+    .then(res => res.json())
+    .then(data => {
+      if (data.checkout_qr_url) {
+        window.location.href = data.checkout_qr_url;
+      } else {
+        console.error("checkout_qr_url missing", data);
+      }
+    })
+    .catch(err => console.error("ABA Deeplink Error:", err));
+
+  // 🔹 CASE 2: Normal ABA KHQR → regular redirect form post
+  } else {
+    form.submit();
+  }
+});
 </script>

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/transaction_status.rb

@@ -1,5 +1,4 @@
 require 'faraday'
-require 'vpago/timing_helper'
 
 module Vpago
   module PaywayV2
@@ -36,8 +35,6 @@ module Vpago
       end
 
       def check_remote_status
-        started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-
         conn = Faraday::Connection.new do |faraday|
           faraday.request :url_encoded
         end
@@ -49,33 +46,7 @@ module Vpago
           hash: checker_hmac
         }
 
-        response = conn.post(check_transaction_url, data)
-
-        runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
-        Rails.logger.info(
-          {
-            event: 'vpago.payway.check_transaction',
-            version: 'v2',
-            payment_number: transaction_id,
-            http_status: response.status,
-            runtime_ms: runtime_ms
-          }
-        )
-
-        response
-      rescue StandardError => e
-        runtime_ms = Vpago::TimingHelper.elapsed_ms(started_at)
-        Rails.logger.error(
-          {
-            event: 'vpago.payway.check_transaction.error',
-            version: 'v2',
-            payment_number: transaction_id,
-            runtime_ms: runtime_ms,
-            error_class: e.class.name,
-            error_message: e.message
-          }
-        )
-        raise
+        conn.post(check_transaction_url, data)
       end
 
       def payout_total

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2.pre.pre1
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-05 00:00:00.000000000 Z
+date: 2026-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -188,7 +188,6 @@ files:
 - app/jobs/vpago/payment_capturer_job.rb
 - app/jobs/vpago/payment_processor_job.rb
 - app/jobs/vpago/payment_voider_job.rb
-- app/lib/vpago/timing_helper.rb
 - app/models/.gitkeep
 - app/models/concerns/vpago/payoutable.rb
 - app/models/spree/gateway/acleda.rb
@@ -419,7 +418,6 @@ files:
 - lib/vpago/wing_sdk/payment_retriever.rb
 - lib/vpago/wing_sdk/transaction_status_checker.rb
 - lib/vpago/wing_sdk/transaction_status_response.rb
-- lib/vpago_logger.rb
 - node_modules/.yarn-integrity
 - package-lock.json
 - package.json
@@ -441,9 +439,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/lib/vpago/timing_helper.rb

@@ -1,28 +0,0 @@
-module Vpago
-  module TimingHelper
-    # Gets the current monotonic timestamp.
-    #
-    # @return [Float] current timestamp from Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    def self.current_time
-      Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    end
-
-    # Measures elapsed time in milliseconds from a given start timestamp.
-    #
-    # @param started_at [Float] timestamp from Process.clock_gettime(Process::CLOCK_MONOTONIC)
-    # @return [Float] elapsed time in milliseconds, rounded to 1 decimal place
-    def self.elapsed_ms(started_at)
-      ((Process.clock_gettime(Process::CLOCK_MONOTONIC) - started_at) * 1000.0).round(1)
-    end
-
-    # Yields to a block and measures its execution time in milliseconds.
-    #
-    # @yield the block to measure
-    # @return [Float] elapsed time in milliseconds, rounded to 1 decimal place
-    def self.measure_ms
-      started_at = Process.clock_gettime(Process::CLOCK_MONOTONIC)
-      yield
-      elapsed_ms(started_at)
-    end
-  end
-end

data/lib/vpago_logger.rb

@@ -1,21 +0,0 @@
-module VpagoLogger
-  def self.log(event:, data: nil)
-    message = { event: event }
-    message.merge!(data) if data
-
-    Rails.logger.info(message.to_json)
-    message
-  rescue StandardError
-    message
-  end
-
-  def self.error(event:, data: nil)
-    message = { event: event }
-    message.merge!(data) if data
-
-    Rails.logger.error(message.to_json)
-    message
-  rescue StandardError
-    message
-  end
-end