spree_vpago 2.1.1 → 2.1.3.pre.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a01d3dcdc6c3ced08df846438e83619a55e7ae1ef61a2062b8d92cb5563fc09
-  data.tar.gz: 9c3c06510f3dcfc46c8dda76e951675931e91d96b473b3372849610aa38e8de2
+  metadata.gz: 050cbc236c6ee73efa288a53ccb9ed0d997d5056a364c329cc1d6fdf943c2588
+  data.tar.gz: '09dac79729125ce876a4865bc17b9dc58fc37f4153bcf803014f5ed17afc06b3'
 SHA512:
-  metadata.gz: 1244b21a9ba3d2eb6dd345e7d5cc7ce318a867d8744a7c8bb40789f77d2be7b85a9c8b4339eec6aa5c732ba5ab31fd756dbe4fd97518b3ab39fd23df1b749a96
-  data.tar.gz: d6b2cc2a7eeb0a9eeb39f1b4d5c6d0d5f9ae09e7c3f2372498a3d2f411f0205076243dbc0d1813a4b2b4c2b15133b2e7cb4cf7645222053df4572070f776e4d2
+  metadata.gz: b1b906c102871367972b3deff873c39bc5bdc0c2e6748c2324f00e0e0b7db946699b9e2984b8364050c4ff6f929d3dd36473605ee06904141213cb9957b10517
+  data.tar.gz: 8b9392064584a88fbb22f0554680c90ba2b3943764e08b8123548d20112946b356e23b7b5fbca533d983e64865c37dcab38af7f03e7b280485c78453f1d99b2e

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.1.1)
+    spree_vpago (2.1.3.pre.beta)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -198,12 +198,12 @@ GEM
     flatpickr (4.6.13.1)
     friendly_id (5.5.0)
       activerecord (>= 4.0.0)
-    gapic-common (1.0.1)
+    gapic-common (1.2.0)
       faraday (>= 1.9, < 3.a)
       faraday-retry (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      google-protobuf (>= 3.25, < 5.a)
+      google-protobuf (~> 4.26)
       googleapis-common-protos (~> 1.6)
       googleapis-common-protos-types (~> 1.15)
       googleauth (~> 1.12)
@@ -234,32 +234,32 @@ GEM
       google-cloud-core (~> 1.7)
       google-cloud-firestore-v1 (~> 2.0)
       rbtree (~> 0.4.2)
-    google-cloud-firestore-v1 (2.1.1)
-      gapic-common (~> 1.0)
+    google-cloud-firestore-v1 (2.2.0)
+      gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)
-    google-cloud-location (1.1.0)
-      gapic-common (~> 1.0)
+    google-cloud-location (1.2.0)
+      gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.31.1)
+    google-protobuf (4.33.0-arm64-darwin)
       bigdecimal
       rake (>= 13)
-    googleapis-common-protos (1.8.0)
-      google-protobuf (>= 3.18, < 5.a)
-      googleapis-common-protos-types (~> 1.20)
+    googleapis-common-protos (1.9.0)
+      google-protobuf (~> 4.26)
+      googleapis-common-protos-types (~> 1.21)
       grpc (~> 1.41)
-    googleapis-common-protos-types (1.20.0)
-      google-protobuf (>= 3.18, < 5.a)
-    googleauth (1.14.0)
+    googleapis-common-protos-types (1.22.0)
+      google-protobuf (~> 4.26)
+    googleauth (1.15.1)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 3.0)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.74.1-arm64-darwin)
+    grpc (1.76.0-arm64-darwin)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)
@@ -479,10 +479,10 @@ GEM
       websocket (~> 1.0)
     shoulda-matchers (6.2.0)
       activesupport (>= 5.2.0)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     simplecov (0.22.0)
       docile (~> 1.1)

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/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/line_item_decorator.rb

@@ -52,17 +52,18 @@ module Vpago
     end
 
     def latest_private_metadata
-      private_metadata ||= {}
-
-      private_metadata[:subtotal] = subtotal.to_f
-      private_metadata[:commission_rate] = commission_rate.to_f
-      private_metadata[:commission_amount] = commission_amount.to_f
-      private_metadata[:vendor_pre_tax_amount] = vendor_pre_tax_amount.to_f
-      private_metadata[:pre_commission_amount] = pre_commission_amount.to_f
-      private_metadata[:vendor_tax_total] = vendor_tax_total.to_f
-      private_metadata[:vendor_adjustments_total_excluding_tax] = vendor_adjustments_total_excluding_tax.to_f
-
-      private_metadata
+      # Preserve existing metadata and merge with new financial data
+      updated_private_metadata = (private_metadata || {}).dup
+
+      updated_private_metadata[:subtotal] = subtotal.to_f
+      updated_private_metadata[:commission_rate] = commission_rate.to_f
+      updated_private_metadata[:commission_amount] = commission_amount.to_f
+      updated_private_metadata[:vendor_pre_tax_amount] = vendor_pre_tax_amount.to_f
+      updated_private_metadata[:pre_commission_amount] = pre_commission_amount.to_f
+      updated_private_metadata[:vendor_tax_total] = vendor_tax_total.to_f
+      updated_private_metadata[:vendor_adjustments_total_excluding_tax] = vendor_adjustments_total_excluding_tax.to_f
+
+      updated_private_metadata
     end
 
     # generate metadata for financial reports.

data/app/models/vpago/payment_decorator.rb

@@ -61,9 +61,17 @@ 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
+
+    def check_payment?
+      payment_method.type_check?
+    end
   end
 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
         ]
@@ -97,6 +99,15 @@ module Vpago
     def type_true_money?
       type == Spree::PaymentMethod::TYPE_TRUE_MONEY
     end
+
+    def type_check?
+      type == 'Spree::PaymentMethod::Check'
+    end
+
+    # @return [String] the image asset path, e.g. "payment_logos/payway-abapay-khqr.png"
+    def payment_icon_path
+      "payment_logos/#{preferred_icon_name.tr('_', ' ').parameterize}.png"
+    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/payments/find_or_create.rb

@@ -39,9 +39,10 @@ module Vpago
           }.compact
 
           payment.source = payment_method.payment_source_class.new(source_attributes)
-          payment.save!
         end
 
+        payment.save!
+
         return failure(payment) if payment.errors.any?
 
         success(order: order)

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,31 @@
+<%
+  checkout = Vpago::Vattanac::Checkout.new(@payment)
+  result = checkout.create
+  payment_url = params[:platform] == 'app' ? result[:mobile_url] : result[:web_url]
+  open_type = @payment.payment_method.preferred_open_type
+%>
+
+<script>
+  const openType = "<%= open_type %>";
+  const mobileUrl = "<%= raw(result[:mobile_url]) %>";
+  const webUrl = "<%= raw(result[:web_url]) %>";
+
+  if (openType === "both") {
+    if (mobileUrl) {
+      window.location.href = mobileUrl;
+      setTimeout(() => {
+        window.location.href = webUrl;
+      }, 1500);
+    } else {
+      alert("Mobile payment URL not available.");
+    }
+  } else {
+    const paymentUrl = "<%= raw(payment_url) %>";
+    if (paymentUrl) {
+      window.location.href = paymentUrl;
+    } else {
+      alert("Failed to create payment link.");
+    }
+  }
+</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.1'.freeze
+  VERSION = '2.1.3-beta'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/vattanac/base.rb

@@ -0,0 +1,90 @@
+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
+
+      def get(url, params)
+        response = Faraday.get(url, params, default_headers)
+        parse_json(response.body)['data'] || {}
+      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.1
+  version: 2.1.3.pre.beta
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-08-11 00:00:00.000000000 Z
+date: 2025-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -132,6 +132,18 @@ files:
 - app/.gitkeep
 - app/assets/config/spree_vpago_manifest.js
 - app/assets/images/backend-process.svg
+- app/assets/images/payment_logos/acleda-cards.png
+- app/assets/images/payment_logos/acleda-khqr.png
+- app/assets/images/payment_logos/acleda.png
+- app/assets/images/payment_logos/cheque.png
+- app/assets/images/payment_logos/payway-abapay-khqr.png
+- app/assets/images/payment_logos/payway-abapay.png
+- app/assets/images/payment_logos/payway-alipay.png
+- app/assets/images/payment_logos/payway-cards.png
+- app/assets/images/payment_logos/payway-wechat.png
+- app/assets/images/payment_logos/true-money.png
+- app/assets/images/payment_logos/vattanac-mini-app.png
+- app/assets/images/payment_logos/wingpay.png
 - app/assets/images/vpago/payway/abapay.png
 - app/assets/images/vpago/payway/cards.png
 - app/assets/javascripts/vpago/vpago_payments/payment_processing_listener.js
@@ -181,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
@@ -265,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
@@ -313,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
@@ -386,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
@@ -416,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