kaui 3.0.5 → 3.0.7

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

@@ -0,0 +1,190 @@
+<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" id="advanceSearchModalLabel">Advance Search</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</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" style="width: 30%;">Search Fields:</label>
+            <select id="searchFieldSelect" class="form-control mr-2">
+              <% if @account.account_id.present? %>
+                <% @search_fields.reject { |value, _| value == 'account_id' }.each do |value, title| %>
+                  <option value="<%= value %>"><%= title %></option>
+                <% end %>
+              <% else %>
+                <% @search_fields.each do |value, title| %>
+                  <option value="<%= value %>"><%= title %></option>
+                <% end %>
+              <% end %>
+            </select>
+            <button type="button" class="btn btn-secondary" id="addSearchField">Add</button>
+          </div>
+          <div id="search-fields-container">
+          </div>
+        </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" id="applyAdvanceSearch">Apply Search</button>
+        <button type="button" class="btn btn-danger" id="clearAdvanceSearch">Clear Search</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<template id="search-field-template">
+  <div class="form-group row align-items-center search-field">
+    <label class="col-sm-4 col-form-label search-field-label"></label>
+    <div class="col-sm-3">
+      <select class="form-control search-field-filter">
+        <option value="eq">Equals</option>
+        <option value="neq">Not Equals</option>
+        <option value="gt">Greater Than</option>
+        <option value="gte">Greater Than Or Equal</option>
+        <option value="lt">Less Than</option>
+        <option value="lte">Less Than Or Equal</option>
+        <option value="like">Like</option>
+      </select>
+    </div>
+    <div class="col-sm-4">
+      <input type="text" class="form-control search-field-value">
+    </div>
+    <div class="col-sm-1">
+      <i class="glyphicon glyphicon-remove" id=remove-search-field></i>
+    </div>
+  </div>
+</template>
+
+<style>
+  .form-group.row.align-items-center {
+    display: flex;
+    align-items: center;
+  }
+
+  .form-group.row.align-items-center label {
+    margin-bottom: 0; /* Remove default margin */
+  }
+
+  .form-group.row.align-items-center .form-control {
+    margin-right: 10px; /* Add some space between elements */
+  }
+
+  .form-group.d-flex {
+    display: flex;
+    align-items: center;
+  }
+
+  .form-group.d-flex label {
+    margin-bottom: 0; /* Remove default margin */
+  }
+
+  .form-group.d-flex .form-control {
+    margin-right: 10px; /* Add some space between the select box and the button */
+  }
+
+  #search-labels-container .label {
+    margin-left: 5px; /* Add space between labels */
+    margin-bottom: 5px; /* Add space below labels if they wrap to the next line */
+    color: white;
+  }
+
+  .filter-bar-container {
+    display: flex;
+    justify-content: flex-start; /* Align items to the left */
+    align-items: center; /* Center items vertically */
+  }
+
+  .filter-bar {
+    display: flex;
+    align-items: center; /* Center items vertically */
+  }
+
+  .filter-bar label {
+    margin: 10px; /* Add some space between the label and the select box */
+  }
+</style>
+
+<%= javascript_tag do %>
+$(document).ready(function() {
+  populateSearchLabelsFromUrl();
+
+  // Handle the "Add" button click to add new search fields
+  $('#addSearchField').on('click', function() {
+    var selectedField = $('#searchFieldSelect option:selected').text();
+    var template = document.getElementById('search-field-template').content.cloneNode(true);
+
+    // Set the label and input names based on the selected field
+    template.querySelector('.search-field-label').textContent = selectedField.replace(/([A-Z])/g, ' $1').trim();
+    template.querySelector('.search-field-filter').name = selectedField + 'Filter';
+
+    // Check if the field should use a date input
+    var dateFields = ['Invoice date', 'Target date'];
+    if (dateFields.includes(selectedField)) {
+      template.querySelector('.search-field-value').type = 'date';
+    } else {
+      template.querySelector('.search-field-value').type = 'text';
+    }
+    template.querySelector('.search-field-value').name = selectedField;
+
+    // Append the new search field to the container
+    document.getElementById('search-fields-container').appendChild(template);
+  });
+
+  // Handle the "Apply Search" button click inside the modal
+  $('#applyAdvanceSearch').on('click', function() {
+    var searchFields = $('.search-field');
+    var searchLabelsContainer = $('#search-labels-container');
+    searchLabelsContainer.empty();
+
+    var table = $('#payments-table').DataTable();
+    table.on('preXhr.dt', function(e, settings, data) {
+      data.search.value = searchQuery("<%= @search_query.to_s %>");
+    });
+
+    table.ajax.url("<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>").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;
+      window.history.pushState({ path: newUrl }, '', newUrl);
+    }
+
+    searchFields.each(function() {
+      var filter = $(this).find('.search-field-filter option:selected').text();
+      var value = $(this).find('.search-field-value').val();
+      var columnName = $(this).find('.search-field-filter').attr('name').replace('Filter', '');
+
+      // Create and append the search label
+      if (value !== '') {
+        var label = $('<span>', {
+          class: 'label label-info',
+          text: columnName + ' [' + filter + '] ' + value
+        });
+      }
+      searchLabelsContainer.append(label);
+    });
+    $('#advanceSearchModal').modal('hide');
+  });
+
+  // Populate the modal with the current filters when it is shown
+  $('#advanceSearchModal').on('show.bs.modal', function() {
+    showAdvanceSearchModal();
+  });
+
+   $('#clearAdvanceSearch').on('click', function() {
+    clearAdvanceSearch();
+  });
+
+  // Handle the remove icon click event to remove search fields
+  $('#search-fields-container').on('click', '#remove-search-field', function() {
+    $(this).closest('.search-field').remove();
+  });
+});
+<% end %>

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

@@ -57,7 +57,7 @@ $(document).ready(function() {
       "pageLength": <%= @limit %>,
       "displayStart": <%= @offset %>,
       "ajax": {
-        url: "<%= payments_pagination_path(:ordering => @ordering, :format => :json) %>",
+        url: "<%= payments_pagination_path(:ordering => @ordering, :format => :json, :advance_search_query => @advance_search_query) %>",
         dataSrc: function(json) {
           var colOrder = $('#payments-table').DataTable().colReorder.order();
           var reorderedData = json.data.map(function(row) {
@@ -75,7 +75,10 @@ $(document).ready(function() {
       "dom": "t",
       "paging": false,
       "ajax": {
-        url: "<%= payments_pagination_path(:format => :json) %>",
+        url: "<%= payments_pagination_path(:format => :json, :advance_search_query => @advance_search_query) %>",
+        data: function(d) {
+          d.colum_order = $('#payments-table').DataTable().colReorder.order();
+        },
         dataSrc: function(json) {
           var colOrder = $('#payments-table').DataTable().colReorder.order();
           var reorderedData = json.data.map(function(row) {
@@ -100,14 +103,15 @@ $(document).ready(function() {
   });
 
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->
-  <% if @max_nb_records.nil? %>
-      $('#payments-table').on('draw.dt', function() {
+  $('#payments-table').on('draw.dt', function() {
+    <% if @max_nb_records.nil? %>
       var noMoreData = table.column(0)
                             .data()
                             .length == 0;
       $(".next.paginate_button").toggleClass("disabled", noMoreData);
       $(".dataTables_info").toggle(!noMoreData);
-    });
-  <% end %>
+    <% end %>
+    populateSearchLabelsFromUrl();
+  });
 });
 <% end %>

data/lib/kaui/engine.rb

@@ -14,7 +14,6 @@ require 'bootstrap-datepicker-rails'
 require 'json'
 require 'money-rails'
 require 'killbill_client'
-require 'kenui'
 require 'devise'
 require 'cancan'
 require 'country_select'

data/lib/kaui/version.rb

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

data/lib/kaui.rb

@@ -142,8 +142,10 @@ module Kaui
         invoice&.send(attr.downcase)
       end
     end
-    # Add additional values if needed
-    [headers, values]
+
+    raw_data = fields.map { |attr| invoice&.send(attr.downcase) }
+
+    [headers, values, raw_data]
   end
 
   self.account_payments_columns = lambda do |account = nil, payment = nil, view_context = nil|
@@ -177,8 +179,17 @@ module Kaui
       end
     end
 
+    raw_data = fields.map do |attr|
+      case attr
+      when 'status'
+        payment.transactions.empty? ? nil : payment.transactions[-1].status
+      else
+        payment&.send(attr.downcase)
+      end
+    end
+
     # Add additional values if needed
-    [headers, values]
+    [headers, values, raw_data]
   end
 
   self.account_audit_logs_columns = lambda do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kaui
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.0.7
 platform: ruby
 authors:
 - Kill Bill core team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-01-22 00:00:00.000000000 Z
+date: 2025-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -150,20 +150,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: kenui
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: killbill-assets-ui
   requirement: !ruby/object:Gem::Requirement
@@ -321,6 +307,7 @@ files:
 - app/assets/javascripts/application.js
 - app/assets/javascripts/kaui/kaui.js
 - app/assets/javascripts/kaui/kaui_override.js
+- app/assets/javascripts/kaui/multi_functions_bar_utils.js
 - app/assets/stylesheets/application.css
 - app/assets/stylesheets/kaui/account.css
 - app/assets/stylesheets/kaui/audit.css
@@ -424,6 +411,7 @@ files:
 - app/models/kaui/transaction.rb
 - app/models/kaui/user.rb
 - app/models/kaui/user_role.rb
+- app/services/dependencies/kenui.rb
 - app/views/kaui/account_children/index.html.erb
 - app/views/kaui/account_custom_fields/index.html.erb
 - app/views/kaui/account_emails/_account_emails_table.html.erb
@@ -435,6 +423,7 @@ files:
 - app/views/kaui/account_tags/index.html.erb
 - app/views/kaui/account_timelines/_multi_functions_bar.html.erb
 - app/views/kaui/account_timelines/show.html.erb
+- app/views/kaui/accounts/_account_filterbar.html.erb
 - app/views/kaui/accounts/_account_info.html.erb
 - app/views/kaui/accounts/_billing_info.html.erb
 - app/views/kaui/accounts/_close_account_modal.html.erb
@@ -502,6 +491,7 @@ files:
 - app/views/kaui/invoice_tags/_form.html.erb
 - app/views/kaui/invoice_tags/_form_bar.html.erb
 - app/views/kaui/invoice_tags/edit.html.erb
+- app/views/kaui/invoices/_invoice_filterbar.html.erb
 - app/views/kaui/invoices/_invoice_table.html.erb
 - app/views/kaui/invoices/_multi_functions_bar.html.erb
 - app/views/kaui/invoices/index.html.erb
@@ -520,6 +510,7 @@ files:
 - app/views/kaui/payment_methods/new.html.erb
 - app/views/kaui/payments/_form.html.erb
 - app/views/kaui/payments/_multi_functions_bar.html.erb
+- app/views/kaui/payments/_payment_filterbar.html.erb
 - app/views/kaui/payments/_payment_table.html.erb
 - app/views/kaui/payments/index.html.erb
 - app/views/kaui/payments/new.html.erb