kaui 4.0.20 → 4.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ef67e5aac2cf29cee71a7a52b5b87452afc410ed711d1d55c08225dc39b1d044
-  data.tar.gz: 6232e9397218afea690a6d45422623b16fb346489a380eaaa6fdba3ed6e98930
+  metadata.gz: 19115a4ca850dfd755598a560dc66e96b00694f00b305e057260fd6b13c57e3d
+  data.tar.gz: 9780699cd5e97d8c6887b3e0c200d968a11e644afd5496c58829277d558a28bc
 SHA512:
-  metadata.gz: d2cd48b2725369b2a466e49cabbf656ce64b6bea4cdcb272f97fb7d34c909bdb56a6876c13af14328a1dcdd0d341e9d04757318d9504aeece87d55ad2ba8a6fa
-  data.tar.gz: 8abadbb98b2d800acb54b5dd7fd9bdcf20a8a49186c1b3b9b2357eb3a717ff6a79a45094aebcfaa252a11a8ca562ac5ab2812080c6abb3774ea711b57d98099b
+  metadata.gz: 8bcf2e6e322833277c4d305aca8621bf4495cc6443961af0a565bf7da0d6efdb5892d8b66ac31e820f08953d221ad54b309018fbd3d088032e211ea73d51abd9
+  data.tar.gz: e1a44d558e7b996185be6a79cca68fb2eecb4e200f2affff7e5de3ccf0ca6a38f78d0ffdc814c67f3ab794585e6d7b4c4604dfe06ea77e7b7bc86360e229273e

data/app/assets/javascripts/kaui/multi_functions_bar_utils.js

@@ -29,8 +29,8 @@ function searchParseOperatorText(text) {
 // Function to parse URL parameters
 function getUrlParams() {
   var params = {};
-  var queryString = window.location.search.substring(1);
-  queryString = queryString.replace(/ac_id/g, 'account_id');
+  var advanceSearchQuery = new URLSearchParams(window.location.search).get('advance_search_query');
+  var queryString = advanceSearchQuery !== null ? advanceSearchQuery : window.location.search.substring(1).replace(/ac_id/g, 'account_id');
   var regex = /([^&=]+)=([^&]*)/g;
   var m;
   while (m = regex.exec(queryString)) {
@@ -55,15 +55,17 @@ function populateSearchLabelsFromUrl() {
       if (match) {
         var columnName = match[1].replace(/_/g, ' ').replace(/^\w/, function(l) { return l.toUpperCase(); });
         var filter = searchFormatOperator(match[2].trim());
+        var isHiddenAccountFilter = match[1].trim().toLowerCase() === 'account_id' && window.location.pathname.includes('/accounts/');
         var label = $('<span>', {
-          class: 'label label-info d-inline-flex align-items-center gap-2',
+          class: 'label label-info d-inline-flex align-items-center gap-2' + (isHiddenAccountFilter ? ' d-none' : ''),
           'data-field': columnName.trim(),
           'data-filter': filter.trim(),
-          'data-value': value.trim()
+          'data-value': value.trim(),
+          'data-hidden-filter': isHiddenAccountFilter
         });
 
         if (hasBalanceFilter && columnName.toLowerCase().trim() !== 'balance') {
-          label.attr('class', 'label label-default d-inline-flex align-items-center gap-2');
+          label.attr('class', 'label label-default d-inline-flex align-items-center gap-2' + (isHiddenAccountFilter ? ' d-none' : ''));
         }
 
         var labelText = $('<span>', {
@@ -168,6 +170,10 @@ function showAdvanceSearchModal() {
 
   // Populate the search fields with the current filters
   searchLabelsContainer.find('.label').each(function() {
+    if ($(this).data('hidden-filter')) {
+      return;
+    }
+
     var labelText = $(this).text().trim();
     var parts = labelText.split(' [');
     var columnName = parts[0].trim();
@@ -226,6 +232,10 @@ $(document).on('click', '.filter-close-icon', function() {
     }
   });
   var searchParams = searchQuery();
+  // searchQuery() returns an already percent-encoded field[op]=value fragment; decode it
+  // back to raw text so it can be sent as the (single-encoded) value of the dedicated
+  // advance_search_query param instead of as top-level bracketed keys.
+  var rawSearchParams = searchParams ? decodeURIComponent(searchParams) : searchParams;
   // Reapply search without the removed filter
   var tableSelectors = ['#invoices-table', '#accounts-table', '#payments-table', '#subscriptions-table'];
   var table = null;
@@ -240,15 +250,14 @@ $(document).on('click', '.filter-close-icon', function() {
   
   if (table && table.ajax) {
     table.on('preXhr.dt', function(e, settings, data) {
-      data.search.value = searchParams;
+      data.advance_search_query = rawSearchParams;
     });
     table.ajax.reload(null, false);
   }
   
   // Update URL
-  if (searchParams) {
-    var pushParams = (searchParams || '').replace(/account_id/g, 'ac_id');
-    var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + pushParams;
+  if (rawSearchParams) {
+    var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?advance_search_query=' + encodeURIComponent(rawSearchParams);
     window.history.pushState({ path: newUrl }, '', newUrl);
   } else {
     var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;

data/app/assets/stylesheets/kaui/tenants.css

@@ -641,6 +641,59 @@
   color: #414651;
 }
 
+/* app/views/kaui/admin_tenants/_form_invoice_translation.erb */
+
+.existing-invoice-translations-container {
+  max-width: 80rem;
+  width: 100%;
+}
+
+.existing-invoice-translations-container .existing-invoice-translations-header {
+  display: flex;
+  align-items: start;
+  justify-content: space-between;
+  padding: 0;
+  border-bottom: 0.0625rem solid #E9EAEB;
+}
+
+.existing-invoice-translations-container .existing-invoice-translations-header h2 {
+  font-weight: 600;
+  font-size: 1.125rem;
+  line-height: 1.75rem;
+  color: #414651;
+  margin-bottom: 1.25rem;
+}
+
+.existing-invoice-translations-container table.existing-invoice-translations-table {
+  overflow-x: auto;
+  min-width: 100%;
+  border: none !important;
+}
+
+.existing-invoice-translations-container table.existing-invoice-translations-table tbody tr {
+  border-bottom: 0.0625rem solid #E9EAEB !important;
+}
+
+.existing-invoice-translations-container table.existing-invoice-translations-table th {
+  padding: 0.375rem 0.75rem !important;
+  font-weight: 500 !important;
+  font-size: 0.75rem !important;
+  line-height: 1.125rem;
+  letter-spacing: 0;
+  color: #717680;
+  text-transform: capitalize;
+  background-color: #FAFAFA !important;
+}
+
+.existing-invoice-translations-container table.existing-invoice-translations-table td {
+  font-weight: 500 !important;
+  font-size: 0.875rem !important;
+  line-height: 1.125rem !important;
+  text-align: start;
+  padding: 0.3125rem 0.75rem !important;
+  color: #535862 !important;
+}
+
 /* app/views/kaui/admin_tenants/_show_catalog_simple.erb */
 
 #catalog_simple, #catalog_xml {

data/app/controllers/kaui/accounts_controller.rb

@@ -17,7 +17,7 @@ module Kaui
         return
       end
       @search_fields = Kaui::Account::ADVANCED_SEARCH_COLUMNS.map { |attr| [attr, attr.split('_').join(' ').capitalize] }
-      @dropdown_default = default_columns(Kaui.account_search_columns.call[2], Kaui::Account::SENSIVITE_DATA_FIELDS)
+      @dropdown_default = default_columns(Kaui.account_search_columns.call[2], Kaui::Account::DEFAULT_VISIBLE_COLUMNS)
       @visible_columns = @dropdown_default
 
       @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
@@ -47,7 +47,7 @@ module Kaui
         Kaui.account_search_columns.call(account, view_context)[1]
       end
 
-      paginate searcher, data_extractor, formatter, default_columns(Kaui.account_search_columns.call[2], Kaui::Account::SENSIVITE_DATA_FIELDS)
+      paginate searcher, data_extractor, formatter, default_columns(Kaui.account_search_columns.call[2], Kaui::Account::DEFAULT_VISIBLE_COLUMNS)
     end
 
     def download

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -53,6 +53,12 @@ module Kaui
         @invoice_template = nil
       end
 
+      fetch_invoice_translations = promise do
+        Kaui::AdminTenant.get_invoice_translations(options)
+      rescue StandardError
+        @invoice_translations = {}
+      end
+
       fetch_tenant_plugin_config = promise { Kaui::AdminTenant.get_tenant_plugin_config(options) }
 
       @catalog_versions = []
@@ -76,6 +82,12 @@ module Kaui
         nil
       end
 
+      @invoice_translations = begin
+        wait(fetch_invoice_translations)
+      rescue StandardError
+        {}
+      end
+
       @tenant_plugin_config = begin
         wait(fetch_tenant_plugin_config)
       rescue StandardError

data/app/controllers/kaui/engine_controller_util.rb

@@ -203,8 +203,8 @@ module Kaui
       render json: response, status: response_status
     end
 
-    def default_columns(fields, sensivite_fields)
-      fields.map { |field| { data: fields.index(field), visible: !(sensivite_fields.include? field) } }
+    def default_columns(fields, visible_fields)
+      fields.each_with_index.map { |field, index| { data: index, visible: visible_fields.include?(field) } }
     end
   end
 end

data/app/controllers/kaui/invoices_controller.rb

@@ -10,6 +10,8 @@ module Kaui
       @offset = params[:offset] || 0
       @limit = params[:limit] || 50
       @search_fields = Kaui::Invoice::ADVANCED_SEARCH_COLUMNS.map { |attr| [attr, attr.split('_').join(' ').capitalize] }
+      @dropdown_default = default_columns(Kaui.account_invoices_columns.call[3], Kaui::Invoice::DEFAULT_VISIBLE_COLUMNS)
+      @visible_columns = @dropdown_default
 
       @max_nb_records = @search_query.blank? ? Kaui::Invoice.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
     end

data/app/controllers/kaui/payments_controller.rb

@@ -11,6 +11,8 @@ module Kaui
       @offset = params[:offset] || 0
       @limit = params[:limit] || 50
       @search_fields = Kaui::Payment::ADVANCED_SEARCH_COLUMNS.map { |attr| [attr, attr.split('_').join(' ').capitalize] }
+      @dropdown_default = default_columns(Kaui.account_payments_columns.call[3], Kaui::Payment::DEFAULT_VISIBLE_COLUMNS)
+      @visible_columns = @dropdown_default
 
       @max_nb_records = @search_query.blank? ? Kaui::Payment.list_or_search(nil, 0, 0, options_for_klient).pagination_max_nb_records : 0
     end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -181,7 +181,12 @@ module Kaui
 
     def record_usage
       @subscription = Kaui::Subscription.find_by_id(params.require(:id), 'NONE', options_for_klient)
-      @unit_types = fetch_unit_types_from_subscription(@subscription)
+      @is_aviate_catalog = Dependencies::Aviate::Metering.aviate_catalog?(@subscription.account_id, options_for_aviate_klient)
+      @unit_types = if @is_aviate_catalog
+                      Dependencies::Aviate::Metering.billing_meter_codes_for_plan(@subscription.plan_name, @subscription.account_id, options_for_aviate_klient)
+                    else
+                      fetch_unit_types_from_subscription(@subscription)
+                    end
     end
 
     def create_usage
@@ -189,56 +194,65 @@ module Kaui
       unit_type = params[:unit_type].to_s.strip
       amount_raw = params[:amount].to_s.strip
       record_date = params[:record_date].to_s.strip
+      tracking_id = params[:tracking_id].to_s.strip
+
+      @subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
+      @is_aviate_catalog = Dependencies::Aviate::Metering.aviate_catalog?(@subscription.account_id, options_for_aviate_klient)
 
       # Input validation
       errors = []
-      errors << 'Unit type is required' if unit_type.blank?
+      errors << (@is_aviate_catalog ? 'Billing meter code is required' : 'Unit type is required') if unit_type.blank?
       errors << 'Amount is required' if amount_raw.blank?
-      amount = Integer(amount_raw, exception: false)
-      errors << 'Amount must be a positive integer' if amount.nil? || amount <= 0
+      amount = @is_aviate_catalog ? parse_usage_amount(amount_raw) : Integer(amount_raw, exception: false)
+      errors << (@is_aviate_catalog ? 'Amount must be a positive number' : 'Amount must be a positive integer') if amount.nil? || amount <= 0
       errors << 'Date/time of usage is required' if record_date.blank?
       parsed_date = parse_usage_date(record_date) if record_date.present?
       errors << 'Date/time of usage must be a valid date or datetime' if record_date.present? && parsed_date.nil?
+      errors << 'Tracking ID must be a valid UUID' if @is_aviate_catalog && tracking_id.present? && !tracking_id.match?(/\A[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}\z/i)
 
       if errors.any?
         flash.now[:error] = errors.join('. ')
-        @subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
-        @unit_types = fetch_unit_types_from_subscription(@subscription)
+        @unit_types = fetch_unit_types_for_record_usage_form(@subscription, @is_aviate_catalog)
         @unit_type = unit_type
         @amount = amount_raw
         @record_date = record_date
-        @tracking_id = params[:tracking_id]
+        @tracking_id = tracking_id
         render :record_usage and return
       end
 
       begin
-        usage_record = KillBillClient::Model::UsageRecordAttributes.new
-        usage_record.record_date = parsed_date.utc.iso8601
-        usage_record.amount = amount
+        if @is_aviate_catalog
+          # trackingId is required by the Aviate metering API; auto-generate one if the user left it blank
+          tracking_id = SecureRandom.uuid if tracking_id.blank?
+          Dependencies::Aviate::Metering.submit_usage_event(@subscription.account_id, unit_type, subscription_id, tracking_id,
+                                                            parsed_date.utc.strftime('%Y-%m-%dT%H:%M:%S'), amount.to_f, options_for_aviate_klient)
+        else
+          usage_record = KillBillClient::Model::UsageRecordAttributes.new
+          usage_record.record_date = parsed_date.utc.iso8601
+          usage_record.amount = amount.to_i
 
-        unit_usage_record = KillBillClient::Model::UnitUsageRecordAttributes.new
-        unit_usage_record.unit_type = unit_type
-        unit_usage_record.usage_records = [usage_record]
+          unit_usage_record = KillBillClient::Model::UnitUsageRecordAttributes.new
+          unit_usage_record.unit_type = unit_type
+          unit_usage_record.usage_records = [usage_record]
 
-        usage = Kaui::Usage.new
-        usage.subscription_id = subscription_id
-        usage.tracking_id = params[:tracking_id].presence
-        usage.unit_usage_records = [unit_usage_record]
+          usage = Kaui::Usage.new
+          usage.subscription_id = subscription_id
+          usage.tracking_id = tracking_id.presence
+          usage.unit_usage_records = [unit_usage_record]
 
-        usage.create(current_user.kb_username, nil, nil, options_for_klient)
+          usage.create(current_user.kb_username, nil, nil, options_for_klient)
+        end
 
-        subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
-        redirect_to kaui_engine.account_bundles_path(subscription.account_id), notice: 'Usage was successfully recorded'
+        redirect_to kaui_engine.account_bundles_path(@subscription.account_id), notice: 'Usage was successfully recorded'
       rescue StandardError => e
         Rails.logger.error("Failed to record usage for subscription #{subscription_id}: #{e.class}: #{e.message}")
         Rails.logger.error(e.backtrace.join("\n")) if e.backtrace
         flash.now[:error] = "Error while recording usage: #{as_string(e)}"
-        @subscription = Kaui::Subscription.find_by_id(subscription_id, 'NONE', options_for_klient)
-        @unit_types = fetch_unit_types_from_subscription(@subscription)
+        @unit_types = fetch_unit_types_for_record_usage_form(@subscription, @is_aviate_catalog)
         @unit_type = unit_type
         @amount = amount_raw
         @record_date = record_date
-        @tracking_id = params[:tracking_id]
+        @tracking_id = tracking_id
         render :record_usage
       end
     end
@@ -411,6 +425,27 @@ module Kaui
       (phase.prices || []).empty?
     end
 
+    def fetch_unit_types_for_record_usage_form(subscription, is_aviate_catalog)
+      if is_aviate_catalog
+        Dependencies::Aviate::Metering.billing_meter_codes_for_plan(subscription.plan_name, subscription.account_id, options_for_aviate_klient)
+      else
+        fetch_unit_types_from_subscription(subscription)
+      end
+    end
+
+    # The Aviate plugin's catalog/metering endpoints require a JWT (obtained by logging in via the
+    # Aviate Configuration page in killbill-aviate-ui), stored in a jwt_token cookie - same convention
+    # as Aviate::EngineController#options_for_klient in that engine.
+    def options_for_aviate_klient
+      options_for_klient(jwt_token: cookies[:jwt_token])
+    end
+
+    def parse_usage_amount(amount_raw)
+      BigDecimal(amount_raw, exception: false)
+    rescue ArgumentError
+      nil
+    end
+
     def fetch_unit_types_from_subscription(subscription)
       unit_types = []
       (subscription.prices || []).each do |phase_price|

data/app/models/kaui/account.rb

@@ -4,7 +4,9 @@ module Kaui
   class Account < KillBillClient::Model::Account
     attr_accessor :phone, :bill_cycle_day_local
 
-    SENSIVITE_DATA_FIELDS = %w[name email].freeze
+    # Columns shown by default on the Accounts list screen (demo-friendly defaults); the rest remain
+    # available but hidden until the user opts in via "Edit Columns".
+    DEFAULT_VISIBLE_COLUMNS = %w[name account_id external_key currency time_zone locale account_balance account_cba].freeze
     REMAPPING_FIELDS = {
       'is_payment_delegated_to_parent' => 'pay_via_parent',
       'account_balance' => 'balance',

data/app/models/kaui/admin_tenant.rb

@@ -23,6 +23,16 @@ module Kaui
         KillBillClient::Model::Invoice.upload_invoice_translation(invoice_translation, locale, delete_if_exists, user, reason, comment, options)
       end
 
+      # Return a map of locale => invoice translation content, for every invoice translation uploaded for the tenant
+      def get_invoice_translations(options = {})
+        raw_translations = KillBillClient::Model::Tenant.search_tenant_config('INVOICE_TRANSLATION_', options)
+
+        raw_translations.each_with_object({}) do |e, hsh|
+          locale = e.key.gsub('INVOICE_TRANSLATION_', '')
+          hsh[locale] = e.values[0]
+        end
+      end
+
       def upload_catalog_translation(catalog_translation, locale, delete_if_exists, user = nil, reason = nil, comment = nil, options = {})
         KillBillClient::Model::Invoice.upload_catalog_translation(catalog_translation, locale, delete_if_exists, user, reason, comment, options)
       end

data/app/models/kaui/invoice.rb

@@ -3,6 +3,9 @@
 module Kaui
   class Invoice < KillBillClient::Model::Invoice
     TABLE_IGNORE_COLUMNS = %w[amount balance credit_adj refund_adj items is_parent_invoice parent_invoice_id parent_account_id audit_logs bundle_keys].freeze
+    # Columns shown by default on the Invoices list screen (demo-friendly defaults); the rest remain
+    # available but hidden until the user opts in via "Edit Columns".
+    DEFAULT_VISIBLE_COLUMNS = %w[invoice_number invoice_id status invoice_date target_date currency account_id].freeze
     ADVANCED_SEARCH_COLUMNS = %w[id account_id invoice_date target_date currency status balance].freeze
     ADVANCED_SEARCH_NAME_CHANGES = [%w[ac_id account_id]].freeze
 

data/app/models/kaui/payment.rb

@@ -7,6 +7,9 @@ module Kaui
     attr_accessor :payment_date, :target_invoice_id
 
     TRANSACTION_STATUSES = %w[SUCCESS PENDING PAYMENT_FAILURE PLUGIN_FAILURE UNKNOWN].freeze
+    # Columns shown by default on the Payments list screen (demo-friendly defaults); the rest remain
+    # available but hidden until the user opts in via "Edit Columns".
+    DEFAULT_VISIBLE_COLUMNS = %w[payment_date payment_number status account_id currency purchased_amount refunded_amount credited_amount].freeze
     REMAPPING_FIELDS = {
       'auth_amount' => 'auth',
       'captured_amount' => 'capture',

data/app/services/dependencies/aviate.rb

@@ -0,0 +1,89 @@
+# frozen_string_literal: true
+
+module Dependencies
+  module Aviate
+    # Thin wrapper around the Aviate plugin's Catalog and Metering REST APIs
+    # (https://apidocs.killbill.io/aviate-catalog.html, https://apidocs.killbill.io/aviate-metering.html).
+    # These are not (yet) exposed by the killbill-client gem, so we call them directly.
+    #
+    # Unlike most Kill Bill APIs, these endpoints do NOT accept tenant RBAC (username/password) or
+    # api_key/api_secret alone - they require a JWT obtained via the Aviate Auth API
+    # (https://apidocs.killbill.io/aviate-auth.html), passed as a `jwt_token` entry in options_for_klient
+    # (see Aviate::EngineController#options_for_klient in killbill-aviate-ui, which stores it in a
+    # `jwt_token` cookie after logging in via the Aviate Configuration page). If no jwt_token is present,
+    # calls will fail authentication and callers should treat that as "unknown/not Aviate".
+    class Metering
+      KILLBILL_AVIATE_PREFIX = '/plugins/aviate-plugin/v1'
+      CATALOG_STATE_AVIATE = 'CATALOG_STATE_AVIATE'
+
+      class << self
+        # Returns true if the tenant/account is using an Aviate catalog (as opposed to an XML one).
+        # Any error (plugin not installed, missing/invalid JWT, network issue, etc.) is treated as
+        # "not Aviate" so that callers can safely fall back to the existing XML-catalog behavior.
+        def aviate_catalog?(account_id, options_for_klient)
+          response = KillBillClient::API.get("#{KILLBILL_AVIATE_PREFIX}/catalog/info", catalog_params(account_id), request_options(options_for_klient))
+          JSON.parse(response.body)['state'] == CATALOG_STATE_AVIATE
+        rescue StandardError => e
+          Rails.logger.warn("Failed to retrieve Aviate catalog info: #{e.class}: #{e.message}")
+          false
+        end
+
+        # Returns the list of billing meter codes configured on the given plan's usage phases.
+        def billing_meter_codes_for_plan(plan_name, account_id, options_for_klient)
+          return [] if plan_name.blank?
+
+          response = KillBillClient::API.get("#{KILLBILL_AVIATE_PREFIX}/catalog/#{plan_name}/plan", catalog_params(account_id), request_options(options_for_klient))
+          plan = JSON.parse(response.body)
+
+          codes = []
+          Array(plan['phases']).each do |phase|
+            Array(phase['usages']).each do |usage|
+              Array(usage['tiers']).each do |tier|
+                Array(tier['blocks']).each do |block|
+                  codes << block['billingMeterCode'] if block['billingMeterCode'].present?
+                end
+              end
+            end
+          end
+          codes.uniq
+        rescue StandardError => e
+          Rails.logger.warn("Failed to retrieve Aviate billing meter codes for plan #{plan_name}: #{e.class}: #{e.message}")
+          []
+        end
+
+        # Submits a single usage event via the Aviate metering plugin.
+        def submit_usage_event(account_id, billing_meter_code, subscription_id, tracking_id, timestamp, value, options_for_klient)
+          body = [{
+            billingMeterCode: billing_meter_code,
+            subscriptionId: subscription_id,
+            trackingId: tracking_id,
+            timestamp: timestamp,
+            value: value
+          }].to_json
+
+          KillBillClient::API.post("#{KILLBILL_AVIATE_PREFIX}/metering/billing/#{account_id}", body, {}, request_options(options_for_klient))
+        end
+
+        private
+
+        def catalog_params(account_id)
+          account_id.present? ? { accountId: account_id } : {}
+        end
+
+        # Builds request options scoped to just api_key/api_secret + the Aviate JWT bearer header.
+        # Deliberately excludes username/password/session_id from options_for_klient: KillBillClient's
+        # net_http_adapter calls request.basic_auth(username, password) when they're present, which
+        # would overwrite (clobber) the Authorization header we set below for the Bearer token.
+        def request_options(options_for_klient)
+          request_options = {
+            api_key: options_for_klient[:api_key],
+            api_secret: options_for_klient[:api_secret]
+          }
+          jwt_token = options_for_klient[:jwt_token]
+          request_options[:head] = { 'Authorization' => "Bearer #{jwt_token}" } if jwt_token.present?
+          request_options
+        end
+      end
+    end
+  end
+end

data/app/views/kaui/account_tags/index.html.erb

@@ -63,7 +63,7 @@
     $(document).ready(function() {
         var tags = JSON.parse($("#tags").val());
         var table = $('#tags-table').DataTable({
-            "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+            "dom": "<'row'<'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
             data: tags
         });
 

data/app/views/kaui/accounts/_functions_bar.html.erb

@@ -378,7 +378,7 @@ $(document).ready(function() {
   updateDropdownOrder();
 
   function updateDropdownOrder() {
-    var state = JSON.parse(localStorage.getItem('DataTables_accounts-table_' + window.location.pathname));
+    var state = JSON.parse(localStorage.getItem('DataTables_accounts-table-v2_' + window.location.pathname));
     if (state === null) {
       // On initial load, ensure the existing checkboxes work
       setupColumnToggleEvents();
@@ -393,7 +393,7 @@ $(document).ready(function() {
 
     if (columnOrder !== undefined) {
       $list.empty();
-      var state = JSON.parse(localStorage.getItem('DataTables_accounts-table_' + window.location.pathname));
+      var state = JSON.parse(localStorage.getItem('DataTables_accounts-table-v2_' + window.location.pathname));
       if (state !== null) {
         var colsOrder = state.ColReorder;
       }

data/app/views/kaui/accounts/_multi_functions_bar.html.erb

@@ -319,7 +319,7 @@ $(document).ready(function() {
   updateDropdownOrder();
 
   function updateDropdownOrder() {
-    var state = JSON.parse(localStorage.getItem('DataTables_accounts-table_' + window.location.pathname));
+    var state = JSON.parse(localStorage.getItem('DataTables_accounts-table-v2_' + window.location.pathname));
     if (state === null) {
       return;
     }
@@ -332,7 +332,7 @@ $(document).ready(function() {
 
     if (columnOrder !== undefined) {
       $list.empty();
-      var state = JSON.parse(localStorage.getItem('DataTables_accounts-table_' + window.location.pathname));
+      var state = JSON.parse(localStorage.getItem('DataTables_accounts-table-v2_' + window.location.pathname));
       if (state !== null) {
         var colsOrder = state.ColReorder;
       }

data/app/views/kaui/accounts/index.html.erb

@@ -79,11 +79,12 @@ $(document).ready(function() {
       "enable": false
     },
     "stateSave": true,
+    "stateDuration": -1,
     "stateSaveCallback": function(settings, data) {
-      localStorage.setItem('DataTables_accounts-table_' + window.location.pathname, JSON.stringify(data));
+      localStorage.setItem('DataTables_accounts-table-v2_' + window.location.pathname, JSON.stringify(data));
     },
     "stateLoadCallback": function(settings) {
-      return JSON.parse(localStorage.getItem('DataTables_accounts-table_' + window.location.pathname));
+      return JSON.parse(localStorage.getItem('DataTables_accounts-table-v2_' + window.location.pathname));
     },
     "scrollX": true,
     "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
@@ -131,11 +132,10 @@ $(document).ready(function() {
   // If the page loaded with advanced search params in the URL (e.g. restored from
   // localStorage) but @advance_search_query was not set server-side, re-fire the
   // DataTable request with the correct filters.
-  if (window.location.search.includes('_q=1') && '<%= j(@advance_search_query.to_s.strip) %>' === '') {
-    var urlSearch = window.location.search.substring(1).replace(/ac_id/g, 'account_id');
+  if (window.location.search.includes('advance_search_query=') && '<%= j(@advance_search_query.to_s.strip) %>' === '') {
+    var urlSearch = new URLSearchParams(window.location.search).get('advance_search_query') || '';
     var ajaxUrl = "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>";
     table.on('preXhr.dt.filter', function(e, settings, data) {
-      data.search.value = urlSearch;
       data.advance_search_query = urlSearch;
     });
     table.ajax.url(ajaxUrl).load();

data/app/views/kaui/admin_tenants/_form_invoice_template.erb

@@ -2,7 +2,6 @@
     <div class="tab-pane fade invoice-template form-invoice-template" id="InvoiceTemplate">
       <% if @invoice_template.present? %>
         <div class="invoice-template-display mb-4">
-          <h5>Current Invoice Template</h5>
           <div class="card">
             <div class="card-body p-0">
               <iframe src="<%= admin_tenant_invoice_template_path(@tenant.id) %>" style="width: 100%; height: 500px; border: none;" title="Invoice Template Preview"></iframe>

data/app/views/kaui/admin_tenants/_form_invoice_translation.erb

@@ -1,5 +1,51 @@
 <% if can? :config_upload, Kaui::AdminTenant %>
   <div class="tab-pane fade" id="InvoiceTranslation">
+    <div class="existing-invoice-translations-container mb-4">
+      <div class="d-flex flex-column">
+        <div class="existing-invoice-translations-header mb-3">
+          <div class="d-flex align-items-start flex-column">
+          </div>
+        </div>
+        <div>
+          <table id="existing-invoice-translations-for-tenants" class="existing-invoice-translations-table">
+            <% if @invoice_translations.blank? %>
+              <tbody><tr><td>No invoice translation defined for tenant</td></tr></tbody>
+            <% else %>
+              <thead>
+                <tr>
+                  <th>Locale</th>
+                  <th></th>
+                </tr>
+              </thead>
+              <tbody>
+                <% @invoice_translations.each do |locale, content| %>
+                  <tr>
+                    <td><%= locale %></td>
+                    <td class="text-end">
+                      <%= render "kaui/components/button/button", {
+                        label: 'View Source',
+                        variant: "outline-secondary d-inline-flex align-items-center gap-1",
+                        type: "button",
+                        html_class: "kaui-button custom-hover",
+                        html_options: {
+                          onclick: '$(this).blur(); var $row = $(this).closest("tr").next(".invoice-translation-source-row"); $row.toggle(); $(this).find(".kaui-button-label").text($row.is(":visible") ? "Hide Source" : "View Source"); return false;'
+                        }
+                      } %>
+                    </td>
+                  </tr>
+                  <tr class="invoice-translation-source-row" style="display: none;">
+                    <td colspan="2">
+                      <pre class="mb-0 p-2 bg-light" style="max-height: 400px; overflow-y: auto; white-space: pre-wrap; word-break: break-all; font-family: monospace; font-size: 12px;"><%= html_escape(content) %></pre>
+                    </td>
+                  </tr>
+                <% end %>
+              </tbody>
+            <% end %>
+          </table>
+        </div>
+      </div>
+    </div>
+
     <%= form_tag({:action => :upload_invoice_translation}, :method => 'post', :multipart => true, :class => 'form-horizontal') do %>
         <%= hidden_field_tag(:id, @tenant.id) %>
 
@@ -21,7 +67,7 @@
         <div class="form-group d-flex pb-3 border-bottom mb-3">
           <%= label_tag :translation_locale, 'Locale', :class => 'col-sm-2 control-label' %>
           <div class="col-sm-10">
-            <%= text_field_tag :translation_locale, nil, :class => 'form-control', :required => true, :placeholder => 'e.g. en_US' %>
+            <%= select_tag :translation_locale, options_for_select([['-- Select a locale --', '']] + all_available_locales, { disabled: ['---------------'] }), class: 'form-control', required: true %>
           </div>
         </div>
         <div class="d-flex justify-content-end">

data/app/views/kaui/audit_logs/index.html.erb

@@ -103,7 +103,7 @@
     $(document).ready(function() {
         var auditLogs = JSON.parse($("#audit-logs").val());
         var table = $('#audit-logs-table').DataTable({
-            dom: "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+            "dom": "<'row'<'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
             pagingType: "full_numbers",
             data: auditLogs,
             "scrollX": true,

data/app/views/kaui/components/button/_button.html.erb

@@ -9,7 +9,7 @@
 <% icon_html = icon.present? ? image_tag(icon, class: "me-1", size: "16x16") : "" %>
 <% trailing_icon_html = trailing_icon.present? ? image_tag(trailing_icon, class: "ms-1", size: "16x16") : "" %>
 
-<%= tag.button raw("#{icon_html}#{label}#{trailing_icon_html}"),
+<%= tag.button raw("#{icon_html}<span class=\"kaui-button-label\">#{label}</span>#{trailing_icon_html}"),
   type: type,
   class: "btn #{variant} #{html_class}",
   **html_options

data/app/views/kaui/custom_fields/index.html.erb

@@ -82,7 +82,7 @@
 <%= javascript_tag do %>
 $(document).ready(function() {
   var table = $('#custom_fields-table').DataTable({
-    "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+    "dom": "<'row'<'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
     "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
     "language": {
       <!-- See DefaultPaginationSqlDaoHelper.java -->

data/app/views/kaui/invoices/_multi_functions_bar.html.erb

@@ -52,7 +52,7 @@
       <%  Kaui.account_invoices_columns.call[0].each_with_index do |title, index| %>
           <li class="list-group-item-manual" data-id="<%= index %>">
             <label class="label-group-item-manual">
-              <input type="checkbox" class="column-toggle" draggable="true" data-column="<%= index %>" checked> 
+              <input type="checkbox" class="column-toggle" draggable="true" data-column="<%= index %>" <%= 'checked' if @dropdown_default[index][:visible] %>> 
               <%= title %>
               <span class="icon-drag" aria-hidden="true"></span>
             </label>
@@ -337,7 +337,7 @@ $(document).ready(function() {
   updateDropdownOrder();
 
   function loadState() {
-    var state = JSON.parse(localStorage.getItem('DataTables_invoices-table'));
+    var state = JSON.parse(localStorage.getItem('DataTables_invoices-table-v2'));
     return state || { columns: [], columnOrder: [] };
   }
 

data/app/views/kaui/invoices/index.html.erb

@@ -50,7 +50,7 @@ $(document).ready(function() {
     }
   });
 
-  var stateKey = 'DataTables_invoices-table';
+  var stateKey = 'DataTables_invoices-table-v2';
   var state = JSON.parse(localStorage.getItem(stateKey));
   if (state) {
     state.start = <%= @offset %>;
@@ -63,6 +63,7 @@ $(document).ready(function() {
       "enable": false
     },
     "stateSave": true,
+    "stateDuration": -1,
     "stateSaveCallback": function(settings, data) {
       localStorage.setItem(stateKey, JSON.stringify(data));
     },
@@ -105,11 +106,11 @@ $(document).ready(function() {
   // If the page loaded with advanced search params in the URL (e.g. restored from
   // localStorage) but @advance_search_query was not set server-side, re-fire the
   // DataTable request with the correct filters.
-  if (window.location.search.includes('_q=1') && '<%= j(@advance_search_query.to_s.strip) %>' === '' && !window.location.pathname.includes('/accounts/')) {
-    var urlSearch = window.location.search.substring(1).replace(/ac_id/g, 'account_id');
-    var ajaxUrl = "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>" + '?' + urlSearch;
+  if (window.location.search.includes('advance_search_query=') && '<%= j(@advance_search_query.to_s.strip) %>' === '' && !window.location.pathname.includes('/accounts/')) {
+    var urlSearch = new URLSearchParams(window.location.search).get('advance_search_query') || '';
+    var ajaxUrl = "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>" + '?advance_search_query=' + encodeURIComponent(urlSearch);
     table.on('preXhr.dt.filter', function(e, settings, data) {
-      data.search.value = urlSearch;
+      data.advance_search_query = urlSearch;
     });
     table.ajax.url(ajaxUrl).load();
   }

data/app/views/kaui/payments/_multi_functions_bar.html.erb

@@ -52,7 +52,7 @@
       <%  Kaui.account_payments_columns.call()[0].each_with_index do |title, index| %>
           <li class="list-group-item-manual" data-id="<%= index %>">
             <label class="label-group-item-manual">
-              <input type="checkbox" class="column-toggle" draggable="true" data-column="<%= index %>" checked> 
+              <input type="checkbox" class="column-toggle" draggable="true" data-column="<%= index %>" <%= 'checked' if @dropdown_default[index][:visible] %>> 
               <%= title %>
               <span class="icon-drag" aria-hidden="true"></span>
             </label>
@@ -338,7 +338,7 @@ $(document).ready(function() {
   updateDropdownOrder();
 
   function loadState() {
-    var state = JSON.parse(localStorage.getItem('DataTables_payments-table'));
+    var state = JSON.parse(localStorage.getItem('DataTables_payments-table-v2'));
     return state || { columns: [], columnOrder: [] };
   }
 

data/app/views/kaui/payments/index.html.erb

@@ -41,7 +41,7 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  var stateKey = 'DataTables_payments-table';
+  var stateKey = 'DataTables_payments-table-v2';
   var state = JSON.parse(localStorage.getItem(stateKey));
   if (state) {
     state.start = <%= @offset %>;
@@ -54,11 +54,12 @@ $(document).ready(function() {
       "enable": false
     },
     "stateSave": true,
+    "stateDuration": -1,
     "stateSaveCallback": function(settings, data) {
-      localStorage.setItem('DataTables_payments-table', JSON.stringify(data));
+      localStorage.setItem(stateKey, JSON.stringify(data));
     },
     "stateLoadCallback": function(settings) {
-      return JSON.parse(localStorage.getItem('DataTables_payments-table'));
+      return JSON.parse(localStorage.getItem(stateKey));
     },
     "scrollX": true,
     <% if @account.account_id.blank? %>
@@ -114,17 +115,17 @@ $(document).ready(function() {
     <% end %>
     "processing": true,
     "serverSide": true,
-    "search": {"search": "<%= @search_query %>"},
+    "search": {"search": "<%= @search_query %>"}
   });
 
   // If the page loaded with advanced search params in the URL (e.g. restored from
   // localStorage) but @advance_search_query was not set server-side, re-fire the
   // DataTable request with the correct filters.
-  if (window.location.search.includes('_q=1') && '<%= j(@advance_search_query.to_s.strip) %>' === '' && !window.location.pathname.includes('/accounts/')) {
-    var urlSearch = window.location.search.substring(1).replace(/ac_id/g, 'account_id');
-    var ajaxUrl = "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>" + '?' + urlSearch;
+  if (window.location.search.includes('advance_search_query=') && '<%= j(@advance_search_query.to_s.strip) %>' === '' && !window.location.pathname.includes('/accounts/')) {
+    var urlSearch = new URLSearchParams(window.location.search).get('advance_search_query') || '';
+    var ajaxUrl = "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>" + '?advance_search_query=' + encodeURIComponent(urlSearch);
     table.on('preXhr.dt.filter', function(e, settings, data) {
-      data.search.value = urlSearch;
+      data.advance_search_query = urlSearch;
     });
     table.ajax.url(ajaxUrl).load();
   }

data/app/views/kaui/shared/_advanced_search_filterbar.html.erb

@@ -191,19 +191,19 @@ $(document).ready(function() {
     var table = $('<%= table_selector %>').DataTable();
     table.off('preXhr.dt.filter');
     table.on('preXhr.dt.filter', function(e, settings, data) {
-      data.search.value = searchQuery('<%= j search_query.to_s %>');
+      data.advance_search_query = decodeURIComponent(searchQuery('<%= j search_query.to_s %>'));
     });
 
     var searchParams = searchQuery('<%= j search_query.to_s %>');
+    var rawSearchParams = searchParams ? decodeURIComponent(searchParams) : searchParams;
     var ajaxUrl = "<%= pagination_path %>";
-    if (searchParams) {
-      ajaxUrl += (ajaxUrl.includes('?') ? '&' : '?') + searchParams;
+    if (rawSearchParams) {
+      ajaxUrl += (ajaxUrl.includes('?') ? '&' : '?') + 'advance_search_query=' + encodeURIComponent(rawSearchParams);
     }
     table.ajax.url(ajaxUrl).load();
 
-    if (searchParams) {
-      searchParams = searchParams.replace(/account_id/g, 'ac_id');
-      var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + searchParams;
+    if (rawSearchParams) {
+      var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?advance_search_query=' + encodeURIComponent(rawSearchParams);
       window.history.pushState({ path: newUrl }, '', newUrl);
     }
 

data/app/views/kaui/subscriptions/record_usage.erb

@@ -22,22 +22,34 @@
             <%= form_tag create_usage_path(@subscription.subscription_id), method: :post, id: 'record_usage_form', class: 'form-horizontal' do %>
 
                 <div class="form-group d-flex pb-3">
-                    <%= label_tag :unit_type, 'Unit Type', class: 'col-sm-3 control-label' %>
+                    <%= label_tag :unit_type, (@is_aviate_catalog ? 'Billing Meter Code' : 'Unit Type'), class: 'col-sm-3 control-label' %>
                     <div class="col-sm-9">
                         <% if @unit_types.length == 1 %>
                             <%= text_field_tag :unit_type, @unit_types.first, readonly: true, required: true, class: 'form-control bg-light' %>
                         <% elsif @unit_types.length > 1 %>
                             <%= select_tag :unit_type, options_for_select(@unit_types.map { |u| [u, u] }, @unit_type.presence || @unit_types.first), required: true, class: 'form-control', title: (@unit_type.presence || @unit_types.first) %>
                         <% else %>
-                            <%= text_field_tag :unit_type, @unit_type, required: true, maxlength: 255, class: 'form-control', placeholder: 'e.g. api-calls' %>
+                            <%= text_field_tag :unit_type, @unit_type, required: true, maxlength: 255, class: 'form-control', placeholder: (@is_aviate_catalog ? 'e.g. api-calls-meter' : 'e.g. api-calls') %>
                         <% end %>
+                        <small class="form-text text-muted">
+                            <% if @is_aviate_catalog %>
+                                This subscription's plan is billed via an Aviate catalog: usage is recorded against a <strong>billing meter code</strong> instead of a unit type.
+                            <% else %>
+                                This subscription's plan is billed via a standard (XML) catalog: usage is recorded against a <strong>unit type</strong>.
+                            <% end %>
+                            <a href="#" data-toggle="tooltip" class="kb-tooltip" title="Kaui automatically detects the catalog type for this subscription's account and submits usage through the matching Kill Bill API: the Record Usage API (unit type) for standard catalogs, or the Aviate Submit Usage Events API (billing meter code) for Aviate catalogs."></a>
+                        </small>
                     </div>
                 </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, @amount, required: true, min: 1, step: 1, class: 'form-control', placeholder: 'Positive integer' %>
+                        <% if @is_aviate_catalog %>
+                            <%= number_field_tag :amount, @amount, required: true, min: 0, step: 'any', class: 'form-control', placeholder: 'Positive number' %>
+                        <% else %>
+                            <%= number_field_tag :amount, @amount, required: true, min: 1, step: 1, class: 'form-control', placeholder: 'Positive integer' %>
+                        <% end %>
                     </div>
                 </div>
 
@@ -84,10 +96,12 @@
                 <div class="form-group d-flex pb-3">
                     <%= label_tag :tracking_id, 'Tracking ID', class: 'col-sm-3 control-label' %>
                     <div class="col-sm-9">
-                        <%= text_field_tag :tracking_id, @tracking_id, maxlength: 255, class: 'form-control', placeholder: 'Optional, used for idempotency' %>
+                        <%= text_field_tag :tracking_id, @tracking_id, maxlength: 255, class: 'form-control', placeholder: (@is_aviate_catalog ? 'Optional UUID, auto-generated if left blank' : 'Optional, used for idempotency') %>
                     </div>
                 </div>
 
+                <%= hidden_field_tag :is_aviate_catalog, @is_aviate_catalog.to_s %>
+
                 <div class="form-group d-flex justify-content-end pb-3">
                     <%= render "kaui/components/button/button", {
                         label: 'Close',
@@ -113,8 +127,11 @@
 
 <%= javascript_tag do %>
   document.addEventListener('DOMContentLoaded', function () {
+    $('[data-toggle="tooltip"]').tooltip();
+
     var form = document.getElementById('record_usage_form');
     if (!form) { return; }
+    var isAviateCatalog = document.getElementById('is_aviate_catalog') && document.getElementById('is_aviate_catalog').value === 'true';
         var unitTypeSelect = document.getElementById('unit_type');
         if (unitTypeSelect && unitTypeSelect.tagName === 'SELECT') {
             unitTypeSelect.title = unitTypeSelect.value || '';
@@ -129,13 +146,20 @@
             var unitTypeEl = document.getElementById('unit_type');
             var unitType = unitTypeEl ? (unitTypeEl.value || '').trim() : '';
       if (unitType.length === 0) {
-        errors.push('Unit type is required.');
+        errors.push(isAviateCatalog ? 'Billing meter code is required.' : 'Unit type is required.');
       }
 
       var amountStr = (document.getElementById('amount').value || '').trim();
-      var amount = parseInt(amountStr, 10);
-      if (amountStr.length === 0 || isNaN(amount) || amount <= 0 || String(amount) !== amountStr) {
-        errors.push('Amount must be a positive integer.');
+      if (isAviateCatalog) {
+        var floatAmount = parseFloat(amountStr);
+        if (amountStr.length === 0 || isNaN(floatAmount) || floatAmount <= 0) {
+          errors.push('Amount must be a positive number.');
+        }
+      } else {
+        var amount = parseInt(amountStr, 10);
+        if (amountStr.length === 0 || isNaN(amount) || amount <= 0 || String(amount) !== amountStr) {
+          errors.push('Amount must be a positive integer.');
+        }
       }
 
             var dateEl = document.getElementById('record_date_date');

data/app/views/kaui/tags/index.html.erb

@@ -71,7 +71,7 @@
 <%= javascript_tag do %>
   $(document).ready(function() {
     var table = $('#tags-table').DataTable({
-      "dom": "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+      "dom": "<'row'<'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
       "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
       "language": {
         "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>

data/lib/kaui/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kaui
-  VERSION = '4.0.20'
+  VERSION = '4.0.24'
 end

data/lib/kaui.rb

@@ -66,6 +66,8 @@ module Kaui
     # Add additional fields if needed
     fields = original_fields.dup
     fields -= %w[audit_logs first_name_length]
+    # Demo-friendly default column order (see Kaui::Account::DEFAULT_VISIBLE_COLUMNS for the ones shown by default)
+    fields = Kaui::Account::DEFAULT_VISIBLE_COLUMNS + (fields - Kaui::Account::DEFAULT_VISIBLE_COLUMNS)
     headers = fields.dup
     Kaui::Account::REMAPPING_FIELDS.each do |k, v|
       headers[fields.index(k)] = v
@@ -115,8 +117,8 @@ module Kaui
     fields = KillBillClient::Model::InvoiceAttributes.instance_variable_get(:@json_attributes)
     # Change the order if needed
     fields -= Kaui::Invoice::TABLE_IGNORE_COLUMNS
-    fields.delete('invoice_id')
-    fields.unshift('invoice_id')
+    # Demo-friendly default column order (see Kaui::Invoice::DEFAULT_VISIBLE_COLUMNS for the ones shown by default)
+    fields = Kaui::Invoice::DEFAULT_VISIBLE_COLUMNS + (fields - Kaui::Invoice::DEFAULT_VISIBLE_COLUMNS)
 
     headers = fields.map { |attr| attr.split('_').join(' ').capitalize }
     # Add additional headers if needed
@@ -131,6 +133,8 @@ module Kaui
         view_context.humanized_money_with_symbol(invoice.amount_to_money)
       when 'balance'
         view_context.humanized_money_with_symbol(invoice.balance_to_money)
+      when 'invoice_number'
+        view_context.link_to(invoice.invoice_number, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))
       when 'invoice_id'
         view_context.link_to(invoice.invoice_id, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))
       when 'status'
@@ -146,16 +150,16 @@ module Kaui
 
     raw_data = fields.map { |attr| invoice&.send(attr.downcase) }
 
-    [headers, values, raw_data]
+    [headers, values, raw_data, fields]
   end
 
   self.account_payments_columns = lambda do |account = nil, payment = nil, view_context = nil|
     fields = KillBillClient::Model::PaymentAttributes.instance_variable_get(:@json_attributes)
     # Change the order if needed
-    fields = %w[payment_date] + fields
-    fields -= %w[payment_number transactions audit_logs]
-    fields.unshift('status')
-    fields.unshift('payment_number')
+    fields = %w[payment_date status] + fields
+    fields -= %w[transactions audit_logs]
+    # Demo-friendly default column order (see Kaui::Payment::DEFAULT_VISIBLE_COLUMNS for the ones shown by default)
+    fields = Kaui::Payment::DEFAULT_VISIBLE_COLUMNS + (fields - Kaui::Payment::DEFAULT_VISIBLE_COLUMNS)
 
     headers = fields.dup
     Kaui::Payment::REMAPPING_FIELDS.each do |k, v|
@@ -163,7 +167,7 @@ module Kaui
     end
     headers.map! { |attr| attr.split('_').join(' ').capitalize }
 
-    return [headers, []] if payment.nil?
+    return [headers, [], [], fields] if payment.nil?
 
     values = fields.map do |attr|
       case attr
@@ -190,7 +194,7 @@ module Kaui
     end
 
     # Add additional values if needed
-    [headers, values, raw_data]
+    [headers, values, raw_data, fields]
   end
 
   self.account_audit_logs_columns = lambda do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.20
+  version: 4.0.24
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-15 00:00:00.000000000 Z
+date: 2026-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -510,6 +510,7 @@ files:
 - app/models/kaui/usage.rb
 - app/models/kaui/user.rb
 - app/models/kaui/user_role.rb
+- app/services/dependencies/aviate.rb
 - app/services/dependencies/kenui.rb
 - app/views/kaui/account_children/index.html.erb
 - app/views/kaui/account_custom_fields/index.html.erb