kaui 4.0.12 → 4.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a7cae94ec25bd96299f58f2bd783dabf34441f203d38fb2846e0f92b59b97e2a
-  data.tar.gz: 04f9d02da92a77eb81160518cad11a5c88af312d20b1c65cfc0d3ad141814801
+  metadata.gz: 62d467e5b936f1738863675c8f5747e9ea4187ac28670556e09d857b1921d588
+  data.tar.gz: c79e0a54c96cb563b1eaf7129f147240fd8da04e784a284f7390c39a7b5ac587
 SHA512:
-  metadata.gz: b99fa2fe8751882f22e754e79a1b1eacc1a7933a039e572bbfa22cf880d1967b7e8c8156d04d98cc6511c9b2b6ae634f9ba3ff24102bc4341072b2422dd41e68
-  data.tar.gz: f494903ee370dd0a6bb10808bde638eedd769619cb7e0c70b321c74c9b246ea09ebc00f4d9976cfac8765c53a43fd724daace311ea59b15288d7adb070fb20cb
+  metadata.gz: f6ff3a1e16012a78cfed10bfaf51ce9733f22d9ebf624d539cdf03cf3a8d7f8dcbda547022dc9258334ae9411c32a0261a7a81b40b19000218a0142950297198
+  data.tar.gz: fa4d96b4ccb3afea63726fa9d6a2c2e0f5c853ce8ce5e5acf518c839ab0487fd9c5952ccf33d0b21307b3703ac48b917c15e486061628fb8462091280fb8d21c

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

@@ -302,6 +302,27 @@ jQuery(document).ready(function ($) {
 
     setObjectIdPopover();
     setObjectIdTooltip();
+
+    /*
+     * Tag dropdown overflow prevention
+     * Flips each .tag-select-box to open leftward when it would overflow the right edge of the viewport.
+     */
+    function repositionTagDropdowns() {
+      $('.tag-select').each(function() {
+        var $box = $(this).find('.tag-select-box');
+        var triggerRight = $(this).offset().left + $(this).outerWidth();
+        var boxWidth = Math.max($box[0].scrollWidth, 240);
+        var viewportWidth = $(window).width();
+        if (triggerRight + boxWidth > viewportWidth) {
+          $box.css({ left: 'auto', right: '0' });
+        } else {
+          $box.css({ left: '0', right: 'auto' });
+        }
+      });
+    }
+
+    repositionTagDropdowns();
+    $(window).on('resize', repositionTagDropdowns);
 });
 
 

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

@@ -689,4 +689,79 @@ table tr.expired td {
   line-height: 1.25rem;
   color: #414651;
   margin-bottom: 0.25rem;
+}
+
+/* Advance Search modal – Subscription Bundles page */
+.subscription-bundl-index .close-button {
+  background: transparent;
+  padding: 0;
+  margin-top: -1.25rem;
+}
+
+.subscription-bundl-index .close-button:hover {
+  background: transparent;
+  padding: 0;
+}
+
+.subscription-bundl-index .border-button {
+  background: transparent;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  border: 0.0625rem solid #D5D7DA;
+  border-radius: 0.375rem;
+  width: 2.5rem;
+  height: 2.5rem;
+  padding: 0.625rem;
+}
+
+.subscription-bundl-index .border-button:hover {
+  background: transparent;
+}
+
+.subscription-bundl-index .button {
+  background: transparent;
+  display: inline-flex;
+  justify-content: center;
+  align-items: center;
+  width: 2.5rem;
+  height: 2.5rem;
+  padding: 0.625rem;
+}
+
+.subscription-bundl-index .button:hover {
+  background: transparent;
+}
+
+.subscription-bundl-index .field-label {
+  font-weight: 500;
+  font-size: 0.875rem;
+  line-height: 1.25rem;
+  color: #414651;
+  margin-top: -1.25rem;
+  min-width: 9.59375rem;
+}
+
+.subscription-bundl-index .search-field-label {
+  margin-top: -1.25rem;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center {
+  display: flex;
+  align-items: center;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center label {
+  margin-bottom: 0;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center .form-control {
+  margin-right: 0.25rem;
+  height: 2.5rem;
+  border-radius: 0.375rem;
+}
+
+.subscription-bundl-index .form-group.row.align-items-center.search-field div {
+  padding: 0;
+  margin-right: 0.25rem;
 }

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

@@ -58,15 +58,18 @@
 .tag-bar .tag-select .tag-select-box {
   position: absolute;
   top: 100%;
-  left: -0.0625rem;
+  left: 0;
+  right: auto;
   max-height: 0;
   background-color: #fff;
   z-index: 100;
   padding: 0 0.9375rem;
   font-size: 0.75rem;
   color: #999999;
-  overflow: auto;
-  width: auto;
+  overflow: hidden;
+  min-width: 15rem;
+  width: max-content;
+  max-width: min(25rem, 95vw);
   border-bottom: 0;
   display: inline-block;
 }

data/app/controllers/kaui/accounts_controller.rb

@@ -5,7 +5,7 @@ module Kaui
   class AccountsController < Kaui::EngineController
     def index
       @search_query = params[:q]
-      @advance_search_query = @search_query || request.query_string
+      @advance_search_query = @search_query.presence || params[:advance_search_query].presence
       if @search_query.present?
         account = Kaui::Account.list_or_search(@search_query, -1, 1, options_for_klient).first
         if account.nil?

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -288,7 +288,15 @@ module Kaui
       options = tenant_options_for_client
       options[:api_key] = @tenant.api_key
       options[:api_secret] = @tenant.api_secret
-      @overdue = Kaui::Overdue.get_overdue_json(options)
+      begin
+        @overdue = Kaui::Overdue.get_overdue_json(options)
+        @overdue_corrupted = false
+      rescue StandardError => e
+        Rails.logger.warn("Failed to load overdue configuration for tenant #{@tenant.id}: #{e.class}: #{e.message}")
+        @overdue = KillBillClient::Model::Overdue.new.tap { |o| o.overdue_states = [] }
+        @overdue_corrupted = true
+        flash.now[:warning] = 'The existing overdue configuration is corrupted and cannot be loaded. Use the XML upload below to replace it with a valid configuration.'
+      end
     end
 
     def modify_overdue_config

data/app/controllers/kaui/bundles_controller.rb

@@ -5,10 +5,11 @@ module Kaui
     # rubocop:disable Lint/HashCompareByIdentity
     def index
       cached_options_for_klient = options_for_klient
+      @search_query = params[:q].presence
+      @search_by = params[:search_by] || 'bundle_id'
       @per_page = (params[:per_page] || 10).to_i
       @page = (params[:page] || 1).to_i
 
-      fetch_bundles = promise { Kaui::Account.paginated_bundles(@account.account_id, (@page - 1) * @per_page, @per_page, 'NONE', cached_options_for_klient) }
       fetch_bundle_tags = promise do
         all_bundle_tags = @account.all_tags(:BUNDLE, false, 'NONE', cached_options_for_klient)
         all_bundle_tags.each_with_object({}) do |entry, hsh|
@@ -36,8 +37,15 @@ module Kaui
       fetch_available_tags = promise { Kaui::TagDefinition.all_for_bundle(cached_options_for_klient) }
       fetch_available_subscription_tags = promise { Kaui::TagDefinition.all_for_subscription(cached_options_for_klient) }
 
-      @bundles = wait(fetch_bundles)
-      @total_pages = (@bundles.pagination_max_nb_records.to_f / @per_page).ceil
+      if @search_query.present?
+        @bundles = search_bundles(@search_query, @search_by, cached_options_for_klient)
+        @total_pages = 1
+        @page = 1
+      else
+        fetched = Kaui::Account.paginated_bundles(@account.account_id, (@page - 1) * @per_page, @per_page, 'NONE', cached_options_for_klient)
+        @bundles = fetched
+        @total_pages = (fetched.pagination_max_nb_records.to_f / @per_page).ceil
+      end
 
       @tags_per_bundle = wait(fetch_bundle_tags)
       @tags_per_subscription = wait(fetch_subscription_tags)
@@ -46,8 +54,15 @@ module Kaui
       @available_tags = wait(fetch_available_tags)
       @available_subscription_tags = wait(fetch_available_subscription_tags)
 
-      # Don't load the full catalog to avoid memory issues
-      @catalog = nil
+      # Collect the distinct start dates from subscriptions on this page, then fetch
+      # only the catalog versions needed — one per unique date — to avoid loading all
+      # historical versions into memory.
+      start_dates = @bundles.flat_map(&:subscriptions).filter_map(&:start_date).uniq
+      @catalogs = start_dates.filter_map do |date|
+        Kaui::Catalog.get_account_catalog_json(@account.account_id, date, cached_options_for_klient)&.last
+      rescue StandardError
+        nil
+      end.uniq(&:effective_date)
 
       @subscription = {}
       @bundles.each do |bundle|
@@ -112,5 +127,38 @@ module Kaui
              end
       redirect_to kaui_engine.account_bundles_path(@account.account_id), notice: msg
     end
+
+    private
+
+    def search_bundles(query, search_by, options)
+      case search_by
+      when 'bundle_id'
+        bundle = Kaui::Bundle.find_by_id(query, options)
+        bundle ? [bundle] : []
+      when 'bundle_external_key'
+        bundle = Kaui::Bundle.find_by_external_key(query, false, options)
+        bundle ? [bundle] : []
+      when 'subscription_id'
+        subscription = KillBillClient::Model::Subscription.find_by_id(query, 'NONE', options)
+        if subscription
+          bundle = Kaui::Bundle.find_by_id(subscription.bundle_id, options)
+          bundle ? [bundle] : []
+        else
+          []
+        end
+      when 'subscription_external_key'
+        subscription = KillBillClient::Model::Subscription.find_by_external_key(query, 'NONE', options)
+        if subscription
+          bundle = Kaui::Bundle.find_by_id(subscription.bundle_id, options)
+          bundle ? [bundle] : []
+        else
+          []
+        end
+      else
+        []
+      end
+    rescue KillBillClient::API::NotFound
+      []
+    end
   end
 end

data/app/controllers/kaui/engine_controller_util.rb

@@ -127,7 +127,7 @@ module Kaui
         as_string(exception.cause)
       else
         log_rescue_error(exception)
-        exception.message
+        exception.message.to_s[0..200]
       end
     end
 
@@ -150,7 +150,7 @@ module Kaui
         error_message += " (code=#{error_message['code']})" if error_message['code'].present?
       end
       # Limit the error size to avoid ActionDispatch::Cookies::CookieOverflow
-      error_message[0..1000]
+      error_message.to_s[0..200]
     end
 
     def nested_hash_value(obj, key)

data/app/controllers/kaui/invoices_controller.rb

@@ -6,7 +6,7 @@ module Kaui
     def index
       @search_query = params[:account_id]
       @advance_search_query = params[:q] || request.query_string
-      @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
+      @ordering = params[:ordering] || 'desc'
       @offset = params[:offset] || 0
       @limit = params[:limit] || 50
       @search_fields = Kaui::Invoice::ADVANCED_SEARCH_COLUMNS.map { |attr| [attr, attr.split('_').join(' ').capitalize] }

data/app/helpers/kaui/plugin_helper.rb

@@ -11,10 +11,8 @@ module Kaui
     def installed_plugin_names
       plugins = []
       nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
-      plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
-      plugins_info.each do |plugin|
-        next unless plugin.state == 'RUNNING'
-
+      plugins_info = nodes_info.flat_map { |node| node.plugins_info || [] }
+      plugins_info.select { |p| p.state == 'RUNNING' }.uniq(&:plugin_name).each do |plugin|
         plugin_name = plugin.plugin_name
         plugin_key = plugin_name.gsub('-plugin', '')
 
@@ -40,7 +38,7 @@ module Kaui
     def installed_plugins
       installed_plugins = []
       nodes_info = KillBillClient::Model::NodesInfo.nodes_info(Kaui.current_tenant_user_options(current_user, session)) || []
-      plugins_info = nodes_info.empty? ? [] : (nodes_info.first.plugins_info || [])
+      plugins_info = nodes_info.flat_map { |node| node.plugins_info || [] }
 
       plugins_info.each do |plugin|
         next if plugin.version.nil?

data/app/helpers/kaui/subscription_helper.rb

@@ -107,6 +107,24 @@ module Kaui
       end
     end
 
+    def catalog_for_subscription(sub, catalogs)
+      return nil if catalogs.blank? || sub&.start_date.blank?
+
+      start_date = Date.parse(sub.start_date)
+
+      # Find the latest catalog version whose effective_date <= subscription start_date
+      best = catalogs.select do |c|
+        Date.parse(c.effective_date) <= start_date
+      rescue StandardError
+        false
+      end.max_by(&:effective_date)
+
+      # Fall back to the oldest version if none precedes the start_date
+      best || catalogs.first
+    rescue StandardError
+      catalogs.last
+    end
+
     def humanized_subscription_phase_type(sub)
       sub.phase_type
     end

data/app/models/kaui/bundle.rb

@@ -2,6 +2,12 @@
 
 module Kaui
   class Bundle < KillBillClient::Model::Bundle
+    SEARCH_FIELDS = [
+      ['bundle_id', 'Bundle ID'],
+      ['bundle_external_key', 'Bundle External Key'],
+      ['subscription_id', 'Subscription ID'],
+      ['subscription_external_key', 'Subscription External Key']
+    ].freeze
     def self.find_by_id_or_key(bundle_id_or_key, options = {})
       if /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/.match?(bundle_id_or_key)
         bundle = begin

data/app/models/kaui/overdue.rb

@@ -37,8 +37,11 @@ module Kaui
 
           result.overdue_states << state
         end
-        # We reversed them to display on the form , so we have to reverse them back before uploading new config
-        result.overdue_states.reverse!
+        # Sort by days descending (most severe first) so Kill Bill receives them in the correct order
+        # regardless of the order the user added rows in the form.
+        result.overdue_states.sort_by! do |s|
+          -s.condition&.time_since_earliest_unpaid_invoice_equals_or_exceeds&.number.to_i
+        end
 
         result
       end

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

@@ -45,7 +45,7 @@
         <% end %>
         <span class="tag-bar tag-bar-breathe">
           <% unless @available_tags.blank? %>
-            <div class="tag-select" onclick="void(0)">
+            <div class="tag-select position-relative" onclick="void(0)">
               <%= render "kaui/components/button/button", {
                 label: "Tag As",
                 trailing_icon: "kaui/account/down-arrow.svg", 

data/app/views/kaui/admin_tenants/new_overdue_config.html.erb

@@ -61,7 +61,7 @@
                       <td><%= state_form.select :is_block_changes, options_for_select([true, false ], state.is_block_changes), :class => 'form-control'  %></td>
                       <td><%= state_form.select :subscription_cancellation_policy, options_for_select([:NONE, :POLICY_NONE, :POLICY_IMMEDIATE, :POLICY_END_OF_TERM], state.subscription_cancellation), :class => 'form-control' %></td>
                       <%= state_form.fields_for 'condition' do |condition| %>
-                        <td><%= condition.number_field :time_since_earliest_unpaid_invoice_equals_or_exceeds, :value => state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds&.number %></td>
+                        <td><%= condition.number_field :time_since_earliest_unpaid_invoice_equals_or_exceeds, :value => state.condition.time_since_earliest_unpaid_invoice_equals_or_exceeds&.number, :min => 1, :class => 'days-since-field' %></td>
                         <td><%= condition.select :control_tag_inclusion, options_for_select([:NONE, :AUTO_PAY_OFF, :AUTO_INVOICING_OFF, :OVERDUE_ENFORCEMENT_OFF, :MANUAL_PAY, :TEST, :PARTNER], state.condition&.control_tag_inclusion), :class => 'form-control'  %></td>
                         <td><%= condition.select :control_tag_exclusion, options_for_select([:NONE, :AUTO_PAY_OFF, :AUTO_INVOICING_OFF, :OVERDUE_ENFORCEMENT_OFF, :MANUAL_PAY, :TEST, :PARTNER], state.condition&.control_tag_exclusion), :class => 'form-control'%></td>
                         <td><%= condition.number_field :number_of_unpaid_invoices_equals_or_exceeds, :value => state.condition&.number_of_unpaid_invoices_equals_or_exceeds %></td>
@@ -214,8 +214,32 @@ function overdue_delete_state(obj) {
     $("#tr_state_" + idx).hide();
 };
 
+$('form.form-horizontal').on('submit', function(e) {
+    var invalid = false;
+    $('#existing-overdue-config-for-tenants tbody tr:visible').each(function() {
+        var $days = $(this).find('.days-since-field');
+        var val = parseInt($days.val(), 10);
+        if (isNaN(val) || val <= 0) {
+            $days.addClass('is-invalid');
+            invalid = true;
+        } else {
+            $days.removeClass('is-invalid');
+        }
+    });
+    if (invalid) {
+        e.preventDefault();
+        alert('"Days since earliest unpaid invoice" must be greater than 0 for all states.');
+    }
+});
+
 $(document).ready(function() {
+    <% if @overdue_corrupted %>
+    switch_overdue_xml_config();
+    document.querySelectorAll('.toggle-option').forEach(opt => opt.classList.remove('active-btn'));
+    document.querySelectorAll('.toggle-option')[1]?.classList.add('active-btn');
+    <% else %>
     switch_overdue_basic_config();
+    <% end %>
 });
 
 document.querySelectorAll('.toggle-option').forEach(el => {

data/app/views/kaui/bundles/_bundle_filterbar.html.erb

@@ -0,0 +1,119 @@
+<div class="modal fade" id="advanceSearchModal" tabindex="-1" role="dialog" aria-labelledby="advanceSearchModalLabel" aria-hidden="true">
+  <div class="modal-dialog" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title d-flex align-items-center gap-3" id="advanceSearchModalLabel">
+          <span class="icon-container">
+            <%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
+          </span>
+          Advance Search
+        </h5>
+        <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">
+            <%= image_tag("kaui/modal/close.svg", width: 20, height: 20) %>
+          </span>
+        </button>
+      </div>
+      <div class="modal-body">
+        <form id="advanceSearchForm">
+          <div class="form-group d-flex align-items-center">
+            <label for="searchFieldSelect" class="mr-2 field-label" style="width: 30%;">Search Field</label>
+            <select id="searchFieldSelect" class="form-control mr-2">
+              <% Kaui::Bundle::SEARCH_FIELDS.each do |value, title| %>
+                <option value="<%= value %>" <%= 'selected' if @search_by == value %>><%= title %></option>
+              <% end %>
+            </select>
+          </div>
+          <div class="form-group d-flex align-items-center mt-3">
+            <label for="bundleSearchValue" class="mr-2 field-label" style="width: 30%;">Value</label>
+            <input type="text" id="bundleSearchValue" class="form-control" placeholder="Enter search value..." value="<%= @search_query %>">
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <%= render "kaui/components/button/button", {
+          label: 'Clear Search',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-button custom-hover",
+          html_options: { id: "clearAdvanceSearch" }
+        } %>
+        <%= render "kaui/components/button/button", {
+          label: 'Apply Search',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-dropdown custom-hover",
+          html_options: { id: "applyAdvanceSearch" }
+        } %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  // Pre-populate modal from current URL params on open
+  $('#advanceSearchModal').on('show.bs.modal', function() {
+    var params = new URLSearchParams(window.location.search);
+    var searchBy = params.get('search_by') || 'bundle_id';
+    var q = params.get('q') || '';
+    $('#searchFieldSelect').val(searchBy);
+    $('#bundleSearchValue').val(q);
+  });
+
+  // Apply search: navigate to same page with query params
+  $('#applyAdvanceSearch').on('click', function() {
+    var searchBy = $('#searchFieldSelect').val();
+    var q = $('#bundleSearchValue').val().trim();
+    if (!q) return;
+
+    var url = new URL(window.location.href);
+    url.searchParams.set('search_by', searchBy);
+    url.searchParams.set('q', q);
+    url.searchParams.delete('page');
+    window.location.href = url.toString();
+  });
+
+  // Clear search: navigate to same page without query params
+  $('#clearAdvanceSearch').on('click', function() {
+    var url = new URL(window.location.href);
+    url.searchParams.delete('q');
+    url.searchParams.delete('search_by');
+    url.searchParams.delete('page');
+    window.location.href = url.toString();
+  });
+
+  // Handle click on active search label close icon
+  $(document).on('click', '.bundle-filter-close-icon', function() {
+    var url = new URL(window.location.href);
+    url.searchParams.delete('q');
+    url.searchParams.delete('search_by');
+    url.searchParams.delete('page');
+    window.location.href = url.toString();
+  });
+
+  // Show active search label on page load
+  updateBundleSearchLabels();
+
+  function updateBundleSearchLabels() {
+    var params = new URLSearchParams(window.location.search);
+    var q = params.get('q');
+    var searchBy = params.get('search_by');
+    var container = $('#search-labels-container');
+    container.empty();
+
+    if (q && searchBy) {
+      var fieldLabel = $('#searchFieldSelect option[value="' + searchBy + '"]').text() || searchBy;
+      var label = $('<span>', {
+        class: 'label label-info d-inline-flex align-items-center gap-2'
+      });
+      label.append($('<span>', { text: fieldLabel + ': ' + q }));
+      label.append($('<span>', {
+        class: 'bundle-filter-close-icon',
+        style: 'cursor: pointer; margin-left: 5px; display: inline-flex; align-items: center;'
+      }).html('<svg width="12" height="12" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M15.8337 4.1665L4.16699 15.8332M4.16699 4.1665L15.8337 15.8332" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>'));
+      container.append(label);
+    }
+  }
+});
+<% end %>

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

@@ -1,5 +1,6 @@
 <div class="kaui-container subscription-bundl-index pb-5">
   <%= render "kaui/components/breadcrumb/breadcrumb" %>
+  <%= render :partial => 'bundle_filterbar' %>
   <div class="d-flex mb-5" style="gap: 4rem;">
     <%= render :template => 'kaui/layouts/kaui_account_sidebar' %>
     <div class="subscription-bundle">
@@ -8,7 +9,20 @@
           <div class="d-flex align-items-center">
           <h2>Subscription Bundles</h2>
           </div>
-          <span>
+          <span class="d-flex align-items-center gap-2">
+            <%= render "kaui/components/button/button", {
+                  label: "Advance Search",
+                  icon: "kaui/search.svg",
+                  variant: "outline-secondary d-inline-flex align-items-center gap-1",
+                  type: "button",
+                  html_class: "kaui-button custom-hover",
+                  html_options: {
+                    data: {
+                      bs_toggle: "modal",
+                      bs_target: "#advanceSearchModal"
+                    }
+                  }
+                } %>
             <% if can? :create, Kaui::Subscription %>
               <%= link_to kaui_engine.new_subscription_path(:params => { :account_id => @account.account_id, :product_category => 'BASE' }) do %>
                 <%= render "kaui/components/button/button", {
@@ -22,21 +36,31 @@
             <% end %>
           </span>
         </div>
+        <div id="search-labels-container" class="ml-2 mb-2">
+          <!-- Dynamic search labels will be added here -->
+        </div>
         <div class="subscriptions-scroll">
           <% @bundles.each_with_index do |bundle, idx| %>
             <div class="row">
               <div class="d-flex">
-                <%= render :partial => Kaui.bundle_details_partial, :locals => { :bundle => bundle, :account => @account, :catalog => @catalog } %>
+                <%= render :partial => Kaui.bundle_details_partial, :locals => { :bundle => bundle, :account => @account, :catalog => @catalogs&.last } %>
               </div>
               <% if bundle.subscriptions.present? %>
                   <div class="search">
-                    <%= render :partial => 'kaui/subscriptions/subscriptions_table', :locals => {:bundle => bundle, :account => @account, :catalog => @catalog} %>
+                    <%= render :partial => 'kaui/subscriptions/subscriptions_table', :locals => {:bundle => bundle, :account => @account, :catalogs => @catalogs} %>
                   </div>
               <% end %>
             </div>
           <% end %>
 
           
+          <% if @bundles.empty? %>
+            <div class="custom-alert custom-alert-info mt-3">
+              <span>No bundles found<%= @search_query.present? ? " for the given search query." : "." %></span>
+            </div>
+          <% end %>
+
+          <% unless @search_query.present? %>
           <div class="text-right d-flex justify-content-end pagination" style="">
             <%= link_to account_bundles_path(page: @page - 1), class: "btn btn-custom #{'disabled' if @page == 1}" do %>
               <%= render "kaui/components/button/button", {
@@ -81,6 +105,7 @@
                   } %>
             <% end %>
           </div>
+          <% end %>
         </div>
       </div>
     </div>

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

@@ -41,7 +41,16 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
-  var stateKey = 'DataTables_invoices-table';
+  // Dynamically find the Invoice date column index based on current header order
+  var invoiceDateColIndex = 3; // fallback default
+  $('#invoices-table thead th').each(function(i) {
+    if ($(this).find('.header-text').text().trim().toLowerCase() === 'invoice date') {
+      invoiceDateColIndex = i;
+      return false;
+    }
+  });
+
+  var stateKey = 'DataTables_invoices-table_' + window.location.pathname.replace(/\//g, '_');
   var state = JSON.parse(localStorage.getItem(stateKey));
   if (state) {
     state.start = <%= @offset %>;
@@ -69,11 +78,8 @@ $(document).ready(function() {
     },
     "pageLength": <%= @limit %>,
     "displayStart": <%= @offset %>,
-    <% if @search_query.blank? %>
-        "ordering": true,
-    <% elsif !@ordering.blank? %>
-        "order": [[ 0, "<%= @ordering %>" ]],
-    <% end %>
+    "ordering": true,
+    "order": [[ invoiceDateColIndex, "asc" ]],
     "processing": true,
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
@@ -97,8 +103,8 @@ $(document).ready(function() {
   });
 
   // Custom sorting functionality
-  var currentSortColumn = -1;
-  var currentSortDirection = 'asc';
+  var currentSortColumn = invoiceDateColIndex;
+  var currentSortDirection = 'desc';
 
   // Handle custom header clicks
   $('.sortable-header').on('click', function() {
@@ -134,9 +140,7 @@ $(document).ready(function() {
 
   // Initialize sort indicators based on current state
   <% if !@ordering.blank? %>
-    var initialColumn = 0;
-    var initialDirection = "<%= @ordering %>";
-    updateSortIndicators(initialColumn, initialDirection);
+    updateSortIndicators(invoiceDateColIndex, 'desc');
   <% end %>
 
   // Add an action whenever the page changes

data/app/views/kaui/refunds/_form.html.erb

@@ -126,8 +126,7 @@
     };
 
     var validateRefundAmount = function() {
-        if (Number($("#refund_amount").attr('value')) > <%= @payment.purchased_amount %> ||
-          Number($("#refund_amount").attr('value')) <= 0) {
+        if (Number($("#refund_amount").val()) <= 0) {
           setClassForElement("#div_refund_amount", "form-group d-flex pb-3 error");
           $('#new_kill_bill_client_model_invoice_item :submit').prop('disabled', true);
         } else {
@@ -151,11 +150,6 @@
         });
     };
 
-    /*
-     * Recompute refund amount based on adjustment type:
-     * - For Invoice Item Adjustment, recompute price based on selection and invalidate text area to make it match exact selection
-     * _ For Invoice adjustment or no adjustment, default to payment amount
-     */
     var recomputeRefundAmountAndValidateAmount = function() {
         var computedRefundAmount = <%= @payment.purchased_amount %>;
         if ($("#adjustment_type_invoiceItemAdjustment").is(':checked')) {
@@ -166,11 +160,9 @@
                 }
             });
             computedRefundAmount = x.toFixed(2);
-            $("#refund_amount").attr('value', computedRefundAmount);
-            $("#refund_amount").prop('readonly', true);
+            $("#refund_amount").val(computedRefundAmount);
         } else {
-            $("#refund_amount").attr('value', computedRefundAmount);
-            $("#refund_amount").prop('readonly', false);
+            $("#refund_amount").val(computedRefundAmount);
         }
         validateRefundAmount();
     };

data/app/views/kaui/subscriptions/_subscriptions_table.html.erb

@@ -104,7 +104,7 @@
             </div>
           </td>
         <% end %>
-        <td><%= humanized_subscription_plan_or_product_name(sub, catalog) %></td>
+        <td><%= humanized_subscription_plan_or_product_name(sub, catalog_for_subscription(sub, catalogs)) %></td>
         <td>
           <span id="<%= sub.subscription_id %>-popover" class="object-id-popover category-bedge" data-id="<%= sub.subscription_id %>">
             <%= humanized_subscription_product_category(sub) %>

data/lib/kaui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.12
+  version: 4.0.13
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-01 00:00:00.000000000 Z
+date: 2026-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -576,6 +576,7 @@ files:
 - app/views/kaui/bundle_tags/_form_bar.html.erb
 - app/views/kaui/bundle_tags/edit.html.erb
 - app/views/kaui/bundles/_bundle_details.html.erb
+- app/views/kaui/bundles/_bundle_filterbar.html.erb
 - app/views/kaui/bundles/index.html.erb
 - app/views/kaui/bundles/pause_resume.html.erb
 - app/views/kaui/bundles/transfer.html.erb