spree_vpago 2.1.3 → 2.1.4.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fc59b39533f02adc34b7b7edc24d3bbe009dbe3b00b061926524fe02a186c68a
-  data.tar.gz: 47cb85dd273e6fcc594950d407f10727098ccdc6341e153d0d1704af8682f465
+  metadata.gz: d8e5d1ebc75ade2a4d140a91ff3b3502fb8109420692dbae8151e32c3b1d68f0
+  data.tar.gz: 16dc1a6c62f143417432dd9aefd1be3c247ff0279e204da8dda0d73a436c6c65
 SHA512:
-  metadata.gz: c93a137f4412f7fd4812695da770bca17c323492f3d88c2acbafbaaac638093b9b2c044bd71ccf4e0d28b56274407ef7b311939f4ebc18b68ecf04aa047fe18f
-  data.tar.gz: d1e84acedcfdfc08d05b5e106a89cd7c807bd8c997d6038b4b0210b3b3396e24ac274efff24d82494c60dcbc0508a437adb59b27a00c2ccaabbbb0596b280188
+  metadata.gz: 4574565cf96154a08f4bcc8918331715daf9364b455f8d34f1a38327239d278909f0af91a20be819c69fe63f7bbb461ffd2de4ea4bf057ed293acab850f1594a
+  data.tar.gz: aba7990821991e66322ba01fee2d955c3faa76e7564c3bd327b80381aec9827f8557137b1699a968633b5802e443e8249ab2b39041836b83e139df6bc6b9cf0f

data/Gemfile.lock

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

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

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

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

@@ -4,7 +4,6 @@ module Spree
     preference :api_key, :string
     preference :merchant_id, :string
     preference :payment_option, :string # 'abapay', 'cards', 'abapay_deeplink'
-    preference :app_scheme, :text
     preference :transaction_fee_fix, :string
     preference :transaction_fee_percentage, :string
     preference :public_key, :text

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

@@ -0,0 +1,70 @@
+module Spree
+  class Gateway::Vattanac < PaymentMethod
+    preference :generate_payment_url, :string
+    preference :access_token_url, :string
+    preference :check_transaction_url, :string
+
+    preference :username, :string
+    preference :password, :string
+    preference :merchant_id, :string
+    preference :payment_type, :string, default: 'GOLF_TICKET'
+    preference :open_type, :string, default: 'both'
+
+    def method_type
+      'vattanac'
+    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
+
+    def vattanac_refund(payment)
+      refund_issuer = Vpago::Vattanac::RefundIssuer.new(payment, {})
+      refund_issuer.call
+
+      [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 Vattanac 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::Vattanac::TransactionStatus.new(payment)
+      checker.call
+      checker
+    end
+  end
+end

data/app/models/vpago/payment_decorator.rb

@@ -61,6 +61,10 @@ module Vpago
       payment_method.type_true_money?
     end
 
+    def vattanac_payment?
+      payment_method.type_vattanac?
+    end
+
     def vattanac_mini_app_payment?
       payment_method.type_vattanac_mini_app?
     end

data/app/models/vpago/payment_method_decorator.rb

@@ -5,8 +5,9 @@ module Vpago
     TYPE_WINGSDK = 'Spree::Gateway::WingSdk'.freeze
     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
+    TYPE_VATTANAC = 'Spree::Gateway::Vattanac'.freeze
+    TYPE_VATTANAC_MINI_APP = 'Spree::Gateway::VattanacMiniApp'.freeze
 
     def self.prepended(base)
       base.preference :icon_name, :string, default: 'cheque'
@@ -19,6 +20,7 @@ module Vpago
           Spree::PaymentMethod::TYPE_WINGSDK,
           Spree::PaymentMethod::TYPE_ACLEDA,
           Spree::PaymentMethod::TYPE_ACLEDA_MOBILE,
+          Spree::PaymentMethod::TYPE_VATTANAC,
           Spree::PaymentMethod::TYPE_VATTANAC_MINI_APP,
           Spree::PaymentMethod::TYPE_TRUE_MONEY
         ]

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/views/spree/admin/payments/source_views/_vattanac.html.erb

@@ -0,0 +1,6 @@
+<%= 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/_vattanac.html.erb

@@ -0,0 +1,18 @@
+<%
+  checkout = Vpago::Vattanac::Checkout.new(@payment)
+  result = checkout.create
+%>
+
+<script>
+  const platform = "<%= params[:platform] %>";
+  const mobileUrl = "<%= raw(result[:mobile_url]) %>";
+  const webUrl = "<%= raw(result[:web_url]) %>";
+
+  if (platform === "app" && mobileUrl) {
+    window.location.href = mobileUrl;
+  } else if (platform === "web" && webUrl) {
+    window.location.href = webUrl;
+  } else {
+    console.error("Failed to create payment link:", { mobileUrl, webUrl });
+  }
+</script>

data/lib/spree_vpago/engine.rb

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

data/lib/spree_vpago/version.rb

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

data/lib/vpago/payway_v2/base.rb

@@ -105,15 +105,9 @@ module Vpago
       # redirect to continue URL, let it handle redirecting to app.
       # allowed override to specific app eg. from tg://t.me
       def return_deeplink_url
-        app_scheme = @payment.payment_method.preferences[:app_scheme]
-
-        if app_scheme.present?
-          uri = URI.parse(continue_success_url)
-          uri.scheme = app_scheme
-          uri.to_s
-        else
-          continue_success_url
-        end
+        return @options[:override_return_deeplink_url] if @options[:override_return_deeplink_url].present?
+
+        continue_success_url
       end
 
       def return_deeplink

data/lib/vpago/vattanac/base.rb

@@ -0,0 +1,87 @@
+require 'faraday'
+
+module Vpago
+  module Vattanac
+    class Base
+      CONTENT_TYPE_JSON = 'application/json'.freeze
+
+      def initialize(payment)
+        @payment = payment
+      end
+
+      def username
+        payment_method.preferred_username
+      end
+
+      def password
+        payment_method.preferred_password
+      end
+
+      def access_token_url
+        payment_method.preferred_access_token_url
+      end
+
+      def generate_payment_url
+        payment_method.preferred_generate_payment_url
+      end
+
+      def check_transaction_url
+        payment_method.preferred_check_transaction_url
+      end
+
+      def access_token
+        @access_token ||= fetch_access_token
+      end
+
+      def payment_method
+        @payment.payment_method
+      end
+
+      def payment_number
+        @payment.number
+      end
+
+      def payment_type
+        payment_method.preferred_payment_type
+      end
+
+      def merchant_id
+        payment_method.preferred_merchant_id
+      end
+
+      def amount
+        @payment.amount
+      end
+
+      def currency
+        'USD'
+      end
+
+      def default_headers
+        { 'Authorization' => "Bearer #{access_token}", 'Content-Type' => CONTENT_TYPE_JSON }
+      end
+
+      def parse_json(body)
+        JSON.parse(body)
+      rescue JSON::ParserError
+        {}
+      end
+
+      private
+
+      def fetch_access_token
+        response = Faraday.post(access_token_url, { username: username, password: password }.to_json, { 'Content-Type' => CONTENT_TYPE_JSON })
+
+        raise "Access Token Error: #{response.status} - #{response.body}" unless response.success?
+
+        parse_json(response.body).dig('data', 'accessToken') || raise('Missing accessToken in response')
+      end
+
+      def post(url, body)
+        
+        response = Faraday.post(url, body.to_json, default_headers)
+        parse_json(response.body)
+      end
+    end
+  end
+end

data/lib/vpago/vattanac/checkout.rb

@@ -0,0 +1,27 @@
+module Vpago
+  module Vattanac
+    class Checkout < Base
+      def payload
+        {
+          transactionId: payment_number,
+          requestId: "req-#{SecureRandom.hex(8)}",
+          paymentType: payment_type,
+          amount: amount,
+          currency: currency,
+          merchantId: merchant_id,
+          returnUrl: @payment.processing_url
+        }
+      end
+
+      def create
+        response_data = post(generate_payment_url, payload)['data']
+        {
+          web_url: response_data['webPaymentUrl'],
+          mobile_url: response_data['mobileDeepLink'],
+          expires_at: response_data['expiredIn'],
+          generated_at: response_data['generatedAt']
+        }
+      end
+    end
+  end
+end

data/lib/vpago/vattanac/transaction_status.rb

@@ -0,0 +1,23 @@
+module Vpago
+  module Vattanac
+    class TransactionStatus < Base
+      def call
+        @response = post(check_transaction_url, payload)
+      end
+
+      def json_response
+        @response
+      end
+
+      def success?
+        @response.dig('msgEntity', 'code') == '0'
+      end
+
+      private
+
+      def payload
+        { transactionId: payment_number }
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4.pre.beta
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-01 00:00:00.000000000 Z
+date: 2025-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -193,6 +193,7 @@ files:
 - 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.rb
 - app/models/spree/gateway/vattanac_mini_app.rb
 - app/models/spree/gateway/wing_sdk.rb
 - app/models/spree/payout.rb
@@ -277,6 +278,7 @@ files:
 - 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.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
@@ -325,6 +327,7 @@ files:
 - 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.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
@@ -398,6 +401,9 @@ files:
 - lib/vpago/true_money/checkout.rb
 - lib/vpago/true_money/refund_issuer.rb
 - lib/vpago/true_money/transaction_status.rb
+- lib/vpago/vattanac/base.rb
+- lib/vpago/vattanac/checkout.rb
+- lib/vpago/vattanac/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
@@ -428,9 +434,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