kaui 4.0.13 → 4.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 62d467e5b936f1738863675c8f5747e9ea4187ac28670556e09d857b1921d588
-  data.tar.gz: c79e0a54c96cb563b1eaf7129f147240fd8da04e784a284f7390c39a7b5ac587
+  metadata.gz: 3452f98093718cc5761ee58798ac78467b66d046fc5cf17556060bd02f7637ce
+  data.tar.gz: 555af1e3377e9fcb143716618644e2701138d2a731c7f970761691a0d3ecd0fa
 SHA512:
-  metadata.gz: f6ff3a1e16012a78cfed10bfaf51ce9733f22d9ebf624d539cdf03cf3a8d7f8dcbda547022dc9258334ae9411c32a0261a7a81b40b19000218a0142950297198
-  data.tar.gz: fa4d96b4ccb3afea63726fa9d6a2c2e0f5c853ce8ce5e5acf518c839ab0487fd9c5952ccf33d0b21307b3703ac48b917c15e486061628fb8462091280fb8d21c
+  metadata.gz: 30d0269df326b5db8336c910ee4a111da1101d5212c43b728fbac297015b9a18409ffed04978867194bac6e7feda6beea4ea101469e201ab6465de74c863da6d
+  data.tar.gz: 3c289f1741f5ddda2c614adfca575dff1b540ea56cde455beb8fb870bbb4c898c9c793ffd0b991818fe6883f55c50a4412efbd45b0c9d2f0180ac67c7637698c

data/app/assets/images/kaui/save.svg

@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round">
+  <path d="M19 21H5a2 2 0 0 1-2-2V5a2 2 0 0 1 2-2h11l5 5v11a2 2 0 0 1-2 2z"/>
+  <polyline points="17 21 17 13 7 13 7 21"/>
+  <polyline points="7 3 7 8 15 8"/>
+</svg>

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

@@ -84,11 +84,6 @@ function populateSearchLabelsFromUrl() {
 
 function searchQuery(account_id){
   var searchFields = $('.search-field');
-  var searchLabelsContainer = $('#search-labels-container');
-  
-  if (searchFields.length > 0) {
-    searchLabelsContainer.empty();
-  }
   var searchLabels = '';
   if (searchFields.length > 0) {
     searchLabels = searchFields.map(function() {
@@ -135,17 +130,25 @@ function searchQuery(account_id){
 };
 
 function clearAdvanceSearch() {
+  var hasActiveSearch = $('#search-labels-container .label').length > 0 ||
+                        window.location.search.includes('_q=1');
+
   // Clear all search fields
   $('#search-fields-container').empty();
 
   // Remove all search labels
   $('#search-labels-container').empty();
 
-  // Reload the page with the original URL (no parameters)
-  window.location.href = window.location.pathname;
+  // Clear Persisted Search for this page
+  localStorage.removeItem('kaui_adv_search_' + window.location.pathname);
 
   // Hide the modal
   $('#advanceSearchModal').modal('hide');
+
+  // Only reload if there was an active search to clear
+  if (hasActiveSearch) {
+    window.location.href = window.location.pathname;
+  }
 }
 
 function showAdvanceSearchModal() {
@@ -230,4 +233,177 @@ $(document).on('click', '.filter-close-icon', function() {
     var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname;
     window.history.pushState({ path: newUrl }, '', newUrl);
   }
+});
+
+// --- Saved Searches Logic ---
+function getSavedSearches() {
+  var key = 'kaui_saved_searches_' + window.location.pathname;
+  var data = localStorage.getItem(key);
+  if (!data) return {};
+  try {
+    var parsed = JSON.parse(data);
+    if (typeof parsed === 'object' && parsed !== null) {
+      return parsed;
+    }
+  } catch (e) {
+    // Legacy string format or invalid JSON
+    var legacy = {};
+    legacy["Default"] = data;
+    localStorage.setItem(key, JSON.stringify(legacy));
+    return legacy;
+  }
+  return {};
+}
+
+function saveSavedSearches(searches) {
+  var key = 'kaui_saved_searches_' + window.location.pathname;
+  localStorage.setItem(key, JSON.stringify(searches));
+}
+
+function populateSavedSearchesDropdown() {
+  var menu = $('#savedSearchesDropdown_menu');
+  if (!menu.length) return;
+  
+  menu.empty();
+  var searches = getSavedSearches();
+  var names = Object.keys(searches);
+  
+  var dropdownButton = $('#savedSearchesDropdown_button');
+  if (names.length === 0) {
+    menu.append('<li><span class="dropdown-item text-muted">No saved searches</span></li>');
+    return;
+  }
+  
+  names.forEach(function(name) {
+    var li = $('<li>');
+    var a = $('<a>', {
+      class: 'dropdown-item d-flex align-items-center justify-content-between apply-saved-search',
+      href: 'javascript:void(0);',
+      'data-name': name,
+      style: 'cursor: pointer;'
+    });
+    
+    var nameSpan = $('<span>', {
+      class: 'text-black-700 fs-6 text-normal',
+      style: 'font-weight: 500; font-size: 0.875rem !important; line-height: 1.25rem;',
+      text: name
+    });
+    
+    var deleteIcon = $('<span>', {
+      class: 'delete-saved-search text-danger',
+      'data-name': name,
+      style: 'cursor: pointer; padding: 0 5px; font-weight: bold;',
+      html: '&times;',
+      title: 'Delete saved search'
+    });
+    
+    a.append(nameSpan).append(deleteIcon);
+    li.append(a);
+    menu.append(li);
+  });
+}
+
+$(document).ready(function() {
+  populateSavedSearchesDropdown();
+
+  $(document).on('submit', '#advanceSearchForm', function(e) {
+    e.preventDefault();
+    return false;
+  });
+
+  $(document).on('input', '#savedSearchName', function() {
+    var val = $(this).val().trim();
+    if (val === '') {
+      $('#saveAdvanceSearch').text('Save Search As...');
+    } else {
+      $('#saveAdvanceSearch').text('Save');
+    }
+  });
+
+  $(document).on('click', '#saveAdvanceSearch', function(e) {
+    e.preventDefault();
+    var container = $('#save-search-container');
+    var input = $('#savedSearchName');
+    
+    if (!container.is(':visible')) {
+      container.show();
+      input.focus();
+      return;
+    }
+    
+    var name = input.val().trim();
+    if (name === '') {
+      container.hide();
+      return;
+    }
+    
+    var searchParams = '';
+    
+    // For bundles, it's search_by and q. For everything else, it's searchQuery()
+    if (window.location.pathname.includes('/bundles')) {
+       var searchBy = $('#searchFieldSelect').val();
+       var q = $('#bundleSearchValue').val();
+       if (q) q = q.trim();
+       if (!q) {
+         alert("Please enter a value to search.");
+         return;
+       }
+       searchParams = 'search_by=' + encodeURIComponent(searchBy) + '&q=' + encodeURIComponent(q);
+    } else {
+       // Check if there are any search fields before calling searchQuery(),
+       // because searchQuery() calls clearAdvanceSearch() (which reloads the page)
+       // when no fields exist.
+       if ($('.search-field').length === 0 && $('#search-labels-container .label').length === 0) {
+         alert("Please enter at least one search field.");
+         return;
+       }
+       searchParams = searchQuery();
+       if (!searchParams) {
+         alert("Please enter at least one search field.");
+         return;
+       }
+       searchParams = searchParams.replace(/account_id/g, 'ac_id');
+    }
+    
+    var searches = getSavedSearches();
+    searches[name] = searchParams;
+    saveSavedSearches(searches);
+    
+    input.val('');
+    $('#saveAdvanceSearch').text('Save Search As...');
+    container.hide();
+    
+    populateSavedSearchesDropdown();
+    $('#applyAdvanceSearch').trigger('click');
+  });
+
+  $(document).on('hidden.bs.modal', '#advanceSearchModal', function () {
+    $('#save-search-container').hide();
+    $('#savedSearchName').val('');
+    $('#saveAdvanceSearch').text('Save Search As...');
+  });
+
+  $(document).on('click', '.apply-saved-search', function(e) {
+    // If they clicked the delete icon, don't apply the search
+    if ($(e.target).hasClass('delete-saved-search')) return;
+    
+    var name = $(this).data('name');
+    var searches = getSavedSearches();
+    var params = searches[name];
+    if (params) {
+      var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + params;
+      window.location.href = newUrl;
+    }
+  });
+
+  $(document).on('click', '.delete-saved-search', function(e) {
+    e.stopPropagation(); // prevent dropdown from closing and prevent applying search
+    var name = $(this).data('name');
+    if (confirm("Are you sure you want to delete the saved search '" + name + "'?")) {
+      var searches = getSavedSearches();
+      delete searches[name];
+      saveSavedSearches(searches);
+      populateSavedSearchesDropdown();
+    }
+  });
 });

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

@@ -1293,7 +1293,6 @@ table thead th:last-child {
   align-items: center;
   gap: 0.625rem;
   padding: 0.875rem 1.125rem;
-  margin: 0.625rem 0;
   border-radius: 0.375rem;
   font-size: 0.9375rem;
   font-weight: 500;
@@ -1467,6 +1466,10 @@ table thead th:last-child {
   width: 100%;
 }
 
+.field_with_errors {
+  display: contents;
+}
+
 /* Navbar color changes - Higher specificity to override existing rules */
 header .header-icon {
   color: #374151 !important;

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

@@ -691,7 +691,7 @@ table tr.expired td {
   margin-bottom: 0.25rem;
 }
 
-/* Advance Search modal – Subscription Bundles page */
+/* Advanced Search modal – Subscription Bundles page */
 .subscription-bundl-index .close-button {
   background: transparent;
   padding: 0;

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -61,8 +61,8 @@ module Kaui
         nil
       end
 
-      @overdue = wait(fetch_overdue)
-      @overdue_xml = wait(fetch_overdue_xml)
+      @overdue = flash[:overdue_deleted] ? nil : wait(fetch_overdue)
+      @overdue_xml = flash[:overdue_deleted] ? nil : wait(fetch_overdue_xml)
       @tenant_plugin_config = begin
         wait(fetch_tenant_plugin_config)
       rescue StandardError
@@ -288,13 +288,19 @@ module Kaui
       options = tenant_options_for_client
       options[:api_key] = @tenant.api_key
       options[:api_secret] = @tenant.api_secret
+      @overdue_config_exists = false
       begin
         @overdue = Kaui::Overdue.get_overdue_json(options)
         @overdue_corrupted = false
+        @overdue_config_exists = @overdue.overdue_states.present? && !@overdue.has_states
+      rescue KillBillClient::API::NotFound
+        @overdue = KillBillClient::Model::Overdue.new.tap { |o| o.overdue_states = [] }
+        @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
+        @overdue_config_exists = 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
@@ -306,12 +312,18 @@ module Kaui
       options[:api_key] = current_tenant.api_key
       options[:api_secret] = current_tenant.api_secret
 
-      view_form_model = params.require(:kill_bill_client_model_overdue).permit!.to_h.compact_blank
+      overdue_params = params[:kill_bill_client_model_overdue]&.permit!
+      view_form_model = overdue_params&.to_h&.compact_blank || {}
       view_form_model['states'] = view_form_model['states'].values if view_form_model['states'].present?
-
-      overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
-      Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
-      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
+      if view_form_model['states'].blank?
+        Kaui::AdminTenant.delete_tenant_user_key_value('OVERDUE_CONFIG', options[:username], nil, comment, options)
+        flash[:overdue_deleted] = true
+        redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_updated_successfully')
+      else
+        overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
+        Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
+        redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
+      end
     end
 
     def upload_overdue_config
@@ -336,6 +348,24 @@ module Kaui
       redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_uploaded_successfully')
     end
 
+    def delete_overdue_config
+      current_tenant = safely_find_tenant_by_id(params[:id])
+
+      options = tenant_options_for_client
+      options[:api_key] = current_tenant.api_key
+      options[:api_secret] = current_tenant.api_secret
+
+      begin
+        Kaui::AdminTenant.delete_tenant_user_key_value('OVERDUE_CONFIG', options[:username], nil, comment, options)
+      rescue StandardError => e
+        flash[:error] = "Failed to delete overdue config: #{as_string(e)}"
+        redirect_to admin_tenant_new_overdue_config_path(id: current_tenant.id) and return
+      end
+
+      flash[:overdue_deleted] = true
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_deleted_successfully')
+    end
+
     def upload_invoice_template
       current_tenant = safely_find_tenant_by_id(params[:id])
 

data/app/controllers/kaui/engine_controller.rb

@@ -38,7 +38,8 @@ class Kaui::EngineController < ApplicationController
   end
 
   def populate_account_details
-    @account ||= params[:account_id].present? ? Kaui::Account.find_by_id(params[:account_id], false, false, options_for_klient) : Kaui::Account.new
+    account_id = scalar_account_id_param
+    @account ||= account_id.present? ? Kaui::Account.find_by_id(account_id, false, false, options_for_klient) : Kaui::Account.new
   end
 
   def retrieve_tenants_for_current_user

data/app/controllers/kaui/engine_controller_util.rb

@@ -37,8 +37,8 @@ module Kaui
     end
 
     def paginate(searcher, data_extractor, formatter, table_default_columns = [])
-      search_key = (params[:search] || {})[:value].presence
-      advance_search_query = params[:advance_search_query].presence
+      search_key = normalize_search_key((params[:search] || {})[:value]).presence
+      advance_search_query = normalize_search_key(params[:advance_search_query]).presence
 
       search_key = advance_search_query if advance_search_query
       search_key = handle_balance_search(search_key) if search_key.present?
@@ -84,6 +84,30 @@ module Kaui
       end
     end
 
+    def advanced_search_query?(search_key)
+      search_key.to_s.include?('_q')
+    end
+
+    def scalar_account_id_param
+      path_account_id = request.path_parameters[:account_id].presence
+      return path_account_id if path_account_id.present?
+
+      account_id = params[:account_id]
+      account_id if account_id.is_a?(String) || account_id.is_a?(Numeric)
+    end
+
+    def normalize_search_key(search_key)
+      return if search_key.blank?
+
+      if search_key.respond_to?(:to_unsafe_h)
+        search_key.to_unsafe_h.to_query
+      elsif search_key.is_a?(Hash)
+        search_key.to_query
+      else
+        search_key
+      end
+    end
+
     def promise(&)
       # Evaluation starts immediately
       ::Concurrent::Promises.future do

data/app/controllers/kaui/invoices_controller.rb

@@ -4,7 +4,7 @@ require 'csv'
 module Kaui
   class InvoicesController < Kaui::EngineController
     def index
-      @search_query = params[:account_id]
+      @search_query = scalar_account_id_param
       @advance_search_query = params[:q] || request.query_string
       @ordering = params[:ordering] || 'desc'
       @offset = params[:offset] || 0
@@ -15,7 +15,7 @@ module Kaui
     end
 
     def download
-      account_id = params[:account_id]
+      account_id = scalar_account_id_param
       start_date = params[:startDate]
       end_date = params[:endDate]
       all_fields_checked = params[:allFieldsChecked] == 'true'
@@ -60,7 +60,7 @@ module Kaui
 
       searcher = lambda do |search_key, offset, limit|
         account = begin
-          Kaui::Account.find_by_id_or_key(search_key, false, false, cached_options_for_klient)
+          Kaui::Account.find_by_id_or_key(search_key, false, false, cached_options_for_klient) unless advanced_search_query?(search_key)
         rescue StandardError
           nil
         end

data/app/controllers/kaui/payments_controller.rb

@@ -5,7 +5,7 @@ require 'csv'
 module Kaui
   class PaymentsController < Kaui::EngineController
     def index
-      @search_query = params[:q] || params[:account_id]
+      @search_query = params[:q] || scalar_account_id_param
       @advance_search_query = params[:q] || request.query_string
       @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
       @offset = params[:offset] || 0
@@ -16,7 +16,7 @@ module Kaui
     end
 
     def download
-      account_id = params[:account_id]
+      account_id = scalar_account_id_param
       start_date = params[:startDate]
       end_date = params[:endDate]
       all_fields_checked = params[:allFieldsChecked] == 'true'
@@ -104,7 +104,7 @@ module Kaui
           payments = Kaui::Payment.list_or_search(payment_state, offset, limit, options_for_klient)
         else
           account = begin
-            Kaui::Account.find_by_id_or_key(search_key, false, false, options_for_klient)
+            Kaui::Account.find_by_id_or_key(search_key, false, false, options_for_klient) unless advanced_search_query?(search_key)
           rescue StandardError
             nil
           end

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

@@ -6,7 +6,7 @@
           <span class="icon-container">
             <%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
           </span>
-          Advance Search
+          Advanced Search
         </h5>
         <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">
@@ -29,9 +29,25 @@
           </div>
           <div id="search-fields-container">
           </div>
+          <div id="save-search-container" style="display: none;">
+            <hr class="mt-4 mb-3">
+            <div class="form-group d-flex align-items-center mb-0">
+              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;">Save As Name</label>
+              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="Enter a name for this search...">
+            </div>
+          </div>
         </form>
       </div>
       <div class="modal-footer">
+        <%= render "kaui/components/button/button", {
+          label: 'Save Search As...',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-button custom-hover",
+          html_options: {
+            id: "saveAdvanceSearch"
+          }
+        } %>
         <%= render "kaui/components/button/button", {
           label: 'Clear Search',
           variant: "outline-secondary d-inline-flex align-items-center gap-1",
@@ -80,6 +96,7 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
+
   populateSearchLabelsFromUrl();
   var dateFields = ['Created date', 'Updated date', 'Reference time'];
   // Handle the "Add" button click to add new search fields
@@ -109,6 +126,22 @@ $(document).ready(function() {
     var searchLabelsContainer = $('#search-labels-container');
     searchLabelsContainer.empty();
 
+    // Validate that at least one search field has a value
+    var hasValue = false;
+    searchFields.each(function() {
+      var value = $(this).find('.search-field-value').val().trim();
+      if (value !== '') {
+        hasValue = true;
+        return false; // Break the loop
+      }
+    });
+
+    // If no search field has a value, show an alert and prevent search
+    if (!hasValue) {
+      alert('Please enter a value for at least one search field.');
+      return;
+    }
+
     var table = $('#accounts-table').DataTable();
     table.off('preXhr.dt.filter');
     table.on('preXhr.dt.filter', function(e, settings, data) {

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

@@ -117,7 +117,7 @@
 <div class="form-group d-flex pb-3">
     <%= f.label :phone, 'Phone', :class => 'col-sm-3 control-label' %>
     <div class="col-sm-9">
-        <%= f.number_field :phone, :class => 'form-control' %>
+        <%= f.text_field :phone, :class => 'form-control' %>
     </div>
 </div>
 <div class="form-group d-flex pb-3 <%= 'border-bottom mb-3' if @account.persisted? %>">

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

@@ -8,7 +8,9 @@
         <%= render "kaui/components/menu_dropdown/menu_dropdown", {
           label: action[:label],
           icon: action[:icon],
-          dropdown_id: "menuDropdown#{index}",
+          variant: action[:variant] ? action[:variant] : "btn btn-primary",
+          html_class: action[:html_class] || "",
+          dropdown_id: action[:id] || "menuDropdown#{index}",
           menu_items: action[:items]
         } %>
       <% else %>

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

@@ -1,6 +1,15 @@
 <div class="register kaui-new-account">
     <div class="">
         <div class="mx-auto" style="max-width: 37.5rem;">
+            <% if @account.errors.any? %>
+              <div class="custom-alert custom-alert-danger mb-3">
+                <ul class="mb-0">
+                  <% @account.errors.each do |error| %>
+                    <li><%= error.message %></li>
+                  <% end %>
+                </ul>
+              </div>
+            <% end %>
             <h5 class="add-account-title">
             <span class="icon-container">
                     <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">

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

@@ -19,6 +19,14 @@
               bs_target: "#advanceSearchModal"
             }
           },
+          {
+            type: "dropdown",
+            label: "Saved Searches",
+            icon: 'kaui/save.svg',
+            variant: "btn btn-outline-secondary d-inline-flex align-items-center gap-1 kaui-button custom-hover",
+            id: "savedSearchesDropdown",
+            items: []
+          },
           {
             label: "Download CSV",
             icon: 'kaui/download.svg',
@@ -114,6 +122,18 @@ $(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');
+    var ajaxUrl = "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>" + '?' + urlSearch;
+    table.on('preXhr.dt.filter', function(e, settings, data) {
+      data.search.value = urlSearch;
+    });
+    table.ajax.url(ajaxUrl).load();
+  }
+
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
   $('#accounts-table').on('draw.dt', function() {
     <% if @max_nb_records.nil? %>

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

@@ -1,6 +1,20 @@
 <div class="register kaui-new-account">
     <div class="">
         <div class="mx-auto" style="max-width: 37.5rem;">
+            <% if @account.errors.any? %>
+              <script>
+                if (/\/accounts$/.test(window.location.pathname)) {
+                  window.history.replaceState({}, '', window.location.pathname + '/new');
+                }
+              </script>
+              <div class="custom-alert custom-alert-danger mb-3">
+                <ul class="mb-0">
+                  <% @account.errors.each do |error| %>
+                    <li><%= error.message %></li>
+                  <% end %>
+                </ul>
+              </div>
+            <% end %>
             <h5 class="add-account-title">
                 <span class="icon-container">
                     <svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">

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

@@ -32,7 +32,7 @@
         <table id="existing-overdue-config-for-tenants" class="existing-overdue-config-for-tenants-table">
           <span class='label'>
           </span>
-          <% if @overdue.nil? || @overdue.has_states %>
+          <% if @overdue.nil? || @overdue.overdue_states.empty? || @overdue.has_states %>
             No overdue configuration defined for tenant
           <% else %>
             <thead>

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

@@ -10,6 +10,19 @@
           </span>
           Overdue Configuration
       </h5>
+      <% if @overdue_config_exists && can?(:config_upload, Kaui::AdminTenant) %>
+        <% overdue_delete_confirmation = t('admin_tenants.delete_overdue_config_confirmation') %>
+        <div class="form-group d-flex justify-content-end pb-3">
+          <%= form_tag(kaui_engine.admin_tenant_delete_overdue_config_path(id: @tenant.id), method: :delete, class: 'd-inline', onsubmit: "return confirm('#{j(overdue_delete_confirmation)}');") do %>
+            <%= render "kaui/components/button/button", {
+              label: 'Delete',
+              variant: "d-inline-flex align-items-center gap-1",
+              type: "submit",
+              html_class: "kaui-button delete-button custom-hover"
+            } %>
+          <% end %>
+        </div>
+      <% end %>
       <div class="form-group d-flex pb-3">
         <label class="col-sm-1 control-label">Type</label>
         <div class="toggle-segment col-sm-9">

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

@@ -6,7 +6,7 @@
           <span class="icon-container">
             <%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
           </span>
-          Advance Search
+          Advanced Search
         </h5>
         <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">
@@ -28,9 +28,23 @@
             <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>
+          <div id="save-search-container" style="display: none;">
+            <hr class="mt-4 mb-3">
+            <div class="form-group d-flex align-items-center mb-0">
+              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;">Save As Name</label>
+              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="Enter a name for this search...">
+            </div>
+          </div>
         </form>
       </div>
       <div class="modal-footer">
+        <%= render "kaui/components/button/button", {
+          label: 'Save Search As...',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-button custom-hover",
+          html_options: { id: "saveAdvanceSearch" }
+        } %>
         <%= render "kaui/components/button/button", {
           label: 'Clear Search',
           variant: "outline-secondary d-inline-flex align-items-center gap-1",

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

@@ -11,7 +11,7 @@
           </div>
           <span class="d-flex align-items-center gap-2">
             <%= render "kaui/components/button/button", {
-                  label: "Advance Search",
+                  label: "Advanced Search",
                   icon: "kaui/search.svg",
                   variant: "outline-secondary d-inline-flex align-items-center gap-1",
                   type: "button",
@@ -23,6 +23,13 @@
                     }
                   }
                 } %>
+            <%= render "kaui/components/menu_dropdown/menu_dropdown", {
+                  label: "Saved Searches",
+                  icon: "kaui/save.svg",
+                  variant: "btn btn-outline-secondary d-inline-flex align-items-center gap-1 kaui-button custom-hover",
+                  dropdown_id: "savedSearchesDropdown",
+                  menu_items: []
+                } %>
             <% 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", {

data/app/views/kaui/components/menu_dropdown/_menu_dropdown.html.erb

@@ -1,4 +1,4 @@
-<% variant ||= "btn-primary" %>
+<% variant ||= "btn btn-primary" %>
 <% type ||= "button" %>
 <% label ||= "Submit" %>
 <% icon ||= nil %>
@@ -11,7 +11,7 @@
 <div class="dropdown dropdown-menu-end position-relative" id="<%= dropdown_id %>_wrapper">
   <%= tag.button raw("#{icon_html}#{label}"),
       type: type,
-      class: "btn kaui-dropdown custom-hover #{variant} #{html_class}",
+      class: "#{variant} #{html_class}",
       id: "#{dropdown_id}_button",
       aria: { expanded: "false" } %>
 

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

@@ -6,7 +6,7 @@
           <span class="icon-container">
             <%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
           </span>
-          Advance Search
+          Advanced Search
         </h5>
         <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">
@@ -35,6 +35,13 @@
           </div>
           <div id="search-fields-container">
           </div>
+          <div id="save-search-container" style="display: none;">
+            <hr class="mt-4 mb-3">
+            <div class="form-group d-flex align-items-center mb-0">
+              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;">Save As Name</label>
+              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="Enter a name for this search...">
+            </div>
+          </div>
         </form>
         <% unless @account.account_id.present? %>
           <div class="alert alert-info" role="alert">
@@ -43,6 +50,15 @@
         <% end %>
       </div>
       <div class="modal-footer">
+        <%= render "kaui/components/button/button", {
+          label: 'Save Search As...',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-button custom-hover",
+          html_options: {
+            id: "saveAdvanceSearch"
+          }
+        } %>
         <%= render "kaui/components/button/button", {
           label: 'Clear Search',
           variant: "outline-secondary d-inline-flex align-items-center gap-1",
@@ -92,6 +108,7 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
+
   populateSearchLabelsFromUrl();
   var dateFields = ['Invoice date', 'Target date'];
   // Handle the "Add" button click to add new search fields
@@ -123,15 +140,36 @@ $(document).ready(function() {
     var searchLabelsContainer = $('#search-labels-container');
     searchLabelsContainer.empty();
 
+    // Validate that at least one search field has a value
+    var hasValue = false;
+    searchFields.each(function() {
+      var value = $(this).find('.search-field-value').val().trim();
+      if (value !== '') {
+        hasValue = true;
+        return false; // Break the loop
+      }
+    });
+
+    // If no search field has a value, show an alert and prevent search
+    if (!hasValue) {
+      alert('Please enter a value for at least one search field.');
+      return;
+    }
+
     var table = $('#invoices-table').DataTable();
-    table.on('preXhr.dt', function(e, settings, data) {
+    table.off('preXhr.dt.filter');
+    table.on('preXhr.dt.filter', function(e, settings, data) {
       data.search.value = searchQuery("<%= @search_query.to_s %>");
     });
 
-    table.ajax.url("<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>").load();
+    var searchParams = searchQuery("<%= @search_query.to_s %>");
+    var ajaxUrl = "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>";
+    if (searchParams) {
+      ajaxUrl += (ajaxUrl.includes('?') ? '&' : '?') + searchParams;
+    }
+    table.ajax.url(ajaxUrl).load();
 
     // Update the URL with the search parameters
-    var searchParams = searchQuery("<%= @search_query.to_s %>");
     if (searchParams) {
       searchParams = searchParams.replace(/account_id/g, 'ac_id');
       var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + searchParams;

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

@@ -1,8 +1,8 @@
 <div class="d-flex">
 <div class="filter-bar-container">
-  <div class="filter-bar">
+  <div class="filter-bar d-flex gap-2">
     <%= render "kaui/components/button/button", {
-      label: "Advance Search",
+      label: "Advanced Search",
       icon: "kaui/search.svg",
       variant: "outline-secondary d-inline-flex align-items-center gap-1",
       type: "button",
@@ -14,7 +14,13 @@
         }
       }
     } %>
-
+    <%= render "kaui/components/menu_dropdown/menu_dropdown", {
+      label: "Saved Searches",
+      icon: "kaui/save.svg",
+      variant: "btn btn-outline-secondary d-inline-flex align-items-center gap-1 kaui-button custom-hover",
+      dropdown_id: "savedSearchesDropdown",
+      menu_items: []
+    } %>
   </div>
 </div>
 
@@ -213,13 +219,6 @@ $(document).ready(function() {
     return new bootstrap.Dropdown(dropdownToggleEl);
   });
 
-  // Manual dropdown toggle as fallback
-  $('#dropdownMenu1').on('click', function(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    $('#column-visibility').toggleClass('show');
-  });
-
   $('.dropdown-menu').on('click', 'input[type="checkbox"], label', function(event) {
     event.stopPropagation();
   });

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

@@ -50,7 +50,7 @@ $(document).ready(function() {
     }
   });
 
-  var stateKey = 'DataTables_invoices-table_' + window.location.pathname.replace(/\//g, '_');
+  var stateKey = 'DataTables_invoices-table';
   var state = JSON.parse(localStorage.getItem(stateKey));
   if (state) {
     state.start = <%= @offset %>;
@@ -64,10 +64,10 @@ $(document).ready(function() {
     },
     "stateSave": true,
     "stateSaveCallback": function(settings, data) {
-      localStorage.setItem('DataTables_invoices-table', JSON.stringify(data));
+      localStorage.setItem(stateKey, JSON.stringify(data));
     },
     "stateLoadCallback": function(settings) {
-      return JSON.parse(localStorage.getItem('DataTables_invoices-table'));
+      return JSON.parse(localStorage.getItem(stateKey));
     },
     "scrollX": true,
     "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
@@ -102,6 +102,18 @@ $(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;
+    table.on('preXhr.dt.filter', function(e, settings, data) {
+      data.search.value = urlSearch;
+    });
+    table.ajax.url(ajaxUrl).load();
+  }
+
   // Custom sorting functionality
   var currentSortColumn = invoiceDateColIndex;
   var currentSortDirection = 'desc';

data/app/views/kaui/layouts/kaui_application.html.erb

@@ -1,15 +1,15 @@
 <!DOCTYPE html>
 <html>
 <%= render :template => 'kaui/layouts/kaui_header' %>
-    <body>
-        <% if user_signed_in? -%>
-            <%= render :template => 'kaui/layouts/kaui_navbar' %>
-        <% end %>
+  <body>
+    <% if user_signed_in? -%>
+      <%= render :template => 'kaui/layouts/kaui_navbar' %>
+    <% end %>
 
-        <div class="container-fluid auth-container">
-            <%= render :template => 'kaui/layouts/kaui_flash' %>
-            <%= yield %>
-        </div>
-        <%= render :template => 'kaui/layouts/kaui_footer' %>
-    </body>
+    <div class="container-fluid auth-container">
+      <%= render :template => 'kaui/layouts/kaui_flash' %>
+      <%= yield %>
+    </div>
+    <%= render :template => 'kaui/layouts/kaui_footer' %>
+  </body>
 </html>

data/app/views/kaui/layouts/kaui_flash.html.erb

@@ -12,28 +12,7 @@
       </div>
     </div>
   <% end %>
-<% end %> 
-
-
-<% if defined?(@account)  %>
-<% if @account.errors.any? %>
-  <div class="server-alert kaui-container centered-absolute">
-    <h3 class="error-title">The following errors prevented the account from being created:</h3>
-    <div class="custom-alert custom-alert-danger">
-      <i class="bi bi-exclamation-triangle-fill"></i>
-      <ul>
-        <% @account.errors.values.flatten.each do |msg| %>
-          <li><%= msg %></li>
-        <% end %>
-      </ul>
-    </div>
-  </div>
 <% end %>
-<% end %>
-
-
-
-
 
 <% if flash[:warning] %>
   <div id="flash-warning" class="server-alert kaui-container centered-absolute">
@@ -89,21 +68,21 @@
       $('#flash-notice').fadeOut(500);
     }, 3000);
   });
-  
+
   // Function to close flash messages
   function closeFlashMessage(type) {
     $('#flash-' + type).fadeOut(500);
   }
-  
+
   // Function to show ajax info alert with auto-hide
   function ajaxInfo(message, timeout) {
     if (typeof timeout === 'undefined') {
       timeout = 3000; // Default to 3 seconds
     }
-    
+
     $('#ajaxInfoAlertMessage').text(message);
     $('#ajaxInfoAlert').fadeIn(300);
-    
+
     // Auto-hide after specified timeout
     setTimeout(function() {
       $('#ajaxInfoAlert').fadeOut(500);
@@ -118,4 +97,4 @@
       $('#ajaxInfoAlert').fadeOut(500);
     }
   }
-</script>
+</script>

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

@@ -1,8 +1,8 @@
 <div class="d-flex">
 <div class="filter-bar-container">
-  <div class="filter-bar">
+  <div class="filter-bar d-flex gap-2">
     <%= render "kaui/components/button/button", {
-      label: "Advance Search",
+      label: "Advanced Search",
       icon: "kaui/search.svg",
       variant: "outline-secondary d-inline-flex align-items-center gap-1",
       type: "button",
@@ -14,6 +14,13 @@
         }
       }
     } %>
+    <%= render "kaui/components/menu_dropdown/menu_dropdown", {
+      label: "Saved Searches",
+      icon: "kaui/save.svg",
+      variant: "btn btn-outline-secondary d-inline-flex align-items-center gap-1 kaui-button custom-hover",
+      dropdown_id: "savedSearchesDropdown",
+      menu_items: []
+    } %>
   </div>
 </div>
 
@@ -212,13 +219,6 @@ $(document).ready(function() {
     return new bootstrap.Dropdown(dropdownToggleEl);
   });
 
-  // Manual dropdown toggle as fallback
-  $('#dropdownMenu1').on('click', function(e) {
-    e.preventDefault();
-    e.stopPropagation();
-    $('#column-visibility').toggleClass('show');
-  });
-
   $('.dropdown-menu').on('click', 'input[type="checkbox"], label', function(event) {
     event.stopPropagation();
   });

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

@@ -7,7 +7,7 @@
           <span class="icon-container">
             <%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
           </span>
-          Advance Search
+          Advanced Search
         </h5>
         <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
           <span aria-hidden="true">
@@ -36,9 +36,25 @@
           </div>
           <div id="search-fields-container">
           </div>
+          <div id="save-search-container" style="display: none;">
+            <hr class="mt-4 mb-3">
+            <div class="form-group d-flex align-items-center mb-0">
+              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;">Save As Name</label>
+              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="Enter a name for this search...">
+            </div>
+          </div>
         </form>
       </div>
       <div class="modal-footer">
+        <%= render "kaui/components/button/button", {
+          label: 'Save Search As...',
+          variant: "outline-secondary d-inline-flex align-items-center gap-1",
+          type: "button",
+          html_class: "kaui-button custom-hover",
+          html_options: {
+            id: "saveAdvanceSearch"
+          }
+        } %>
         <%= render "kaui/components/button/button", {
           label: 'Clear Search',
           variant: "outline-secondary d-inline-flex align-items-center gap-1",
@@ -87,6 +103,7 @@
 
 <%= javascript_tag do %>
 $(document).ready(function() {
+
   populateSearchLabelsFromUrl();
 
   // Handle the "Add" button click to add new search fields
@@ -117,15 +134,36 @@ $(document).ready(function() {
     var searchLabelsContainer = $('#search-labels-container');
     searchLabelsContainer.empty();
 
+    // Validate that at least one search field has a value
+    var hasValue = false;
+    searchFields.each(function() {
+      var value = $(this).find('.search-field-value').val().trim();
+      if (value !== '') {
+        hasValue = true;
+        return false; // Break the loop
+      }
+    });
+
+    // If no search field has a value, show an alert and prevent search
+    if (!hasValue) {
+      alert('Please enter a value for at least one search field.');
+      return;
+    }
+
     var table = $('#payments-table').DataTable();
-    table.on('preXhr.dt', function(e, settings, data) {
+    table.off('preXhr.dt.filter');
+    table.on('preXhr.dt.filter', function(e, settings, data) {
       data.search.value = searchQuery("<%= @search_query.to_s %>");
     });
 
-    table.ajax.url("<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>").load();
+    var searchParams = searchQuery("<%= @search_query.to_s %>");
+    var ajaxUrl = "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>";
+    if (searchParams) {
+      ajaxUrl += (ajaxUrl.includes('?') ? '&' : '?') + searchParams;
+    }
+    table.ajax.url(ajaxUrl).load();
 
     // Update the URL with the search parameters
-    var searchParams = searchQuery("<%= @search_query.to_s %>");
     if (searchParams) {
       searchParams = searchParams.replace(/account_id/g, 'ac_id');
       var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + searchParams;

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

@@ -117,6 +117,18 @@ $(document).ready(function() {
     "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;
+    table.on('preXhr.dt.filter', function(e, settings, data) {
+      data.search.value = urlSearch;
+    });
+    table.ajax.url(ajaxUrl).load();
+  }
+
   // Custom sorting functionality
   var currentSortColumn = -1;
   var currentSortDirection = 'asc';

data/config/locales/en.yml

@@ -50,6 +50,8 @@ en:
       clock_reset_successfully: 'Clock was successfully reset'
       overdue_uploaded_successfully: 'Overdue config was successfully uploaded'
       overdue_added_successfully: 'Overdue config was successfully added'
+      overdue_updated_successfully: 'Overdue config was successfully updated'
+      overdue_deleted_successfully: 'Overdue config was successfully deleted'
       invoice_template_uploaded_successfully: 'Invoice template was successfully uploaded'
       invoice_translation_uploaded_successfully: 'Invoice translation was successfully uploaded'
       catalog_translation_uploaded_successfully: 'Catalog translation was successfully uploaded'
@@ -84,3 +86,4 @@ en:
 
   admin_tenants:
     clock_warning: "This action will affect all tenants across the system. Proceed with caution."
+    delete_overdue_config_confirmation: "This action is irreversible and will permanently delete the overdue configuration for this tenant. Are you sure you want to continue?"

data/config/routes.rb

@@ -189,6 +189,7 @@ Kaui::Engine.routes.draw do
     delete '/:id/delete_catalog' => 'admin_tenants#delete_catalog', :as => 'admin_tenant_delete_catalog'
     get '/:id/new_plan_currency' => 'admin_tenants#new_plan_currency', :as => 'admin_tenant_new_plan_currency'
     get '/:id/new_overdue_config' => 'admin_tenants#new_overdue_config', :as => 'admin_tenant_new_overdue_config'
+    delete '/:id' => 'admin_tenants#delete_overdue_config', :as => 'admin_tenant_delete_overdue_config'
     post '/upload_catalog' => 'admin_tenants#upload_catalog', :as => 'admin_tenant_upload_catalog'
     post '/display_catalog_xml' => 'admin_tenants#display_catalog_xml', :as => 'admin_tenant_display_catalog_xml'
     post '/display_overdue_xml' => 'admin_tenants#display_overdue_xml', :as => 'admin_tenant_display_overdue_xml'

data/lib/kaui/error_handler.rb

@@ -26,7 +26,8 @@ module Kaui
     end
 
     def perform_redirect_after_error(error:, error_message:, redirect: true)
-      account_id = nested_hash_value(params.permit!.to_h, :account_id)
+      account_id = request.path_parameters[:account_id].presence || nested_hash_value(params.permit!.to_h, :account_id)
+      account_id = nil unless account_id.is_a?(String) || account_id.is_a?(Numeric)
       home_path = kaui_engine.home_path
       redirect_path = if redirect && account_id.present?
                         kaui_engine.account_path(account_id)

data/lib/kaui/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.13
+  version: 4.0.15
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-15 00:00:00.000000000 Z
+date: 2026-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -341,6 +341,7 @@ files:
 - app/assets/images/kaui/payment/payment.svg
 - app/assets/images/kaui/payment/refund.svg
 - app/assets/images/kaui/plus.svg
+- app/assets/images/kaui/save.svg
 - app/assets/images/kaui/search.png
 - app/assets/images/kaui/search.svg
 - app/assets/images/kaui/search_white.png