kaui 4.0.14 → 4.0.16

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

@@ -0,0 +1,253 @@
+<% modal_class ||= "" %>
+<% search_fields ||= [] %>
+<% date_fields ||= [] %>
+<% number_fields ||= [] %>
+<% search_query ||= "" %>
+<% balance_notice ||= false %>
+
+<div class="modal fade kaui-advanced-search-modal <%= modal_class %>" id="advanceSearchModal" tabindex="-1" role="dialog" aria-labelledby="advanceSearchModalLabel" aria-hidden="true"
+     data-save-search-label="<%= t('advanced_search.actions.save_search_as') %>"
+     data-save-label="<%= t('advanced_search.actions.save') %>"
+     data-empty-value-message="<%= t('advanced_search.validation.empty_value') %>"
+     data-missing-field-message="<%= t('advanced_search.validation.missing_field') %>">
+  <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>
+          <%= t('advanced_search.title') %>
+        </h5>
+        <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="<%= t('advanced_search.actions.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="advanced-search-builder">
+            <div class="advanced-search-group">
+              <div id="search-fields-container" class="advanced-search-rules">
+              </div>
+            </div>
+            <button type="button" class="advanced-search-add-rule custom-hover" id="addSearchField">
+              <%= image_tag("kaui/modal/plus.svg", width: 16, height: 16) %>
+              <span><%= t('advanced_search.actions.add_search') %></span>
+            </button>
+          </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%;"><%= t('advanced_search.save_as_name') %></label>
+              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="<%= t('advanced_search.save_name_placeholder') %>">
+            </div>
+          </div>
+        </form>
+        <% if balance_notice %>
+          <div class="alert alert-info advanced-search-alert" role="alert" style="margin-top: 30px;">
+            <%= t('advanced_search.balance_notice') %>
+          </div>
+        <% end %>
+      </div>
+      <div class="modal-footer">
+        <div class="advanced-search-footer-left">
+          <%= render "kaui/components/button/button", {
+            label: t('advanced_search.actions.save_search_as'),
+            variant: "advanced-search-button advanced-search-button-secondary d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "custom-hover",
+            html_options: {
+              id: "saveAdvanceSearch"
+            }
+          } %>
+        </div>
+        <div class="advanced-search-footer-right">
+          <%= render "kaui/components/button/button", {
+            label: t('advanced_search.actions.clear_search'),
+            variant: "advanced-search-button advanced-search-button-ghost d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "custom-hover",
+            html_options: {
+              id: "clearAdvanceSearch"
+            }
+          } %>
+          <%= render "kaui/components/button/button", {
+            label: t('advanced_search.actions.apply_search'),
+            variant: "advanced-search-button advanced-search-button-primary d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "custom-hover",
+            html_options: {
+              id: "applyAdvanceSearch"
+            }
+          } %>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<template id="search-field-template">
+  <div class="search-field">
+    <div class="advanced-search-rule-row">
+      <select class="form-control search-field-name" aria-label="<%= t('advanced_search.search_field') %>">
+        <option value="" selected><%= t('advanced_search.select_placeholder') %></option>
+        <% search_fields.each do |value, title| %>
+          <option value="<%= value %>"><%= title %></option>
+        <% end %>
+      </select>
+      <select class="form-control search-field-filter" aria-label="<%= t('advanced_search.compare_operation') %>">
+        <option value="eq"><%= t('advanced_search.operators.eq') %></option>
+        <option value="neq"><%= t('advanced_search.operators.neq') %></option>
+        <option value="gt"><%= t('advanced_search.operators.gt') %></option>
+        <option value="gte"><%= t('advanced_search.operators.gte') %></option>
+        <option value="lt"><%= t('advanced_search.operators.lt') %></option>
+        <option value="lte"><%= t('advanced_search.operators.lte') %></option>
+        <option value="like"><%= t('advanced_search.operators.like') %></option>
+      </select>
+      <input type="text" class="form-control search-field-value" aria-label="<%= t('advanced_search.search_value') %>">
+      <button type="button" class="button custom-hover remove-search-field" aria-label="<%= t('advanced_search.actions.remove_search') %>">
+        <%= image_tag("kaui/modal/red-close.svg", width: 16, height: 16) %>
+      </button>
+    </div>
+  </div>
+</template>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+
+  populateSearchLabelsFromUrl();
+  var dateFields = <%= raw date_fields.to_json %>;
+  var numberFields = <%= raw number_fields.to_json %>;
+  var emptyValueMessage = $('#advanceSearchModal').data('empty-value-message');
+  var missingFieldMessage = $('#advanceSearchModal').data('missing-field-message');
+
+  function updateSearchFieldRow(searchField) {
+    var selectedField = searchField.find('.search-field-name option:selected').text().trim();
+    var selectedValue = searchField.find('.search-field-name').val();
+    var valueInput = searchField.find('.search-field-value');
+
+    if (!selectedValue) {
+      searchField.find('.search-field-filter').attr('name', '');
+      valueInput.attr('name', '').attr('type', 'text');
+      return;
+    }
+
+    searchField.find('.search-field-filter').attr('name', selectedField + 'Filter');
+    valueInput.attr('name', selectedField);
+
+    if (dateFields.includes(selectedField)) {
+      valueInput.attr('type', 'date');
+    } else if (numberFields.includes(selectedField)) {
+      valueInput.attr('type', 'number');
+    } else {
+      valueInput.attr('type', 'text');
+    }
+  }
+
+  function addSearchField() {
+    var template = document.getElementById('search-field-template').content.cloneNode(true);
+    document.getElementById('search-fields-container').appendChild(template);
+    updateSearchFieldRow($('#search-fields-container .search-field:last'));
+  }
+
+  $('#addSearchField').on('click', function() {
+    addSearchField();
+  });
+
+  $('#search-fields-container').on('change', '.search-field-name', function() {
+    updateSearchFieldRow($(this).closest('.search-field'));
+  });
+
+  $('#applyAdvanceSearch').on('click', function() {
+    var searchFields = $('.search-field');
+    var searchLabelsContainer = $('#search-labels-container');
+
+    var hasValue = false;
+    var hasMissingField = false;
+    searchFields.each(function() {
+      var value = $(this).find('.search-field-value').val().trim();
+      if (value !== '') {
+        hasValue = true;
+        if (!$(this).find('.search-field-name').val()) {
+          hasMissingField = true;
+        }
+      }
+    });
+
+    if (!hasValue) {
+      alert(emptyValueMessage);
+      return;
+    }
+
+    if (hasMissingField) {
+      alert(missingFieldMessage);
+      return;
+    }
+
+    searchLabelsContainer.empty();
+
+    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 %>');
+    });
+
+    var searchParams = searchQuery('<%= j search_query.to_s %>');
+    var ajaxUrl = "<%= pagination_path %>";
+    if (searchParams) {
+      ajaxUrl += (ajaxUrl.includes('?') ? '&' : '?') + searchParams;
+    }
+    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;
+      window.history.pushState({ path: newUrl }, '', newUrl);
+    }
+
+    searchFields.each(function() {
+      var filter = $(this).find('.search-field-filter option:selected').text().trim();
+      var value = $(this).find('.search-field-value').val().trim();
+      var columnName = $(this).find('.search-field-name option:selected').text().trim();
+
+      if (value !== '') {
+        var label = $('<span>', {
+          class: 'label label-info d-inline-flex align-items-center gap-2',
+          'data-field': columnName,
+          'data-filter': filter,
+          'data-value': value
+        });
+        var labelText = $('<span>', { text: columnName + ' [' + filter + '] ' + value });
+        var closeIcon = $('<span>', {
+          class: '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>');
+        label.append(labelText).append(closeIcon);
+        searchLabelsContainer.append(label);
+      }
+    });
+
+    $('#advanceSearchModal').modal('hide');
+  });
+
+  $('#advanceSearchModal').on('show.bs.modal', function() {
+    showAdvanceSearchModal();
+    if ($('#search-fields-container .search-field').length === 0) {
+      addSearchField();
+    }
+    $('#search-fields-container .search-field').each(function() {
+      updateSearchFieldRow($(this));
+    });
+  });
+
+  $('#clearAdvanceSearch').on('click', function() {
+    clearAdvanceSearch();
+  });
+
+  $('#search-fields-container').on('click', '.remove-search-field', function() {
+    $(this).closest('.search-field').remove();
+  });
+});
+<% end %>

data/config/locales/en.yml

@@ -44,6 +44,36 @@ en:
   loading_data_from_server: "Loading data from server"
   requested_amount_colon: "Requested amount: "
 
+  advanced_search:
+    title: "Advanced Search"
+    search_field: "Search field"
+    search_value: "Search value"
+    value_placeholder: "Enter search value..."
+    compare_operation: "Compare operation"
+    save_as_name: "Save As Name"
+    save_name_placeholder: "Enter a name for this search..."
+    select_placeholder: "-- Select --"
+    balance_notice: "* The Balance option won't work alongside other filters. If you search using Balance, all other filters will be ignored."
+    actions:
+      add_search: "Add Search"
+      apply_search: "Apply Search"
+      clear_search: "Clear Search"
+      close: "Close"
+      remove_search: "Remove search"
+      save: "Save"
+      save_search_as: "Save Search As..."
+    operators:
+      eq: "Equals"
+      neq: "Not Equals"
+      gt: "Greater Than"
+      gte: "Greater Than Or Equal"
+      lt: "Less Than"
+      lte: "Less Than Or Equal"
+      like: "Like"
+    validation:
+      empty_value: "Please enter a value for at least one search field."
+      missing_field: "Please select a search field for each rule with a value."
+
   flashes:
     notices:
       clock_updated_successfully: "Clock was successfully updated to %{new_date}"
@@ -51,6 +81,7 @@ en:
       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'
@@ -85,3 +116,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

@@ -25,7 +25,7 @@ Kaui::Engine.routes.draw do
   get '/500', to: 'errors#show', code: 500
 
   scope '/accounts' do
-    get '/pagination' => 'accounts#pagination', :as => 'accounts_pagination'
+    post '/pagination' => 'accounts#pagination', :as => 'accounts_pagination'
     get '/validate_external_key' => 'accounts#validate_external_key', :as => 'accounts_validate_external_key'
     get '/download' => 'accounts#download', :as => 'download_accounts'
     get '/export/:account_id', to: 'accounts#export_account', as: 'export_account'
@@ -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.14'
+  VERSION = '4.0.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 4.0.14
+  version: 4.0.16
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-04-28 00:00:00.000000000 Z
+date: 2026-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -644,6 +644,7 @@ files:
 - app/views/kaui/role_definitions/new.html.erb
 - app/views/kaui/sessions/_form.html.erb
 - app/views/kaui/sessions/new.html.erb
+- app/views/kaui/shared/_advanced_search_filterbar.html.erb
 - app/views/kaui/subscriptions/_cancel_by_date_modal.html.erb
 - app/views/kaui/subscriptions/_edit_form.html.erb
 - app/views/kaui/subscriptions/_form.html.erb