spree_vpago 2.1.3.pre.beta → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 050cbc236c6ee73efa288a53ccb9ed0d997d5056a364c329cc1d6fdf943c2588
-  data.tar.gz: '09dac79729125ce876a4865bc17b9dc58fc37f4153bcf803014f5ed17afc06b3'
+  metadata.gz: fc59b39533f02adc34b7b7edc24d3bbe009dbe3b00b061926524fe02a186c68a
+  data.tar.gz: 47cb85dd273e6fcc594950d407f10727098ccdc6341e153d0d1704af8682f465
 SHA512:
-  metadata.gz: b1b906c102871367972b3deff873c39bc5bdc0c2e6748c2324f00e0e0b7db946699b9e2984b8364050c4ff6f929d3dd36473605ee06904141213cb9957b10517
-  data.tar.gz: 8b9392064584a88fbb22f0554680c90ba2b3943764e08b8123548d20112946b356e23b7b5fbca533d983e64865c37dcab38af7f03e7b280485c78453f1d99b2e
+  metadata.gz: c93a137f4412f7fd4812695da770bca17c323492f3d88c2acbafbaaac638093b9b2c044bd71ccf4e0d28b56274407ef7b311939f4ebc18b68ecf04aa047fe18f
+  data.tar.gz: d1e84acedcfdfc08d05b5e106a89cd7c807bd8c997d6038b4b0210b3b3396e24ac274efff24d82494c60dcbc0508a437adb59b27a00c2ccaabbbb0596b280188

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    spree_vpago (2.1.3.pre.beta)
+    spree_vpago (2.1.3)
       faraday
       google-cloud-firestore
       spree_api (>= 4.5)
@@ -228,21 +228,21 @@ GEM
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
     google-cloud-errors (1.5.0)
-    google-cloud-firestore (3.1.0)
+    google-cloud-firestore (3.1.1)
       bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       google-cloud-core (~> 1.7)
       google-cloud-firestore-v1 (~> 2.0)
       rbtree (~> 0.4.2)
-    google-cloud-firestore-v1 (2.2.0)
+    google-cloud-firestore-v1 (2.2.1)
       gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
       google-cloud-location (~> 1.0)
-    google-cloud-location (1.2.0)
+    google-cloud-location (1.2.1)
       gapic-common (~> 1.2)
       google-cloud-errors (~> 1.0)
     google-logging-utils (0.2.0)
-    google-protobuf (4.33.0-arm64-darwin)
+    google-protobuf (4.33.0)
       bigdecimal
       rake (>= 13)
     googleapis-common-protos (1.9.0)
@@ -259,7 +259,7 @@ GEM
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
-    grpc (1.76.0-arm64-darwin)
+    grpc (1.76.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     hashdiff (1.1.0)
@@ -276,7 +276,7 @@ GEM
     inline_svg (1.10.0)
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
-    jquery-rails (4.6.0)
+    jquery-rails (4.6.1)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -409,9 +409,9 @@ GEM
     redis-client (0.14.1)
       connection_pool
     regexp_parser (2.8.0)
-    responders (3.1.1)
-      actionpack (>= 5.2)
-      railties (>= 5.2)
+    responders (3.2.0)
+      actionpack (>= 7.0)
+      railties (>= 7.0)
     rexml (3.2.5)
     rspec-activemodel-mocks (1.1.0)
       activemodel (>= 3.0)

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

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

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

@@ -4,6 +4,7 @@ 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/vpago/payment_decorator.rb

@@ -61,10 +61,6 @@ 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,9 +5,8 @@ module Vpago
     TYPE_WINGSDK = 'Spree::Gateway::WingSdk'.freeze
     TYPE_ACLEDA = 'Spree::Gateway::Acleda'.freeze
     TYPE_ACLEDA_MOBILE = 'Spree::Gateway::AcledaMobile'.freeze
-    TYPE_TRUE_MONEY = 'Spree::Gateway::TrueMoney'.freeze
-    TYPE_VATTANAC = 'Spree::Gateway::Vattanac'.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'
@@ -20,7 +19,6 @@ 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,6 +7,7 @@ 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}")
@@ -14,15 +15,16 @@ 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
@@ -34,5 +36,8 @@ module Vpago
     def vattanac_mini_app_payload?
       params_hash[:data].present?
     end
+
   end
 end
+
+

data/lib/spree_vpago/engine.rb

@@ -22,7 +22,6 @@ 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-beta'.freeze
+  VERSION = '2.1.3'.freeze
 
   def version
     Gem::Version.new VERSION

data/lib/vpago/payway_v2/base.rb

@@ -105,9 +105,15 @@ 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
-        return @options[:override_return_deeplink_url] if @options[:override_return_deeplink_url].present?
-
-        continue_success_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
       end
 
       def return_deeplink

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_vpago
 version: !ruby/object:Gem::Version
-  version: 2.1.3.pre.beta
+  version: 2.1.3
 platform: ruby
 authors:
 - You
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-10-31 00:00:00.000000000 Z
+date: 2025-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -193,7 +193,6 @@ 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
@@ -278,7 +277,6 @@ 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
@@ -327,7 +325,6 @@ 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
@@ -401,9 +398,6 @@ 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
@@ -434,9 +428,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/vattanac.rb

@@ -1,70 +0,0 @@
-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/views/spree/admin/payments/source_views/_vattanac.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/_vattanac.html.erb

@@ -1,31 +0,0 @@
-<%
-  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/vpago/vattanac/base.rb

@@ -1,90 +0,0 @@
-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

@@ -1,27 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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