killbill-aviate 2.2.0 → 2.3.0.pre.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 34375bae0941a64f0c51dd86b7270c7d4935d18eba0ffd6589c43cb8beb443ca
-  data.tar.gz: f505e30e4994a7ddec6236374199e16932879d2bb46f717774d644886c09af76
+  metadata.gz: 5914b364115e78bab734ddfb0411ad46135f211a60bc3e0459fa7cc4a74ec568
+  data.tar.gz: c50e89a47dbfc2b011a036b83936478d68bf38f86bca9fbe5a337f5b36f0535c
 SHA512:
-  metadata.gz: 76787dd3684a70dbc6b5aad7562c7db36a5754e16e6dfa0123252953cda9efa3f70c69a9d6711eb0a4547bb3b5afd49339d7b3898ec5d9c607161eea98e0587a
-  data.tar.gz: a9de156f85783898b8fc197014e20c0822dc956173d4ffc73381e068e58d0aed895532de7bc851eb8015fa96efa1f6fa16cbc45d50120abfebd0cbcbf3e80248
+  metadata.gz: 16a38cffd4d769435de74fd1d1a8c59708ca6e99fc10798db0cce73365c1ca4295a982208e1d12a123619e404368e3f5c2f560d4a5a5f2d334b1803311836872
+  data.tar.gz: e3fe97aee511a1655ffd4348c386a8300711ebefa5e10aeeba3ce1f9ea06e13273e912161b0b13e1ee152ed53ed188d5286af801b9c03274820bcd96ba0ab1d1

data/app/assets/stylesheets/aviate/aviate.css

@@ -14,3 +14,45 @@
     padding-top: 15px;
     visibility: hidden;
 }
+
+.wallet-tooltip {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    width: 1.5rem;
+    margin: 0 0.25rem 0 0.5rem;
+    flex-shrink: 0;
+    position: relative;
+    cursor: help;
+}
+
+.wallet-tooltip:hover::after,
+.wallet-tooltip:focus::after {
+    position: absolute;
+    bottom: calc(100% + 8px);
+    right: 0;
+    background: #333;
+    color: #fff;
+    padding: 6px 10px;
+    border-radius: 4px;
+    font-size: 12px;
+    line-height: 1.4;
+    width: 280px;
+    white-space: normal;
+    text-align: left;
+    z-index: 1050;
+    box-shadow: 0 2px 8px rgba(0, 0, 0, 0.15);
+    pointer-events: none;
+}
+
+.wallet-tooltip:hover::before,
+.wallet-tooltip:focus::before {
+    content: '';
+    position: absolute;
+    bottom: calc(100% + 3px);
+    right: 0.5rem;
+    border: 5px solid transparent;
+    border-top-color: #333;
+    z-index: 1051;
+    pointer-events: none;
+}

data/app/controllers/aviate/wallets_controller.rb

@@ -12,6 +12,13 @@ module Aviate
       @limit = params[:limit] || 5
     end
 
+    def show
+      wallets = Aviate::WalletApi.retrieve_wallets(params['account_id'], options_for_klient)
+      @wallet = wallets.find { |wallet| wallet['walletId'] == params['id'] }
+      @wallet = Aviate::Wallet.from_api_response(@wallet)
+      @wallet
+    end
+
     def new
       @currency = @account.currency
     end
@@ -34,13 +41,6 @@ module Aviate
       redirect_to account_wallets_path(@account.account_id)
     end
 
-    def show
-      wallets = Aviate::WalletApi.retrieve_wallets(params['account_id'], options_for_klient)
-      @wallet = wallets.find { |wallet| wallet['walletId'] == params['id'] }
-      @wallet = Aviate::Wallet.from_api_response(@wallet)
-      @wallet
-    end
-
     def create
       cached_options_for_klient = options_for_klient
       wallet = {

data/app/services/aviate/wallet.rb

@@ -30,16 +30,27 @@ module Aviate
         balance: response['balance'],
         live_balance: response['liveBalance'],
         credit_type: response['creditType'],
-        amount: response['amount'],
+        amount: parse_numeric(response['amount']),
         exp_date: response['expDate'],
         top_off_type: response['topOff']['topOffType'],
-        low_watermark: response['topOff']['lowWatermark'],
-        top_off_amount: response['topOff']['amount'],
+        low_watermark: parse_numeric(response['topOff']['lowWatermark']),
+        top_off_amount: parse_numeric(response['topOff']['amount']),
         exp_duration_unit: response['topOff']['expDurationUnit'],
         exp_duration_length: response['topOff']['expDurationLength']
       }
     end
 
+    def self.parse_numeric(value)
+      return nil if value.nil?
+
+      string_value = value.to_s
+      return nil if string_value.strip.empty?
+
+      BigDecimal(string_value).to_f
+    rescue ArgumentError
+      nil
+    end
+
     def to_api_params
       {
         currency: @currency,

data/app/services/aviate/wallet_api.rb

@@ -3,17 +3,7 @@
 module Aviate
   module WalletApi
     class << self
-      def retrieve_wallets(account_id, options_for_klient)
-        Killbill::Aviate::AviateClient.retrieve_wallets(account_id, options_for_klient)
-      end
-
-      def create_wallet(account_id, wallet, options_for_klient)
-        Killbill::Aviate::AviateClient.create_wallet(account_id, wallet, options_for_klient)
-      end
-
-      def modify_wallet(wallet_params, options_for_klient)
-        Killbill::Aviate::AviateClient.modify_wallet(wallet_params, options_for_klient)
-      end
+      delegate :retrieve_wallets, :create_wallet, :modify_wallet, to: :'Killbill::Aviate::AviateClient'
     end
   end
 end

data/app/views/aviate/wallets/_form.html.erb

@@ -14,24 +14,27 @@
     <div class="form-group d-flex pb-3">
       <%= label_tag :credit_type, 'Credit Type', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= select_tag :credit_type, 
-            options_for_select(['CREDIT_PAID', 'CREDIT_FREE'], @wallet.try(:[], :credit_type)), 
+        <%= select_tag :credit_type,
+            options_for_select(['CREDIT_PAID', 'CREDIT_FREE'], @wallet.try(:[], :credit_type)),
             :class => 'form-control',
             :disabled => local_assigns[:readonly],
             required: true %>
       </div>
+      <span class="wallet-tooltip" data-tooltip="Identifies the source or purpose of the credit. Use CREDIT_PAID for purchased credits or CREDIT_FREE for promotional credits."><i class="fa fa-info-circle text-muted"></i></span>
     </div>
     <div class="form-group d-flex pb-3">
       <%= label_tag :amount, 'Amount', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
         <%= number_field_tag :amount, @wallet.try(:[], :amount), :class => 'form-control', :step => '0.01', :min => '0', required: true %>
       </div>
+      <span class="wallet-tooltip" tabindex="0" aria-label="The amount of credit to add to the wallet when it is created." data-tooltip="The amount of credit to add to the wallet when it is created."><i class="fa fa-info-circle text-muted"></i></span>
     </div>
     <div class="form-group d-flex pb-3">
       <%= label_tag :exp_date, 'Expiration Date', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= date_field_tag :exp_date, @wallet.try(:[], :exp_date), class: 'form-control', id: 'exp_date_input', required: true %>
+        <%= date_field_tag :exp_date, @wallet.try(:[], :exp_date), class: 'form-control', id: 'exp_date_input' %>
       </div>
+      <span class="wallet-tooltip" data-tooltip="Optional. The date after which the initial credit can no longer be used. Leave blank if the credit should never expire."><i class="fa fa-info-circle text-muted"></i></span>
     </div>
   <% end %>
 
@@ -39,40 +42,45 @@
   <div class="form-group d-flex pb-3">
     <%= label_tag :top_off_type, 'Top Off Type', :class => 'col-sm-3 control-label' %>
     <div class="col-sm-9">
-      <%= select_tag :top_off_type, 
-          options_for_select(['TOP_OFF_FIXED', 'TOP_OFF_TARGET'], @wallet.try(:[], :top_off_type)), 
+      <%= select_tag :top_off_type,
+          options_for_select(['TOP_OFF_FIXED', 'TOP_OFF_TARGET'], @wallet.try(:[], :top_off_type)),
           :class => 'form-control',
           :disabled => local_assigns[:readonly],
           required: true %>
     </div>
+    <span class="wallet-tooltip" data-tooltip="Defines how credits are replenished when the wallet balance falls below the Low Water Mark. Use TOP_OFF_FIXED to add a fixed amount of credit, or TOP_OFF_TARGET to restore the balance to a specified target amount."><i class="fa fa-info-circle text-muted"></i></span>
   </div>
   <div class="form-group d-flex pb-3">
     <%= label_tag :low_watermark, 'Low Water Mark', :class => 'col-sm-3 control-label' %>
     <div class="col-sm-9">
       <%= text_field_tag :low_watermark, @wallet.try(:[], :low_watermark), :class => 'form-control', required: true %>
     </div>
+    <span class="wallet-tooltip" data-tooltip="The minimum wallet balance that triggers an automatic top-up. When the balance drops below this value, additional credit is added automatically."><i class="fa fa-info-circle text-muted"></i></span>
   </div>
   <div class="form-group d-flex pb-3">
     <%= label_tag :top_off_amount, 'Amount', :class => 'col-sm-3 control-label' %>
     <div class="col-sm-9">
       <%= number_field_tag :top_off_amount, @wallet.try(:[], :top_off_amount), :class => 'form-control', :step => '0.01', :min => '0', required: true %>
     </div>
+    <span class="wallet-tooltip" data-tooltip="The amount of credit added during an automatic top-up."><i class="fa fa-info-circle text-muted"></i></span>
   </div>
   <div class="form-group d-flex pb-3">
     <%= label_tag :exp_duration_unit, 'Expiration Duration Unit', :class => 'col-sm-3 control-label pe-3' %>
     <div class="col-sm-9">
-      <%= select_tag :exp_duration_unit, 
-          options_for_select(['DAYS', 'WEEKS', 'MONTHS', 'YEARS'], @wallet.try(:[], :exp_duration_unit)), 
+      <%= select_tag :exp_duration_unit,
+          options_for_select(['DAYS', 'WEEKS', 'MONTHS', 'YEARS'], @wallet.try(:[], :exp_duration_unit)),
           :class => 'form-control',
           :disabled => local_assigns[:readonly],
           required: true %>
     </div>
+    <span class="wallet-tooltip" data-tooltip="The time unit used when calculating the expiration period for credits added through automatic top-ups."><i class="fa fa-info-circle text-muted"></i></span>
   </div>
   <div class="form-group d-flex pb-4">
     <%= label_tag :exp_duration_length, 'Expiration Duration Length', :class => 'col-sm-3 control-label' %>
     <div class="col-sm-9">
       <%= number_field_tag :exp_duration_length, @wallet.try(:[], :exp_duration_length), :class => 'form-control', required: true %>
     </div>
+    <span class="wallet-tooltip" data-tooltip="Duration length for credit expiration from the time of issuance."><i class="fa fa-info-circle text-muted"></i></span>
   </div>
 
   <div class="form-group d-flex justify-content-end pt-3 border-top">

data/config/routes.rb

@@ -4,7 +4,7 @@ Aviate::Engine.routes.draw do
   root to: 'configuration#index', as: 'aviate_root'
 
   scope '/configuration' do
-    match '/session_create' => 'configuration#session_create', :via => :post, :as => 'aviate_session_create'
+    post '/session_create' => 'configuration#session_create', :as => 'aviate_session_create'
     match '/session_destroy' => 'configuration#session_destroy', :via => %i[get delete], :as => 'aviate_session_destroy'
   end
 

data/lib/aviate/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Aviate
-  VERSION = '2.2.0'
+  VERSION = '2.3.0.pre.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: killbill-aviate
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0.pre.2
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-02-11 00:00:00.000000000 Z
+date: 2026-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
@@ -114,9 +114,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.4.10
 signing_key: