spree_vpago 2.0.8.pre.beta → 2.0.8.pre.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a199976c2692ad4d201ea9890163e430f6ac62eaa65104585718ca081c303fa4
-  data.tar.gz: 076e9460e262219196e66ee01e280274d8920bba2d484989e5caf5eee86a9eeb
+  metadata.gz: d006f101539dd059e92dd575c6a40c036a753638e0f095c4680fb8fec2e3fc27
+  data.tar.gz: 5b7137318a4d5be9fea18f55951414bfc973d39cef0d67b8459aacefcee78c01
 SHA512:
-  metadata.gz: 67e72026f867e78955f05fe93aed5dfa86d1ef51a919d8af699c372db0067f6a40ad11cbe39d96f6354f33f49117084ecf17f09fc5a23b3f7dfa116635eff961
-  data.tar.gz: 877c24547ea819b7b10fe4c2410b30f6776e859b72b382e11c712854247b02cfa44bbcb39f7c1807d8bd6e2cbda344549e1c151ed7f18a43b95a34bdc92be1a1
+  metadata.gz: 40a1984b36bf03669c53488af115deac0ca3b694fe5c039864b0589abf94be54bdd47154d19b47e5a834af13e2ec581dd55e90d54f6021e6543d6c1e0980c3bd
+  data.tar.gz: d0fa00d9485ac9493cbe82d49e1c7a4f5f671f000ea7dd385e17b08dc7304cacb061ff9c3bc3d106bc5bbb76883e2afd8ab7029f702fb1da64ab6fee97251ce4

data/Gemfile.lock

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

data/app/controllers/spree/vpago_payments_controller.rb

@@ -33,6 +33,12 @@ 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/models/spree/gateway/true_money.rb

@@ -10,6 +10,7 @@ module Spree
     preference :private_key, :text
     preference :merchant_scheme, :string
     preference :merchant_android_package_name, :string
+    preference :redirection_type, :string
 
     def method_type
       'true_money'

data/app/models/vpago/payment_decorator.rb

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

data/app/services/vpago/payment_url_constructor.rb

@@ -17,7 +17,19 @@ module Vpago
     def processing_app_url = "#{@payment.payment_method.preferred_merchant_scheme}/vpago_payments/processing?#{query}"
 
     def query
-      { payment_number: payment.number, order_number: order.number, order_jwt_token: order_jwt_token }.to_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}"
     end
 
     private

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

@@ -1,10 +1,10 @@
 <% @checkout = ::Vpago::TrueMoney::Checkout.new(@payment) %>
-<% webview_url = @checkout.generate_payment_urls[:deeplink] rescue nil %>
+<% webview_url = @checkout.generate_payment_urls[:webview] rescue nil %>
 
 <% if webview_url.present? %>
   <script>
     document.addEventListener("DOMContentLoaded", function () {
-      window.location.href = "<%= j webview_url %>";
+      window.top.location.href = "<%= j webview_url %>";
     });
   </script>
 <% else %>

data/lib/spree_vpago/version.rb

@@ -1,7 +1,7 @@
 module SpreeVpago
   module_function
 
-  VERSION = '2.0.8-beta'.freeze
+  VERSION = '2.0.8-beta2'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/true_money/base.rb

@@ -69,6 +69,10 @@ 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
@@ -126,6 +130,10 @@ 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

@@ -2,19 +2,26 @@ 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 = {
-            payment_info: payload.to_json,
-            redirectionType: 'mobileapp',
-            merchantDeepLink: @payment.processing_app_url,
-            merchantAndroidPackageName: merchant_android_package_name
-          }.to_json
+          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['status']['code'] == '000001'
+        raise "Generate Payment Error: #{response.status} - #{body['message'] || response.body}" unless response.success? && body.dig('status', 'code') == '000001'
 
         {
           webview: body['data']['webview'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.0.8.pre.beta
+  version: 2.0.8.pre.beta2
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-07-15 00:00:00.000000000 Z
+date: 2025-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday