spree_vpago 2.0.8.pre.beta2 → 2.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d006f101539dd059e92dd575c6a40c036a753638e0f095c4680fb8fec2e3fc27
-  data.tar.gz: 5b7137318a4d5be9fea18f55951414bfc973d39cef0d67b8459aacefcee78c01
+  metadata.gz: 5d952b332b1f3cebefb707805b281c0ae90755496444576599e89bf6fbd3ec8d
+  data.tar.gz: e02298610af4eb99263b22b9b0a0893444ad96d36bf6b97d79407f18098737bd
 SHA512:
-  metadata.gz: 40a1984b36bf03669c53488af115deac0ca3b694fe5c039864b0589abf94be54bdd47154d19b47e5a834af13e2ec581dd55e90d54f6021e6543d6c1e0980c3bd
-  data.tar.gz: d0fa00d9485ac9493cbe82d49e1c7a4f5f671f000ea7dd385e17b08dc7304cacb061ff9c3bc3d106bc5bbb76883e2afd8ab7029f702fb1da64ab6fee97251ce4
+  metadata.gz: 6d15586610e25f52a3311a9c7e181569c876b0a01a35908b5a53d35b70d69ba86f0bafccb4b1f2387ad79a3e97a55182a718b62cd266c884f49b88c3f379727c
+  data.tar.gz: e57f32d3047acd6bb245fcc727ba751493ac88360cbeb747cdab45d5559e2a9b5d54770237039a619a7e46c833c8753988591ad1cd5a861667b777754c72bda8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.0.8.pre.beta2)
+    spree_vpago (2.0.8)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -198,7 +198,7 @@ GEM
     flatpickr (4.6.13.1)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    gapic-common (1.0.0)
+    gapic-common (1.0.1)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
@@ -234,7 +234,7 @@ GEM
       google-cloud-core (~> 1.7)
       google-cloud-firestore-v1 (~> 2.0)
       rbtree (~> 0.4.2)
-    google-cloud-firestore-v1 (2.1.0)
+    google-cloud-firestore-v1 (2.1.1)
       gapic-common (~> 1.0)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)
@@ -242,7 +242,7 @@ GEM
       gapic-common (~> 1.0)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.31.1-arm64-darwin)
+    google-protobuf (4.31.1)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.8.0)
@@ -259,7 +259,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.73.0-arm64-darwin)
+    grpc (1.73.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

@@ -33,12 +33,6 @@ module Spree
 
       @order = @payment.order
       raise CanCan::AccessDenied unless @order.completed?
-
-      if params[:offsite_payment].present?
-        redirect_to @payment.payment_url, allow_other_host: true
-      else
-        render :success
-      end
     end
 
     # POST

data/app/helpers/vpago/admin/base_helper_decorator.rb

@@ -19,7 +19,6 @@ module Vpago
           payway_cards
           wingpay
           vattanac_mini_app
-          true_money
         ]
       end
 

data/app/models/vpago/payment_decorator.rb

@@ -8,8 +8,6 @@ module Vpago
                     :processing_url,
                     :success_url,
                     :process_payment_url,
-                    :processing_app_url,
-                    :payment_url,
                     to: :url_constructor
     end
 
@@ -61,6 +59,7 @@ module Vpago
     def vattanac_mini_app_payment?
       payment_method.type_vattanac_mini_app?
     end
+    
   end
 end
 

data/app/models/vpago/payment_method_decorator.rb

@@ -6,7 +6,6 @@ module Vpago
     TYPE_ACLEDA = 'Spree::Gateway::Acleda'.freeze
     TYPE_ACLEDA_MOBILE = 'Spree::Gateway::AcledaMobile'.freeze
     TYPE_VATTANAC_MINI_APP = 'Spree::Gateway::VattanacMiniApp'.freeze
-    TYPE_TRUE_MONEY = 'Spree::Gateway::TrueMoney'.freeze
 
     def self.prepended(base)
       base.preference :icon_name, :string, default: 'cheque'
@@ -19,8 +18,7 @@ module Vpago
           Spree::PaymentMethod::TYPE_WINGSDK,
           Spree::PaymentMethod::TYPE_ACLEDA,
           Spree::PaymentMethod::TYPE_ACLEDA_MOBILE,
-          Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP,
-          Spree::PaymentMethod::TYPE_TRUE_MONEY
+          Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP
         ]
       end
     end
@@ -93,10 +91,6 @@ module Vpago
     def type_vattanac_mini_app?
       type == Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP
     end
-
-    def type_true_money?
-      type == Spree::PaymentMethod::TYPE_TRUE_MONEY
-    end
   end
 end
 

data/app/models/vpago/payouts_generator.rb

@@ -30,7 +30,15 @@ module Vpago
       return [] if payouts.all?(&:default?)
       return [] unless payouts.all? { |payout| validated?(payout) }
 
-      ActiveRecord::Base.transaction { payouts.each(&:save!) }
+      ActiveRecord::Base.transaction do
+        payouts.each(&:save!)
+
+        # If any payouts were rounded, the total may increase slightly.
+        # Update the payment amount to match the sum of payouts to avoid mismatch errors.
+        payment.update(amount: payouts.map(&:amount).sum)
+
+        payouts
+      end
     end
 
     def validated?(payout)
@@ -47,7 +55,7 @@ module Vpago
         total_confirmed_payouts = line_item.confirmed_payouts_for_vendor.sum(:amount)
         next if total_confirmed_payouts >= line_item.pre_commission_amount
 
-        amount_owed_to_vendor = line_item.pre_commission_amount - total_confirmed_payouts
+        amount_owed_to_vendor = round_up(line_item.pre_commission_amount - total_confirmed_payouts)
         payout_amount = [amount_owed_to_vendor, remaining_amount].min
         outstanding_amount = [amount_owed_to_vendor - payout_amount, 0].max
 
@@ -80,7 +88,7 @@ module Vpago
         total_confirmed_payouts = shipment.confirmed_payouts_for_vendor.sum(:amount)
         next if total_confirmed_payouts >= shipment.cost_with_vendor_adjustment_total
 
-        amount_owed_to_shipping_vendor = shipment.cost_with_vendor_adjustment_total - total_confirmed_payouts
+        amount_owed_to_shipping_vendor = round_up(shipment.cost_with_vendor_adjustment_total - total_confirmed_payouts)
         payout_amount = [amount_owed_to_shipping_vendor, remaining_amount].min
         outstanding_amount = [amount_owed_to_shipping_vendor - payout_amount, 0].max
 
@@ -117,9 +125,33 @@ module Vpago
           state: :created,
           payment: payment,
           payout_profile: Spree::PayoutProfiles::PaywayV2.default,
-          amount: self.remaining_amount
+          amount: round_up(self.remaining_amount)
         )
       ]
     end
+
+    # ABA does not support amounts with more than 2 decimal places.
+    # Therefore, we must round all 3-decimal payouts to 2 decimals beforehand.
+    #
+    # Our rounding strategy:
+    # - We round up for vendors & shipment payouts (to favor external parties).
+    # - The remaining amount is adjusted in the platform's share (may be slightly less).
+    #
+    # Example:
+    # Total amount: $5.00
+    #
+    # Vendor payouts:
+    # - Vendor 1: $0.625 → $0.63
+    # - Vendor 2: $0.625 → $0.63
+    #
+    # Shipment payouts:
+    # - Shipment 1: $0.625 → $0.63
+    # - Shipment 2: $0.625 → $0.63
+    #
+    # Platform payout:
+    # - $2.50 → $2.48 (adjusted to ensure total remains $5.00)
+    def round_up(amount)
+      (amount * 100).ceil / 100.0
+    end
   end
 end

data/app/services/vpago/payment_finder.rb

@@ -7,7 +7,6 @@ module Vpago
     end
 
     def find_and_verify
-
       find_and_verify!
     rescue StandardError, ActiveRecord::RecordNotFound => e
       Rails.logger.error("PaymentJwtVerifier#find_and_verify error: #{e.class} - #{e.message}")
@@ -15,16 +14,15 @@ module Vpago
     end
 
     def find_and_verify!
-
       if vattanac_mini_app_payload?
-        payload =  Vpago::VattanacMiniAppDataHandler.new.decrypt_data(@params_hash[:data])
+        payload = Vpago::VattanacMiniAppDataHandler.new.decrypt_data(@params_hash[:data])
         payment = Spree::Payment.find_by!(number: payload['paymentId'])
         payment.update(transaction_response: payload)
         payment
-      else 
+      else
         order = Spree::Order.find_by!(number: params_hash[:order_number])
         verify_jwt!(order)
-  
+
         Spree::Payment.find_by!(number: params_hash[:payment_number])
       end
     end
@@ -36,8 +34,5 @@ module Vpago
     def vattanac_mini_app_payload?
       params_hash[:data].present?
     end
-
   end
 end
-
-

data/app/services/vpago/payment_url_constructor.rb

@@ -14,22 +14,8 @@ module Vpago
     def success_url = "#{base_url}/vpago_payments/success?#{query}"
     def process_payment_url = "#{base_url}/vpago_payments/process_payment?#{query}"
 
-    def processing_app_url = "#{@payment.payment_method.preferred_merchant_scheme}/vpago_payments/processing?#{query}"
-
     def query
-      params = {
-        payment_number: payment.number,
-        order_number: order.number,
-        order_jwt_token: order_jwt_token
-      }
-
-      params[:offsite_payment] = true if payment.payment_method.type_true_money?
-
-      params.to_query
-    end
-
-    def payment_url
-      "#{base_url}/book/payment?number=#{@payment.order.number}&tk=#{@payment.order.token}"
+      { payment_number: payment.number, order_number: order.number, order_jwt_token: order_jwt_token }.to_query
     end
 
     private

data/app/services/vpago/rsa_handler.rb

@@ -23,11 +23,5 @@ module Vpago
       signature_bytes = Base64.decode64(signature)
       public_key_object.verify(OpenSSL::Digest.new('SHA256'), signature_bytes, data)
     end
-
-    def generate_signature(payload)
-      sign_hash = OpenSSL::Digest.new('SHA256')
-      private_key = OpenSSL::PKey::RSA.new(@private_key)
-      Base64.strict_encode64(private_key.sign(sign_hash, payload))
-    end
   end
-end
+end

data/lib/spree_vpago/engine.rb

@@ -22,8 +22,7 @@ module SpreeVpago
         Spree::Gateway::WingSdk,
         Spree::Gateway::Acleda,
         Spree::Gateway::AcledaMobile,
-        Spree::Gateway::VattanacMiniApp,
-        Spree::Gateway::TrueMoney
+        Spree::Gateway::VattanacMiniApp
       )
     end
 

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.0.8-beta2'.freeze
+  VERSION = '2.0.8'.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.0.8.pre.beta2
+  version: 2.0.8
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-17 00:00:00.000000000 Z
+date: 2025-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -179,7 +179,6 @@ files:
 - app/models/spree/gateway/acleda_mobile.rb
 - app/models/spree/gateway/payway.rb
 - app/models/spree/gateway/payway_v2.rb
-- app/models/spree/gateway/true_money.rb
 - app/models/spree/gateway/vattanac_mini_app.rb
 - app/models/spree/gateway/wing_sdk.rb
 - app/models/spree/payout.rb
@@ -263,7 +262,6 @@ files:
 - app/views/spree/admin/payments/source_views/_acleda_mobile.html.erb
 - app/views/spree/admin/payments/source_views/_payment_payway.html.erb
 - app/views/spree/admin/payments/source_views/_payway_v2.html.erb
-- app/views/spree/admin/payments/source_views/_true_money.html.erb
 - app/views/spree/admin/payments/source_views/_vattanac_mini_app.html.erb
 - app/views/spree/admin/payments/source_views/_vpago_payment_tmpl.html.erb
 - app/views/spree/admin/payments/source_views/_wingsdk.html.erb
@@ -311,7 +309,6 @@ files:
 - app/views/spree/payway_v2_card_popups/show.html.erb
 - app/views/spree/vpago_payments/checkout.html.erb
 - app/views/spree/vpago_payments/forms/spree/gateway/_payway_v2.html.erb
-- app/views/spree/vpago_payments/forms/spree/gateway/_true_money.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/success.html.erb
@@ -381,10 +378,6 @@ files:
 - lib/vpago/payway_v2/pre_auth_canceler.rb
 - lib/vpago/payway_v2/pre_auth_completer.rb
 - lib/vpago/payway_v2/transaction_status.rb
-- lib/vpago/true_money/base.rb
-- lib/vpago/true_money/checkout.rb
-- lib/vpago/true_money/refund_issuer.rb
-- lib/vpago/true_money/transaction_status.rb
 - lib/vpago/vattanac_mini_app/base.rb
 - lib/vpago/vattanac_mini_app/checkout.rb
 - lib/vpago/vattanac_mini_app/refund_issuer.rb
@@ -415,9 +408,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: 1.3.1
+      version: '0'
 requirements:
 - none
 rubygems_version: 3.4.1

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

@@ -1,91 +0,0 @@
-module Spree
-  class Gateway::TrueMoney < PaymentMethod
-    preference :check_transaction_url, :string
-    preference :refund_url, :string
-    preference :generate_payment_url, :string
-    preference :access_token_url, :string
-
-    preference :client_id, :string
-    preference :client_secret, :string
-    preference :private_key, :text
-    preference :merchant_scheme, :string
-    preference :merchant_android_package_name, :string
-    preference :redirection_type, :string
-
-    def method_type
-      'true_money'
-    end
-
-    def payment_source_class
-      Spree::VpagoPaymentSource
-    end
-
-    # force to purchase instead of authorize
-    def auto_capture?
-      true
-    end
-
-    # override
-    # purchase is used when pre auth disabled
-    def purchase(_amount, _source, gateway_options = {})
-      _, payment_number = gateway_options[:order_id].split('-')
-      payment = Spree::Payment.find_by(number: payment_number)
-
-      checker = check_transaction(payment)
-      payment.update(transaction_response: checker.json_response)
-
-      success = checker.success?
-      params = {}
-
-      params[:payment_response] = payment.transaction_response
-
-      if success
-        ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Purchased', params)
-      else
-        ActiveMerchant::Billing::Response.new(false, 'Payway Gateway: Purchasing Failed', params)
-      end
-    end
-
-    # override
-    def void(_response_code, gateway_options)
-      _, payment_number = gateway_options[:order_id].split('-')
-      payment = Spree::Payment.find_by(number: payment_number)
-
-      if payment.true_money_payment?
-        params = {}
-        success, params[:refund_response] = true_money_refund(payment)
-
-        if success
-          ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: successfully canceled.', params)
-        else
-          ActiveMerchant::Billing::Response.new(false, 'Payway Gateway: Failed to canceleed', params)
-        end
-      else
-        ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Payment has been voided.')
-      end
-    end
-
-    def true_money_refund(payment)
-      refund_issuer = Vpago::TrueMoney::RefundIssuer.new(payment, {})
-      refund_issuer.call
-
-      [refund_issuer.success?, refund_issuer.response]
-    end
-
-    def cancel(_response_code, _payment)
-      # we can use this to send request to payment gateway api to cancel the payment ( void )
-      # currently Payway does not support to cancel the gateway
-
-      # in our case don't do anything
-      ActiveMerchant::Billing::Response.new(true, '')
-    end
-
-    private
-
-    def check_transaction(payment)
-      checker = Vpago::TrueMoney::TransactionStatus.new(payment)
-      checker.call
-      checker
-    end
-  end
-end

data/app/views/spree/admin/payments/source_views/_true_money.html.erb

@@ -1,6 +0,0 @@
-<%= 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/vpago_payments/forms/spree/gateway/_true_money.html.erb

@@ -1,12 +0,0 @@
-<% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
-<% webview_url = @checkout.generate_payment_urls[:webview] rescue nil %>
-
-<% if webview_url.present? %>
-  <script>
-    document.addEventListener("DOMContentLoaded", function () {
-      window.top.location.href = "<%= j webview_url %>";
-    });
-  </script>
-<% else %>
-  <p>Unable to generate the payment URL. Please try again.</p>
-<% end %>

data/lib/vpago/true_money/base.rb

@@ -1,139 +0,0 @@
-module Vpago
-  module TrueMoney
-    class Base
-      TOKEN_HEADERS     = { 'Content-Type' => 'application/x-www-form-urlencoded' }.freeze
-      CONTENT_TYPE_JSON = 'application/json'.freeze
-      DEFAULT_ALGORITHM = 'rsa-sha256'.freeze
-      DEFAULT_KEY_VERSION = 1
-
-      def initialize(payment, options = {})
-        @payment = payment
-        @options = options
-      end
-
-      def client_id
-        payment_method.preferred_client_id
-      end
-
-      def client_secret
-        payment_method.preferred_client_secret
-      end
-
-      def private_key
-        payment_method.preferred_private_key
-      end
-
-      def external_ref_id
-        @payment.number
-      end
-
-      def service_type = '01'
-      def currency     = 'USD'
-      def user_type    = 'CUSTOMER'
-
-      def amount
-        @payment.amount
-      end
-
-      def timestamp
-        @timestamp ||= Time.now.to_i
-      end
-
-      def access_token
-        @access_token ||= fetch_access_token
-      end
-
-      def payload
-        {
-          service_type: service_type,
-          external_ref_id: external_ref_id,
-          amount: amount,
-          currency: currency,
-          user_type: user_type
-        }
-      end
-
-      def signature
-        Vpago::RsaHandler
-          .new(private_key: private_key)
-          .generate_signature(signature_input)
-      end
-
-      def default_headers
-        {
-          'Client-Id' => client_id,
-          'Authorization' => "Bearer #{access_token}",
-          'Signature' => "algorithm=#{algorithm};keyVersion=#{key_version};signature=#{signature}",
-          'Timestamp' => timestamp.to_s,
-          'Content-Type' => CONTENT_TYPE_JSON
-        }
-      end
-
-      def redirection_type
-        payment_method.preferred_redirection_type
-      end
-
-      def check_transaction_url
-        "#{payment_method.preferred_check_transaction_url}/#{external_ref_id}"
-      end
-
-      def refund_url
-        payment_method.preferred_refund_url
-      end
-
-      def generate_payment_url
-        payment_method.preferred_generate_payment_url
-      end
-
-      def access_token_url
-        payment_method.preferred_access_token_url
-      end
-
-      def merchant_android_package_name
-        payment_method.preferred_merchant_android_package_name
-      end
-
-      def parse_json(body)
-        JSON.parse(body)
-      rescue JSON::ParserError
-        {}
-      end
-
-      def payment_method
-        @payment.payment_method
-      end
-
-      def fetch_access_token
-        response = Faraday.post(
-          access_token_url,
-          URI.encode_www_form(
-            grant_type: 'client_credentials',
-            client_id: client_id,
-            client_secret: client_secret
-          ),
-          TOKEN_HEADERS
-        )
-
-        raise "Access Token Error: #{response.status} - #{response.body}" unless response.success?
-
-        JSON.parse(response.body).fetch('access_token')
-      end
-
-      def algorithm
-        DEFAULT_ALGORITHM
-      end
-
-      def key_version
-        DEFAULT_KEY_VERSION
-      end
-
-      def signature_input
-        "#{timestamp}#{payload.to_json}"
-      end
-
-      def processing_url
-        "#{@payment.processing_url}&offsite_payment=true"
-      end
-    end
-  end
-end

data/lib/vpago/true_money/checkout.rb

@@ -1,33 +0,0 @@
-module Vpago
-  module TrueMoney
-    class Checkout < Base
-      def generate_payment_urls
-        request_body = {
-          payment_info: payload.to_json,
-          redirectionType: redirection_type
-        }
-
-        if redirection_type == 'mobileapp'
-          request_body[:merchantDeepLink] = @payment.processing_app_url
-          request_body[:merchantAndroidPackageName] = merchant_android_package_name
-        else
-          request_body[:refererLink] = @payment.processing_url
-        end
-
-        response = Faraday.post(generate_payment_url) do |req|
-          req.headers = default_headers
-          req.body = request_body.to_json
-        end
-
-        body = parse_json(response.body)
-
-        raise "Generate Payment Error: #{response.status} - #{body['message'] || response.body}" unless response.success? && body.dig('status', 'code') == '000001'
-
-        {
-          webview: body['data']['webview'],
-          deeplink: body['data']['deeplink']
-        }
-      end
-    end
-  end
-end

data/lib/vpago/true_money/refund_issuer.rb

@@ -1,21 +0,0 @@
-module Vpago
-  module TrueMoney
-    class RefundIssuer < Base
-      def call
-        @response = Faraday.post(refund_url, payload.to_json, default_headers)
-      end
-
-      def success?
-        parsed_response.dig('status', 'code') == '000001'
-      end
-
-      def payload
-        { external_ref_id: external_ref_id }
-      end
-
-      def parsed_response
-        @parsed_response ||= parse_json(@response.body)
-      end
-    end
-  end
-end

data/lib/vpago/true_money/transaction_status.rb

@@ -1,25 +0,0 @@
-module Vpago
-  module TrueMoney
-    class TransactionStatus < Base
-      def call
-        @response = Faraday.get(check_transaction_url, nil, default_headers)
-      end
-
-      def success?
-        response_code == '000001'
-      end
-
-      def response_code
-        json_response.dig('status', 'code')
-      end
-
-      def signature_input
-        timestamp.to_s
-      end
-
-      def json_response
-        @json_response ||= parse_json(@response.body)
-      end
-    end
-  end
-end