kaui 3.0.4 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381a1791f9fc6c1d64886d34dca17905a83ec38322043735a2437d83d8516d35
-  data.tar.gz: ee79517525bb910a58c1996621171c0600c113e98215e016f283f5d3ee9d2c0e
+  metadata.gz: 4f1640604b51f6dc5c1d70ed464a59445fd16fc830d69797bb73c18a351db03f
+  data.tar.gz: b385394d51aed523a26d34b437a7e4f8f869de07447b18a0fcce3d81948e275f
 SHA512:
-  metadata.gz: bce25f97853968fb171263eb1513ca6588d4884e0045232880bc24bc10cd55057b36e72cd89a7ef86996c4c9ec045a0b37aa7f39a35c2c9dfe0137866e1d7255
-  data.tar.gz: 371aa14f4390357331e257e9735a1c4f2ac940069b041f7bf595f68c960fec3c3ca32af274ba39b3abf4047a5e8d789590bbb6b90b079a11236bd7ee1b89de1a
+  metadata.gz: ca50c69637a9fa3e7b7bd866ad3ac638bf676e8f8a61ff8b56e68eb7591f59fefa6536739b8c326523cf7013502586b23edc7fe62a08766e586cbcc73996aa07
+  data.tar.gz: 2ef386342bd738b4089d50dd1621c2e5e0542c37099435ef8a80f5419a30dd956d478ea3762a553b741985c5f6e1878686d502915b02b2f47f471d671ff11746

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

@@ -132,12 +132,7 @@ jQuery(document).ready(function ($) {
 
     function set_first_name_length(name){
         var name_in_parts = name.trim().split(' ');
-
-        if (name_in_parts.length > 1){
-            $('#account_first_name_length').val(name_in_parts[0].length);
-        }else{
-            $('#account_first_name_length').val('');
-        }
+        $('#account_first_name_length').val(name_in_parts[0].length);
     }
 
 

data/app/controllers/kaui/account_timelines_controller.rb

@@ -34,20 +34,16 @@ module Kaui
 
     def download
       timeline = Kaui::AccountTimeline.find_by_account_id(params.require(:account_id), 'FULL', options_for_klient)
-      start_date = params[:startDate]
-      end_date = params[:endDate]
       start_date = begin
-        Date.parse(start_date)
+        Date.parse(params[:startDate])
       rescue StandardError
         nil
       end
       end_date = begin
-        Date.parse(end_date)
+        Date.parse(params[:endDate])
       rescue StandardError
         nil
       end
-      start_date = params[:startDate].present? ? Date.parse(params[:startDate]) : nil
-      end_date = params[:endDate].present? ? Date.parse(params[:endDate]) : nil
 
       event_type = params[:eventType]
       @account = timeline.account

data/app/controllers/kaui/accounts_controller.rb

@@ -53,11 +53,16 @@ module Kaui
       end_date = params[:endDate]
       all_fields_checked = params[:allFieldsChecked] == 'true'
 
-      columns = if all_fields_checked
-                  KillBillClient::Model::AccountAttributes.instance_variable_get('@json_attributes')
-                else
-                  params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase }
-                end
+      if all_fields_checked
+        columns = KillBillClient::Model::AccountAttributes.instance_variable_get('@json_attributes')
+      else
+        columns = params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase }
+        Kaui::Account::REMAPPING_FIELDS.each do |k, v|
+          index = columns.index(v)
+          columns[index] = k if index
+        end
+      end
+
       start_date = begin
         Date.parse(start_date)
       rescue StandardError
@@ -130,12 +135,10 @@ module Kaui
       fetch_account_emails = promise { Kaui::AccountEmail.find_all_sorted_by_account_id(@account.account_id, 'NONE', cached_options_for_klient) }
       fetch_payments = promise { @account.payments(cached_options_for_klient).map! { |payment| Kaui::Payment.build_from_raw_payment(payment) } }
       fetch_payment_methods = promise { Kaui::PaymentMethod.find_all_by_account_id(@account.account_id, false, cached_options_for_klient) }
-
-      # is email notification plugin available
-      is_email_notifications_plugin_available = Kenui::EmailNotificationService.email_notification_plugin_available?(cached_options_for_klient).first
+      is_email_notifications_plugin_available = Dependencies::Kenui::EmailNotification.email_notification_plugin_available?(cached_options_for_klient).first
       fetch_email_notification_configuration = if is_email_notifications_plugin_available
                                                  promise do
-                                                   Kenui::EmailNotificationService.get_configuration_per_account(params.require(:account_id), cached_options_for_klient)
+                                                   Dependencies::Kenui::EmailNotification.get_configuration_per_account(params.require(:account_id), cached_options_for_klient)
                                                  end.then do |configuration|
                                                    if configuration.first.is_a?(FalseClass)
                                                      Rails.logger.warn(configuration[1])
@@ -170,7 +173,7 @@ module Kaui
       @available_tags = wait(fetch_available_tags)
       @children = wait(fetch_children)
       @account_parent = @account.parent_account_id.nil? ? nil : wait(fetch_parent)
-      @email_notification_configuration = wait(fetch_email_notification_configuration) if is_email_notifications_plugin_available
+      @email_notification_configuration = is_email_notifications_plugin_available ? wait(fetch_email_notification_configuration) : []
 
       @last_transaction_by_payment_method_id = {}
       wait(fetch_payments).each do |payment|
@@ -340,15 +343,15 @@ module Kaui
       event_types = configuration[:event_types]
       cached_options_for_klient = options_for_klient
 
-      is_success, message = email_notification_plugin_available?(cached_options_for_klient)
+      is_success, message = Dependencies::Kenui::EmailNotification.email_notification_plugin_available?(cached_options_for_klient)
 
       if is_success
-        is_success, message = Kenui::EmailNotificationService.set_configuration_per_account(account_id,
-                                                                                            event_types,
-                                                                                            current_user.kb_username,
-                                                                                            params[:reason],
-                                                                                            params[:comment],
-                                                                                            cached_options_for_klient)
+        is_success, message = Dependencies::Kenui::EmailNotification.set_configuration_per_account(account_id,
+                                                                                                   event_types,
+                                                                                                   current_user.kb_username,
+                                                                                                   params[:reason],
+                                                                                                   params[:comment],
+                                                                                                   cached_options_for_klient)
       end
       if is_success
         flash[:notice] = message
@@ -360,7 +363,7 @@ module Kaui
 
     def events_to_consider
       json_response do
-        { data: Kenui::EmailNotificationService.get_events_to_consider(options_for_klient) }
+        { data: Dependencies::Kenui::EmailNotification.get_events_to_consider(options_for_klient) }
       end
     end
 
@@ -368,16 +371,5 @@ module Kaui
       data = KillBillClient::Model::Export.find_by_account_id(params[:account_id], current_user.kb_username, options_for_klient)
       send_data data, filename: "account#{params[:account_id]}.txt", type: :txt
     end
-
-    private
-
-    def email_notification_plugin_available?(options_for_klient)
-      error_message = 'Email notification plugin is not installed'
-
-      is_available = Kenui::EmailNotificationService.email_notification_plugin_available?(options_for_klient).first
-      [is_available, is_available ? nil : error_message]
-    rescue StandardError
-      [false, error_message]
-    end
   end
 end

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -142,7 +142,7 @@ module Kaui
       else
         errors = ''
         catalog_validation_errors.each do |validation_error|
-          errors += (validation_error['errorDescription'])
+          errors += validation_error['errorDescription']
         end
         flash[:error] = errors
         redirect_to admin_tenant_new_catalog_path(id: current_tenant.id)

data/app/controllers/kaui/audit_logs_controller.rb

@@ -76,7 +76,7 @@ module Kaui
         end
       end
 
-      send_data csv_file, type: 'text/csv', filename: "audit_logs_#{account_id}.csv"
+      send_data csv_file, type: 'text/csv', filename: "audit-logs-#{Date.today}.csv"
     end
 
     def history

data/app/controllers/kaui/engine_controller_util.rb

@@ -41,6 +41,7 @@ module Kaui
       # Until we support server-side sorting
       ordering = (params[:order] || {})[:'0'] || {}
       ordering_column = (ordering[:column] || 0).to_i
+      ordering_column = params[:colum_order][ordering_column].to_i if params[:colum_order].present?
       ordering_dir = ordering[:dir] || 'asc'
       unless search_key.nil?
         pages.sort! do |a, b|

data/app/controllers/kaui/invoices_controller.rb

@@ -70,13 +70,7 @@ module Kaui
                          end
                        else
                          lambda do |invoice, column|
-                           [
-                             invoice.invoice_number.to_i,
-                             invoice.invoice_date,
-                             invoice.amount,
-                             invoice.balance,
-                             invoice.status
-                           ][column]
+                           Kaui.account_invoices_columns.call(invoice, view_context)[2][column]
                          end
                        end
 

data/app/controllers/kaui/payments_controller.rb

@@ -19,11 +19,15 @@ module Kaui
       start_date = params[:startDate]
       end_date = params[:endDate]
       all_fields_checked = params[:allFieldsChecked] == 'true'
-      columns = if all_fields_checked
-                  KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes') - %w[transactions audit_logs]
-                else
-                  params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase }
-                end
+      if all_fields_checked
+        columns = KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes') - %w[transactions audit_logs]
+      else
+        columns = params.require(:columnsString).split(',').map { |attr| attr.split.join('_').downcase }
+        Kaui::Payment::REMAPPING_FIELDS.each do |k, v|
+          index = columns.index(v)
+          columns[index] = k if index
+        end
+      end
 
       kb_params = {}
       kb_params[:startDate] = Date.parse(start_date).strftime('%Y-%m-%d') if start_date
@@ -39,7 +43,7 @@ module Kaui
         created_date = nil
         payment.transactions.each do |transaction|
           transaction_date = Date.parse(transaction.effective_date)
-          created_date ||= transaction_date if transaction_date < created_date
+          created_date = transaction_date if created_date.nil? || (transaction_date < created_date)
         end
         payment.payment_date = created_date
       end
@@ -114,15 +118,7 @@ module Kaui
       end
 
       data_extractor = lambda do |payment, column|
-        [
-          payment.payment_number.to_i,
-          payment.payment_date,
-          payment.total_authed_amount_to_money,
-          payment.paid_amount_to_money,
-          payment.returned_amount_to_money,
-          payment.transactions.empty? ? nil : payment.transactions[-1].status,
-          payment.payment_external_key
-        ][column]
+        Kaui.account_payments_columns.call(account, payment, view_context)[2][column]
       end
 
       formatter = lambda do |payment|

data/app/helpers/kaui/subscription_helper.rb

@@ -98,7 +98,7 @@ module Kaui
         ''
       else
         current_plan = sub.prices.select { |price| price['phaseType'] == sub.phase_type && price['planName'] == sub.plan_name }
-        price_override = current_plan.last['fixedPrice'] || current_plan.last['recurringPrice']
+        price_override = current_plan.last ? (current_plan.last['fixedPrice'] || current_plan.last['recurringPrice']) : nil
 
         if price_override.blank?
           ''

data/app/models/kaui/account.rb

@@ -5,6 +5,13 @@ module Kaui
     attr_accessor :phone, :bill_cycle_day_local
 
     SENSIVITE_DATA_FIELDS = %w[name email].freeze
+    REMAPPING_FIELDS = {
+      'is_payment_delegated_to_parent' => 'pay_via_parent',
+      'bill_cycle_day_local' => 'bcd',
+      'account_balance' => 'balance',
+      'account_cba' => 'cba',
+      'is_migrated' => 'migrated'
+    }.freeze
 
     def check_account_details_phone
       return true if phone =~ /\A(?:\+?\d{1,3}\s*-?)?\(?(?:\d{3})?\)?[- ]?\d{3}[- ]?\d{4}\z/i

data/app/models/kaui/invoice.rb

@@ -2,7 +2,7 @@
 
 module Kaui
   class Invoice < KillBillClient::Model::Invoice
-    TABLE_IGNORE_COLUMNS = %w[amount balance credit_adj refund_adj items is_parent_invoice parent_invoice_id parent_account_id].freeze
+    TABLE_IGNORE_COLUMNS = %w[amount balance credit_adj refund_adj items is_parent_invoice parent_invoice_id parent_account_id audit_logs bundle_keys].freeze
 
     def self.build_from_raw_invoice(raw_invoice)
       result = Kaui::Invoice.new

data/app/models/kaui/payment.rb

@@ -7,6 +7,13 @@ module Kaui
     attr_accessor :payment_date, :target_invoice_id
 
     TRANSACTION_STATUSES = %w[SUCCESS PENDING PAYMENT_FAILURE PLUGIN_FAILURE UNKNOWN].freeze
+    REMAPPING_FIELDS = {
+      'auth_amount' => 'auth',
+      'captured_amount' => 'capture',
+      'purchased_amount' => 'purchase',
+      'credited_amount' => 'credit',
+      'refunded_amount' => 'refund'
+    }.freeze
 
     def self.build_from_raw_payment(raw_payment)
       result = Kaui::Payment.new

data/app/services/dependencies/kenui.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+module Dependencies
+  module Kenui
+    class EmailNotification
+      ERROR_MESSAGE = I18n.translate('errors.messages.email_notification_plugin_not_available')
+      class << self
+        def email_notification_plugin_available?(options_for_klient)
+          is_available = ::Kenui::EmailNotificationService.email_notification_plugin_available?(options_for_klient)
+          [is_available, is_available ? nil : ERROR_MESSAGE]
+        rescue StandardError
+          [false, ERROR_MESSAGE]
+        end
+
+        def set_configuration_per_account(account_id, event_types, kb_username, reason, comment, options_for_klient)
+          ::Kenui::EmailNotificationService.set_configuration_per_account(account_id,
+                                                                          event_types,
+                                                                          kb_username,
+                                                                          reason,
+                                                                          comment,
+                                                                          options_for_klient)
+        rescue StandardError
+          [false, ERROR_MESSAGE]
+        end
+
+        def get_events_to_consider(options_for_klient)
+          ::Kenui::EmailNotificationService.get_events_to_consider(options_for_klient)
+        rescue StandardError
+          {}
+        end
+
+        def get_configuration_per_account(account_id, options_for_klient)
+          ::Kenui::EmailNotificationService.get_configuration_per_account(account_id, options_for_klient)
+        rescue StandardError
+          []
+        end
+      end
+    end
+  end
+end

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

@@ -107,38 +107,9 @@ $(document).ready(function() {
   $('#allData').change(function() {
     $('#startDate').val(null);
     $('#endDate').val(null);
-    var isChecked = $(this).is(':checked');
     $('#startDate, #endDate').prop('disabled', true);
   });
 
-  function setDateRange(option) {
-    var currentDate = new Date();
-    var startDate, endDate;
-
-    if (option === "day") {
-      startDate = new Date();
-      endDate = new Date();
-      endDate.setDate(endDate.getDate() + 1);
-    } else if (option === "week") {
-      startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1));
-      currentDate = new Date();
-      endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7));
-    } else if (option === "month") {
-      startDate = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
-      endDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
-    } else if (option === "year") {
-      startDate = new Date(currentDate.getFullYear(), 0, 1);
-      endDate = new Date(currentDate.getFullYear(), 11, 31);
-    }
-
-    var startDateFormatted = startDate.toISOString().split('T')[0];
-    var endDateFormatted = endDate.toISOString().split('T')[0];
-
-    $('#startDate').val(startDateFormatted);
-    $('#endDate').val(endDateFormatted);
-    $('#startDate, #endDate').prop('disabled', true);
-  }
-
   $('#thisWeek').change(function() {
     if ($(this).is(':checked')) {
       setDateRange("week");

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

@@ -101,6 +101,15 @@
     width: 200px;
     overflow-y: auto;
   }
+
+  .dropdown-menu#column-visibility::before {
+    content: 'Drag to reorder columns';
+    display: block;
+    height: 30px;
+    text-align: center;
+    color: darkgrey;
+    padding-top: 5px;
+  }
   
   .dropdown-menu {
     padding: 5px;
@@ -170,38 +179,11 @@ $(document).ready(function() {
   });
 
   $('#allData').change(function() {
-    var isChecked = $(this).is(':checked');
+    $('#startDate').val(null);
+    $('#endDate').val(null);
     $('#startDate, #endDate').prop('disabled', true);
   });
 
-  function setDateRange(option) {
-    var currentDate = new Date();
-    var startDate, endDate;
-
-    if (option === "day") {
-      startDate = new Date();
-      endDate = new Date();
-      endDate.setDate(endDate.getDate() + 1);
-    } else if (option === "week") {
-      startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1));
-      currentDate = new Date();
-      endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7));
-    } else if (option === "month") {
-      startDate = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
-      endDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
-    } else if (option === "year") {
-      startDate = new Date(currentDate.getFullYear(), 0, 1);
-      endDate = new Date(currentDate.getFullYear(), 11, 31);
-    }
-
-    var startDateFormatted = startDate.toISOString().split('T')[0];
-    var endDateFormatted = endDate.toISOString().split('T')[0];
-
-    $('#startDate').val(startDateFormatted);
-    $('#endDate').val(endDateFormatted);
-    $('#startDate, #endDate').prop('disabled', true);
-  }
-
   $('#thisWeek').change(function() {
     if ($(this).is(':checked')) {
       setDateRange("week");

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

@@ -26,53 +26,54 @@
   </div>
 </div>
 
+<style>
+  #accounts-table td, #accounts-table tr {
+    white-space: nowrap;
+  }
+  .custom-checkbox {
+    pointer-events: none;
+  }
+</style>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
-  $.ajax({
-    url: "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>",
-    type: "GET",
-    success: function(response) {
-      const visibleColumns = response.columns;
-
-      var table = $('#accounts-table').DataTable({
-        "colReorder": {
-          "enable": false
-        },
-        "stateSave": true,
-        "scrollX": true,
-        "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
-        "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
-        "language": {
-          <!-- See DefaultPaginationSqlDaoHelper.java -->
-          "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
-        },
-        "pageLength": <%= @limit %>,
-        "displayStart": <%= @offset %>,
-        <% if @search_query.blank? %>
-          "ordering": false,
-        <% elsif !@ordering.blank? %>
-          "order": [[ 1, "<%= @ordering %>" ]],
-        <% end %>
-        "processing": true,
-        "serverSide": true,
-        "search": {"search": "<%= @search_query %>"},
-        "ajax": {
-          url: "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>",
-          dataSrc: function(json) {
-            var colOrder = $('#accounts-table').DataTable().colReorder.order();
-            var reorderedData = json.data.map(function(row) {
-              var newRow = [];
-              for (var i = 0; i < colOrder.length; i++) {
-                newRow.push(row[colOrder[i]]);
-              }
-              return newRow;
-            });
-            return reorderedData;
+  var table = $('#accounts-table').DataTable({
+    "colReorder": {
+      "enable": false
+    },
+    "stateSave": true,
+    "scrollX": true,
+    "dom": "<'row'r>t<'row'<'col-md-6'i><'col-md-6'p>>",
+    "pagingType": <% if @max_nb_records.nil? -%>"simple"<% else -%>"full_numbers"<% end -%>,
+    "language": {
+      <!-- See DefaultPaginationSqlDaoHelper.java -->
+      "info": <% if @max_nb_records.nil? -%>"Showing _START_ to _END_ of <%= number_with_delimiter(Kaui::EngineControllerUtil::SIMPLE_PAGINATION_THRESHOLD) -%>+ entries"<% else -%>"Showing _START_ to _END_ of _TOTAL_ entries"<% end -%>
+    },
+    "pageLength": <%= @limit %>,
+    "displayStart": <%= @offset %>,
+    <% if @search_query.blank? %>
+      "ordering": false,
+    <% elsif !@ordering.blank? %>
+      "order": [[ 1, "<%= @ordering %>" ]],
+    <% end %>
+    "processing": true,
+    "serverSide": true,
+    "search": {"search": "<%= @search_query %>"},
+    "ajax": {
+      url: "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>",
+      dataSrc: function(json) {
+        var colOrder = table.colReorder.order();
+        var reorderedData = json.data.map(function(row) {
+          var newRow = [];
+          for (var i = 0; i < colOrder.length; i++) {
+            newRow.push(row[colOrder[i]]);
           }
-        },
-        "columns": visibleColumns
-      });
-    }
+          return newRow;
+        });
+        return reorderedData;
+      }
+    },
+    "columns": <%= raw @visible_columns.to_json %>
   });
 
   <!-- When we don't know the total number of pages, we need to hide the legend and next button manually -->

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

@@ -142,38 +142,9 @@ $(document).ready(function() {
   $('#allData').change(function() {
     $('#startDate').val(null);
     $('#endDate').val(null);
-    var isChecked = $(this).is(':checked');
     $('#startDate, #endDate').prop('disabled', true);
   });
 
-  function setDateRange(option) {
-    var currentDate = new Date();
-    var startDate, endDate;
-
-    if (option === "day") {
-      startDate = new Date();
-      endDate = new Date();
-      endDate.setDate(endDate.getDate() + 1);
-    } else if (option === "week") {
-      startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1));
-      currentDate = new Date();
-      endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7));
-    } else if (option === "month") {
-      startDate = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
-      endDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
-    } else if (option === "year") {
-      startDate = new Date(currentDate.getFullYear(), 0, 1);
-      endDate = new Date(currentDate.getFullYear(), 11, 31);
-    }
-
-    var startDateFormatted = startDate.toISOString().split('T')[0];
-    var endDateFormatted = endDate.toISOString().split('T')[0];
-
-    $('#startDate').val(startDateFormatted);
-    $('#endDate').val(endDateFormatted);
-    $('#startDate, #endDate').prop('disabled', true);
-  }
-
   $('#thisWeek').change(function() {
     if ($(this).is(':checked')) {
       setDateRange("week");

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

@@ -31,6 +31,12 @@
 
 </div>
 
+<style>
+  #audit-logs-table td, #audit-logs-table tr {
+    white-space: nowrap;
+  }
+</style>
+
 
 <%= javascript_tag do %>
     $(document).ready(function() {
@@ -38,6 +44,7 @@
         $('#audit-logs-table').DataTable({
             dom: "<'row'<'col-md-6'l><'col-md-6'f>r>t<'row'<'col-md-6'i><'col-md-6'p>>",
             data: auditLogs,
+            "scrollX": true,
             order: [[ 0, 'desc' ]],
             createdRow: function( row, data, dataIndex ) {
                 if ( data[3] == "INSERT" ) {

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

@@ -105,6 +105,16 @@
   .dropdown-menu {
     padding: 5px;
   }
+
+  .dropdown-menu#column-visibility::before {
+    content: 'Drag to reorder columns';
+    display: block;
+    height: 30px;
+    text-align: center;
+    color: darkgrey;
+    padding-top: 5px;
+  }
+
   .toggle-button-right {
     float: right;
     margin-bottom: 10px;
@@ -173,34 +183,6 @@ $(document).ready(function() {
     $('#startDate, #endDate').prop('disabled', true);
   });
 
-  function setDateRange(option) {
-    var currentDate = new Date();
-    var startDate, endDate;
-
-    if (option === "day") {
-      startDate = new Date();
-      endDate = new Date();
-      endDate.setDate(endDate.getDate() + 1);
-    } else if (option === "week") {
-      startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1));
-      currentDate = new Date();
-      endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7));
-    } else if (option === "month") {
-      startDate = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
-      endDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
-    } else if (option === "year") {
-      startDate = new Date(currentDate.getFullYear(), 0, 1);
-      endDate = new Date(currentDate.getFullYear(), 11, 31);
-    }
-
-    var startDateFormatted = startDate.toISOString().split('T')[0];
-    var endDateFormatted = endDate.toISOString().split('T')[0];
-
-    $('#startDate').val(startDateFormatted);
-    $('#endDate').val(endDateFormatted);
-    $('#startDate, #endDate').prop('disabled', true);
-  }
-
   $('#thisWeek').change(function() {
     if ($(this).is(':checked')) {
       setDateRange("week");

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

@@ -1,11 +1,7 @@
 <div class="search">
-
   <div class="column-block">
-
     <h1>Invoices</h1>
-
     <%= render :partial => 'multi_functions_bar' %>
-
     <table id="invoices-table" class="table table-condensed mobile-data" style="width:100%">
       <thead>
       <tr>
@@ -20,13 +16,25 @@
       </tr>
       </tbody>
     </table>
-
   </div>
-
 </div>
 
+<style>
+  #invoices-table td, #invoices-table tr {
+    white-space: nowrap;
+  }
+</style>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
+  var stateKey = 'DataTables_invoices-table';
+  var state = JSON.parse(localStorage.getItem(stateKey));
+  if (state) {
+    state.start = <%= @offset %>;
+    state.search = { search: "<%= @search_query %>" };
+    localStorage.setItem(stateKey, JSON.stringify(state));
+  }
+
   var table = $('#invoices-table').DataTable({
     "colReorder": {
       "enable": false
@@ -56,8 +64,11 @@ $(document).ready(function() {
     "search": {"search": "<%= @search_query %>"},
     "ajax": {
       url: "<%= invoices_pagination_path(:ordering => @ordering, :format => :json) %>",
+      data: function(d) {
+        d.colum_order = $('#invoices-table').DataTable().colReorder.order();
+      },
       dataSrc: function(json) {
-        var colOrder = $('#invoices-table').DataTable().colReorder.order();
+        var colOrder = table.colReorder.order();
         var reorderedData = json.data.map(function(row) {
           var newRow = [];
           for (var i = 0; i < colOrder.length; i++) {
@@ -70,11 +81,6 @@ $(document).ready(function() {
     }
   });
 
-  var searchQuery = "<%= @search_query %>";
-  if (searchQuery) {
-    table.search(searchQuery).draw();
-  }
-
   <!-- 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? %>
     $('#invoices-table').on('draw.dt', function() {

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

@@ -1,10 +1,8 @@
 <div class="dropdown-container">
-  <% unless @account.account_id.blank? %>
     <button class="btn btn-default download-button-right" type="button" id="modalDownloadButton">
       <i class="glyphicon glyphicon-download-alt"></i>
       <strong>Download CSV</strong>
     </button>
-  <% end %>
   <div class="dropdown">
     <button class="btn btn-default dropdown-toggle toggle-button-right" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
       <i class="glyphicon glyphicon-cog"></i>
@@ -107,6 +105,16 @@
   .dropdown-menu {
     padding: 5px;
   }
+
+  .dropdown-menu#column-visibility::before {
+    content: 'Drag to reorder columns';
+    display: block;
+    height: 30px;
+    text-align: center;
+    color: darkgrey;
+    padding-top: 5px;
+  }
+
   .toggle-button-right {
     float: right;
     margin-bottom: 10px;
@@ -173,38 +181,9 @@ $(document).ready(function() {
   $('#allData').change(function() {
     $('#startDate').val(null);
     $('#endDate').val(null);
-    var isChecked = $(this).is(':checked');
     $('#startDate, #endDate').prop('disabled', true);
   });
 
-  function setDateRange(option) {
-    var currentDate = new Date();
-    var startDate, endDate;
-
-    if (option === "day") {
-      startDate = new Date();
-      endDate = new Date();
-      endDate.setDate(endDate.getDate() + 1);
-    } else if (option === "week") {
-      startDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 1));
-      currentDate = new Date();
-      endDate = new Date(currentDate.setDate(currentDate.getDate() - currentDate.getDay() + 7));
-    } else if (option === "month") {
-      startDate = new Date(currentDate.getFullYear(), currentDate.getMonth(), 1);
-      endDate = new Date(currentDate.getFullYear(), currentDate.getMonth() + 1, 0);
-    } else if (option === "year") {
-      startDate = new Date(currentDate.getFullYear(), 0, 1);
-      endDate = new Date(currentDate.getFullYear(), 11, 31);
-    }
-
-    var startDateFormatted = startDate.toISOString().split('T')[0];
-    var endDateFormatted = endDate.toISOString().split('T')[0];
-
-    $('#startDate').val(startDateFormatted);
-    $('#endDate').val(endDateFormatted);
-    $('#startDate, #endDate').prop('disabled', true);
-  }
-
   $('#thisWeek').change(function() {
     if ($(this).is(':checked')) {
       setDateRange("week");

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

@@ -1,10 +1,7 @@
 <div class="search">
-
   <div class="column-block">
-
     <h1><%= I18n.translate('payments') %></h1>
     <%= render :partial => 'multi_functions_bar' %>
-
     <table id="payments-table" class="table table-condensed mobile-data" style="width:100%">
       <thead>
         <tr>
@@ -19,13 +16,25 @@
       </tr>
       </tbody>
     </table>
-
   </div>
-
 </div>
 
+<style>
+  #payments-table td, #payments-table tr {
+    white-space: nowrap;
+  }
+</style>
+
 <%= javascript_tag do %>
 $(document).ready(function() {
+  var stateKey = 'DataTables_payments-table';
+  var state = JSON.parse(localStorage.getItem(stateKey));
+  if (state) {
+    state.start = <%= @offset %>;
+    state.search = { search: "<%= @search_query %>" };
+    localStorage.setItem(stateKey, JSON.stringify(state));
+  }
+
   var table = $('#payments-table').DataTable({
     "colReorder": {
       "enable": false
@@ -67,6 +76,9 @@ $(document).ready(function() {
       "paging": false,
       "ajax": {
         url: "<%= payments_pagination_path(:format => :json) %>",
+        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) {
@@ -90,11 +102,6 @@ $(document).ready(function() {
     "search": {"search": "<%= @search_query %>"},
   });
 
-  var searchQuery = "<%= @search_query %>";
-  if (searchQuery) {
-    table.search(searchQuery).draw();
-  }
-
   <!-- 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() {

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.4'
+  VERSION = '3.0.6'
 end

data/lib/kaui.rb

@@ -65,20 +65,30 @@ module Kaui
     original_fields = KillBillClient::Model::AccountAttributes.instance_variable_get('@json_attributes')
     # Add additional fields if needed
     fields = original_fields.dup
+    fields -= %w[audit_logs first_name_length]
+    headers = fields.dup
+    Kaui::Account::REMAPPING_FIELDS.each do |k, v|
+      headers[fields.index(k)] = v
+    end
+    headers.map! { |attr| attr.split('_').join(' ').capitalize }
 
-    headers = fields.map { |attr| attr.split('_').join(' ').capitalize }
     values = fields.map do |attr|
+      next if account.nil? || view_context.nil?
+
       case attr
+      when 'is_payment_delegated_to_parent', 'is_migrated'
+        "<div style='text-align: center;'><input type='checkbox' class='custom-checkbox' #{account&.send(attr.downcase) ? 'checked' : ''}></div>"
       when 'account_id'
-        account.nil? || view_context.nil? ? nil : view_context.link_to(account.account_id, view_context.url_for(action: :show, account_id: account.account_id))
+        view_context.link_to(account.account_id, view_context.url_for(action: :show, account_id: account.account_id))
       when 'parent_account_id'
-        account.nil? || view_context.nil? || account.parent_account_id.nil? ? nil : view_context.link_to(account.account_id, view_context.url_for(action: :show, account_id: account.parent_account_id))
+        account.parent_account_id.nil? ? nil : view_context.link_to(account.account_id, view_context.url_for(action: :show, account_id: account.parent_account_id))
       when 'account_balance'
-        account.nil? || view_context.nil? ? nil : view_context.humanized_money_with_symbol(account.balance_to_money)
+        view_context.humanized_money_with_symbol(account.balance_to_money)
       else
         account&.send(attr.downcase)
       end
     end
+
     [headers, values, fields]
   end
 
@@ -121,7 +131,7 @@ module Kaui
       when 'balance'
         view_context.humanized_money_with_symbol(invoice.balance_to_money)
       when 'invoice_id'
-        view_context.link_to(invoice.invoice_number, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))
+        view_context.link_to(invoice.invoice_id, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))
       when 'status'
         default_label = 'label-info'
         default_label = 'label-default' if invoice&.status == 'DRAFT'
@@ -132,33 +142,36 @@ 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|
     fields = KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes')
     # Change the order if needed
-    fields = %w[payment_date total_authed_amount_to_money paid_amount_to_money returned_amount_to_money] + fields
+    fields = %w[payment_date] + fields
     fields -= %w[payment_number transactions audit_logs]
     fields.unshift('status')
     fields.unshift('payment_number')
 
-    headers = fields.map { |attr| attr.split('_').join(' ').capitalize }
+    headers = fields.dup
+    Kaui::Payment::REMAPPING_FIELDS.each do |k, v|
+      headers[fields.index(k)] = v
+    end
+    headers.map! { |attr| attr.split('_').join(' ').capitalize }
+
     return [headers, []] if payment.nil?
 
     values = fields.map do |attr|
       case attr
+      when 'auth_amount', 'captured_amount', 'purchased_amount', 'refunded_amount', 'credited_amount'
+        view_context.humanized_money_with_symbol(payment&.send(attr.downcase))
       when 'payment_number'
         view_context.link_to(payment.payment_number, view_context.url_for(controller: :payments, action: :show, account_id: payment.account_id, id: payment.payment_id))
       when 'payment_date'
         view_context.format_date(payment.payment_date, account&.time_zone)
-      when 'total_authed_amount_to_money'
-        view_context.humanized_money_with_symbol(payment.total_authed_amount_to_money)
-      when 'paid_amount_to_money'
-        view_context.humanized_money_with_symbol(payment.paid_amount_to_money)
-      when 'returned_amount_to_money'
-        view_context.humanized_money_with_symbol(payment.returned_amount_to_money)
       when 'status'
         payment.transactions.empty? ? nil : view_context.colored_transaction_status(payment.transactions[-1].status)
       else
@@ -166,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.4
+  version: 3.0.6
 platform: ruby
 authors:
 - Kill Bill core team
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2025-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootsnap
-  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: cancan
   requirement: !ruby/object:Gem::Requirement
@@ -164,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
@@ -438,6 +410,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
@@ -594,7 +567,7 @@ licenses:
 - Apache License (2.0)
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -610,7 +583,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Killbill Admin UI mountable engine
 test_files: []