spree_vpago 2.0.8.pre.beta2 → 2.0.8.pre.beta3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d006f101539dd059e92dd575c6a40c036a753638e0f095c4680fb8fec2e3fc27
-  data.tar.gz: 5b7137318a4d5be9fea18f55951414bfc973d39cef0d67b8459aacefcee78c01
+  metadata.gz: a60df6ffc7539631a90fd4076f856cb62517d0c589a6f0bb18f9e109e4708dc5
+  data.tar.gz: 572c3179370f5ddc763cfffe3a4cbbce054537b0a26620c7e4e9041e2e5b14bb
 SHA512:
-  metadata.gz: 40a1984b36bf03669c53488af115deac0ca3b694fe5c039864b0589abf94be54bdd47154d19b47e5a834af13e2ec581dd55e90d54f6021e6543d6c1e0980c3bd
-  data.tar.gz: d0fa00d9485ac9493cbe82d49e1c7a4f5f671f000ea7dd385e17b08dc7304cacb061ff9c3bc3d106bc5bbb76883e2afd8ab7029f702fb1da64ab6fee97251ce4
+  metadata.gz: bb331771b411e9b54d85d2810d4849e18574c5155a878922730014a0618393b27392d167c3596471e3322a32b12b111c8eda97718955675c72450d1ffee02a46
+  data.tar.gz: 89f4e3adbb4a08772e0b32a584a412934b6697d9b96a92da2af2904ada71233f481886b50a9c863a98eea5015d41d969376b61e8af499a5be84938d318481b7a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.0.8.pre.beta2)
+    spree_vpago (2.0.8.pre.beta3)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)

data/app/controllers/spree/vpago_payments_controller.rb

@@ -5,7 +5,7 @@ module Spree
 
     skip_before_action :verify_authenticity_token, only: [:process_payment]
 
-    rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
+    rescue_from ActiveRecord::RecordNotFound, with: :render_not_found
     rescue_from CanCan::AccessDenied, with: :access_denied
 
     # GET

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

@@ -8,9 +8,8 @@ module Spree
     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
+    preference :return_url_scheme, :string
+    preference :android_package_name, :string
 
     def method_type
       'true_money'
@@ -56,12 +55,12 @@ module Spree
         success, params[:refund_response] = true_money_refund(payment)
 
         if success
-          ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: successfully canceled.', params)
+          ActiveMerchant::Billing::Response.new(true, 'True money Gateway: successfully canceled.', params)
         else
-          ActiveMerchant::Billing::Response.new(false, 'Payway Gateway: Failed to canceleed', params)
+          ActiveMerchant::Billing::Response.new(false, 'True money Gateway: Failed to canceleed', params)
         end
       else
-        ActiveMerchant::Billing::Response.new(true, 'Payway Gateway: Payment has been voided.')
+        ActiveMerchant::Billing::Response.new(true, 'True money Gateway: Payment has been voided.')
       end
     end
 
@@ -69,12 +68,12 @@ module Spree
       refund_issuer = Vpago::TrueMoney::RefundIssuer.new(payment, {})
       refund_issuer.call
 
-      [refund_issuer.success?, refund_issuer.response]
+      [refund_issuer.success?, refund_issuer.parsed_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
+      # currently True money does not support to cancel the gateway
 
       # in our case don't do anything
       ActiveMerchant::Billing::Response.new(true, '')

data/app/models/vpago/payment_decorator.rb

@@ -5,10 +5,11 @@ module Vpago
       base.after_create -> { Vpago::PayoutsGenerator.new(self).call }, if: :should_generate_payouts?
 
       base.delegate :checkout_url,
+                    :web_checkout_url,
                     :processing_url,
+                    :processing_deeplink_url,
                     :success_url,
                     :process_payment_url,
-                    :processing_app_url,
                     :payment_url,
                     to: :url_constructor
     end
@@ -58,6 +59,10 @@ module Vpago
       pre_auth_status == 'CANCELLED'
     end
 
+    def true_money_payment?
+      payment_method.type_true_money?
+    end
+
     def vattanac_mini_app_payment?
       payment_method.type_vattanac_mini_app?
     end

data/app/serializers/spree/v2/storefront/payment_serializer_decorator.rb

@@ -3,7 +3,7 @@ module Spree
     module Storefront
       module PaymentSerializerDecorator
         def self.prepended(base)
-          base.attributes :pre_auth_status, :checkout_url, :process_payment_url
+          base.attributes :pre_auth_status, :checkout_url, :process_payment_url, :web_checkout_url
         end
       end
     end

data/app/services/vpago/payment_processable.rb

@@ -16,7 +16,7 @@ module Vpago
     # 2. Pre-auth is enabled, ensuring funds can be released to user if processing fails.
     #    PaymentProcessor is usually called after payment is made, so canceling pre-auth typically works.
     def can_cancel_pre_auth?
-      @payment.pending? || @payment.payment_method.enable_pre_auth? || @payment.vattanac_mini_app_payment?
+      @payment.pending? || @payment.payment_method.enable_pre_auth? || @payment.vattanac_mini_app_payment? || @payment.true_money_payment?
     end
 
     def extract_completer_failure_reason_code(error)

data/app/services/vpago/payment_url_constructor.rb

@@ -10,26 +10,24 @@ module Vpago
     end
 
     def checkout_url = "#{base_url}/vpago_payments/checkout?#{query}"
+    def web_checkout_url = "#{base_url}/vpago_payments/checkout?#{query}&platform=web"
     def processing_url = "#{base_url}/vpago_payments/processing?#{query}"
+    def processing_deeplink_url = "#{@payment.payment_method.preferred_return_url_scheme}/vpago_payments/processing?#{query}"
     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 payment_url = "#{base_url}/book/payment?number=#{@payment.order.number}&tk=#{@payment.order.token}"
 
     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
+        order_jwt_token: order_jwt_token,
+        offsite_payment: offsite_payment? ? true : nil
+      }.compact.to_query
     end
 
-    def payment_url
-      "#{base_url}/book/payment?number=#{@payment.order.number}&tk=#{@payment.order.token}"
+    def offsite_payment?
+      payment.payment_method.type_true_money?
     end
 
     private

data/app/services/vpago/rsa_handler.rb

@@ -30,4 +30,4 @@ module Vpago
       Base64.strict_encode64(private_key.sign(sign_hash, payload))
     end
   end
-end
+end

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

@@ -1,12 +1,9 @@
 <% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
-<% webview_url = @checkout.generate_payment_urls[:webview] rescue nil %>
+<% redirect_url = @checkout.generate_payment_urls(params[:platform])%>
 
-<% if webview_url.present? %>
   <script>
     document.addEventListener("DOMContentLoaded", function () {
-      window.top.location.href = "<%= j webview_url %>";
+      window.top.location.href = "<%= j redirect_url %>";
     });
   </script>
-<% else %>
-  <p>Unable to generate the payment URL. Please try again.</p>
-<% 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-beta3'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/true_money/base.rb

@@ -69,10 +69,6 @@ module Vpago
         }
       end
 
-      def redirection_type
-        payment_method.preferred_redirection_type
-      end
-
       def check_transaction_url
         "#{payment_method.preferred_check_transaction_url}/#{external_ref_id}"
       end
@@ -89,8 +85,8 @@ module Vpago
         payment_method.preferred_access_token_url
       end
 
-      def merchant_android_package_name
-        payment_method.preferred_merchant_android_package_name
+      def android_package_name
+        payment_method.preferred_android_package_name
       end
 
       def parse_json(body)
@@ -130,10 +126,6 @@ module Vpago
       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,32 +1,27 @@
 module Vpago
   module TrueMoney
     class Checkout < Base
-      def generate_payment_urls
+      def generate_payment_urls(platform)
+        redirection_type = platform == 'web' ? 'web_redirect' : 'mobileapp'
+
         request_body = {
           payment_info: payload.to_json,
-          redirectionType: redirection_type
+          redirectionType: redirection_type,
+          merchantDeepLink: @payment.processing_deeplink_url,
+          merchantAndroidPackageName: android_package_name,
+          refererLink: @payment.processing_url
         }
 
-        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']
-        }
+        platform == 'web' ? body['data']['webview'] : body['data']['deeplink']
+      rescue Faraday::Error, JSON::ParserError, NoMethodError => e
+        Rails.logger.error("Failed to generate payment URL: #{e.class} - #{e.message}")
+        raise
       end
     end
   end

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.pre.beta3
 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