kaui 4.0.11 → 4.0.13

data/app/models/kaui/bundle.rb

@@ -2,8 +2,14 @@
 
 module Kaui
   class Bundle < KillBillClient::Model::Bundle
+    SEARCH_FIELDS = [
+      ['bundle_id', 'Bundle ID'],
+      ['bundle_external_key', 'Bundle External Key'],
+      ['subscription_id', 'Subscription ID'],
+      ['subscription_external_key', 'Subscription External Key']
+    ].freeze
     def self.find_by_id_or_key(bundle_id_or_key, options = {})
-      if bundle_id_or_key =~ /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/
+      if /[A-Fa-f0-9]{8}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{4}-[A-Fa-f0-9]{12}/.match?(bundle_id_or_key)
         bundle = begin
           find_by_id(bundle_id_or_key, options)
         rescue StandardError
@@ -47,15 +53,15 @@ module Kaui
     end
 
     def self.list_transfer_policy_params
-      @policy_params = [
+      [
         # [I18n.translate('start_of_term'), 'START_OF_TERM'], Temporarily removed as it is not supported by Kill Bill
-        [I18n.translate('end_of_term'), 'END_OF_TERM'],
-        [I18n.translate('immediate'), 'IMMEDIATE']
+        [I18n.t('end_of_term'), 'END_OF_TERM'],
+        [I18n.t('immediate'), 'IMMEDIATE']
       ]
     end
 
     def self.list_transfer_policy_params_keys
-      @policy_params = %w[END_OF_TERM IMMEDIATE]
+      %w[END_OF_TERM IMMEDIATE]
     end
   end
 end

data/app/models/kaui/invoice.rb

@@ -8,7 +8,7 @@ module Kaui
 
     def self.build_from_raw_invoice(raw_invoice)
       result = Kaui::Invoice.new
-      KillBillClient::Model::InvoiceAttributes.instance_variable_get('@json_attributes').each do |attr|
+      KillBillClient::Model::InvoiceAttributes.instance_variable_get(:@json_attributes).each do |attr|
         result.send("#{attr}=", raw_invoice.send(attr))
       end
       result

data/app/models/kaui/invoice_payment.rb

@@ -17,7 +17,7 @@ module Kaui
         return nil if raw_payment.nil?
 
         result = Kaui::InvoicePayment.new
-        KillBillClient::Model::InvoicePaymentAttributes.instance_variable_get('@json_attributes').each do |attr|
+        KillBillClient::Model::InvoicePaymentAttributes.instance_variable_get(:@json_attributes).each do |attr|
           result.send("#{attr}=", raw_payment.send(attr))
         end
         # Use  Kaui::Transaction to benefit from additional fields (e.g next_retry_date)
@@ -25,7 +25,7 @@ module Kaui
         result.transactions = []
         original_transactions.each do |transaction|
           new_transaction = Kaui::Transaction.new
-          KillBillClient::Model::PaymentTransactionAttributes.instance_variable_get('@json_attributes').each do |attr|
+          KillBillClient::Model::PaymentTransactionAttributes.instance_variable_get(:@json_attributes).each do |attr|
             new_transaction.send("#{attr}=", transaction.send(attr))
           end
           result.transactions << new_transaction

data/app/models/kaui/killbill_authenticatable.rb

@@ -1,45 +1,8 @@
 # frozen_string_literal: true
 
-require 'killbill_client'
+require 'devise/models/killbill_authenticatable'
 
-# Hack for Zeitwerk
-# rubocop:disable Style/OneClassPerFile
+# Placeholder for Zeitwerk - must define Kaui::KillbillAuthenticatable before Devise::Models::KillbillAuthenticatable
 module Kaui
   module KillbillAuthenticatable; end
 end
-
-module Devise
-  module Models
-    module KillbillAuthenticatable
-      extend ActiveSupport::Concern
-
-      def valid_killbill_password?(creds)
-        # Simply try to look-up the permissions for that user - this will
-        # Take care of the auth part
-        response = Kaui::User.find_permissions(creds)
-        # Auth was successful, update the session id
-        self.kb_session_id = response.session_id
-        true
-      rescue KillBillClient::API::Unauthorized => _e
-        false
-      end
-
-      def after_killbill_authentication
-        save(validate: false)
-      end
-
-      module ClassMethods
-        # Invoked by the KillbillAuthenticatable strategy to lookup the user
-        # before attempting authentication
-        def find_for_killbill_authentication(kb_username)
-          find_for_authentication(kb_username:) ||
-            new(kb_username:)
-        rescue KillBillClient::API::Unauthorized => _e
-          # Multi-Tenancy was enabled, but the tenant_id couldn't be retrieved because of bad credentials
-          nil
-        end
-      end
-    end
-  end
-end
-# rubocop:enable Style/OneClassPerFile

data/app/models/kaui/killbill_registerable.rb

@@ -1,16 +1,8 @@
 # frozen_string_literal: true
 
-# Hack for Zeitwerk
-# rubocop:disable Style/OneClassPerFile
+require 'devise/models/killbill_registerable'
+
+# Placeholder for Zeitwerk - must define Kaui::KillbillRegisterable before Devise::Models::KillbillRegisterable
 module Kaui
   module KillbillRegisterable; end
 end
-
-module Devise
-  module Models
-    module KillbillRegisterable
-      include Registerable
-    end
-  end
-end
-# rubocop:enable Style/OneClassPerFile

data/app/models/kaui/overdue.rb

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

data/app/models/kaui/payment.rb

@@ -19,7 +19,7 @@ module Kaui
 
     def self.build_from_raw_payment(raw_payment)
       result = Kaui::Payment.new
-      KillBillClient::Model::PaymentAttributes.instance_variable_get('@json_attributes').each do |attr|
+      KillBillClient::Model::PaymentAttributes.instance_variable_get(:@json_attributes).each do |attr|
         result.send("#{attr}=", raw_payment.send(attr))
       end
       result

data/app/models/kaui/payment_state.rb

@@ -2,9 +2,11 @@
 
 module Kaui
   module PaymentState
+    REFUNDABLE_TRANSACTION_TYPES = %w[CAPTURE PURCHASE].freeze
+
     def refundable?
       transactions.each do |transaction|
-        return true if transaction.status == 'SUCCESS' && %w[CAPTURE PURCHASE].include?(transaction.transaction_type)
+        return true if transaction.status == 'SUCCESS' && REFUNDABLE_TRANSACTION_TYPES.include?(transaction.transaction_type)
       end
       false
     end

data/app/models/kaui/rails_methods.rb

@@ -32,7 +32,7 @@ module Kaui
           send(attr)
         end
 
-        # rubocop:disable Naming/PredicateMethod
+        # rubocop:disable Naming/PredicateMethod, ThreadSafety/ClassInstanceVariable
         def save
           @errors.add(:save, 'Saving this object is not yet supported')
           false
@@ -47,7 +47,7 @@ module Kaui
           @errors.add(:destroy, 'Destroying this object is not yet supported')
           false
         end
-        # rubocop:enable Naming/PredicateMethod
+        # rubocop:enable Naming/PredicateMethod, ThreadSafety/ClassInstanceVariable
       end
 
       base_class.instance_eval do

data/app/models/kaui/tag_definition.rb

@@ -25,12 +25,12 @@ module Kaui
 
     ALL_OBJECT_TYPES.each do |object_type|
       define_singleton_method "all_for_#{object_type.downcase}" do |options_for_klient|
-        all('NONE', options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include?(object_type) }.sort
+        all('NONE', options_for_klient).delete_if { |tag_definition| tag_definition.applicable_object_types.exclude?(object_type) }.sort
       end
     end
 
     def system_tag?
-      return false unless id.present?
+      return false if id.blank?
 
       last_group = id.split('-')[4]
 

data/app/models/kaui/tenant.rb

@@ -7,7 +7,8 @@ module Kaui
     attribute :encrypted_api_secret, :encrypted, random_iv: false
     alias_attribute :api_secret, :encrypted_api_secret
 
-    has_many :kaui_allowed_user_tenants, class_name: 'Kaui::AllowedUserTenant', foreign_key: 'kaui_tenant_id'
+    has_many :kaui_allowed_user_tenants, class_name: 'Kaui::AllowedUserTenant', foreign_key: 'kaui_tenant_id',
+                                         dependent: :destroy, inverse_of: :kaui_tenant
     has_many :kaui_allowed_users, through: :kaui_allowed_user_tenants, source: :kaui_allowed_user
   end
 end

data/app/models/kaui/transaction.rb

@@ -6,7 +6,7 @@ module Kaui
 
     def self.build_from_raw_transaction(raw_transaction)
       result = Kaui::Transaction.new
-      KillBillClient::Model::PaymentTransactionAttributes.instance_variable_get('@json_attributes').each do |attr|
+      KillBillClient::Model::PaymentTransactionAttributes.instance_variable_get(:@json_attributes).each do |attr|
         result.send("#{attr}=", raw_transaction.send(attr))
       end
       result

data/app/services/dependencies/kenui.rb

@@ -3,7 +3,7 @@
 module Dependencies
   module Kenui
     class EmailNotification
-      ERROR_MESSAGE = I18n.translate('errors.messages.email_notification_plugin_not_available')
+      ERROR_MESSAGE = I18n.t('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)

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

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

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

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

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

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

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

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

data/app/views/kaui/components/search_input/_search_input.html.erb

@@ -59,13 +59,50 @@
     document.addEventListener("DOMContentLoaded", () => {
         const input = document.getElementById("search-box");
         const dropdown = document.getElementById("search-suggestions");
+        const validPrefixes = ['account:', 'invoice:', 'payment:', 'bundle:', 'custom field:', 'subscription:', 'tag:', 'transaction:', 'credit:', 'invoice payment:', 'tag definition:'];
+
+        // Get current prefix and search term from input value
+        function parseInput(value) {
+            const colonIndex = value.indexOf(':');
+            if (colonIndex === -1) {
+                return { prefix: '', searchTerm: value };
+            }
+            return {
+                prefix: value.substring(0, colonIndex + 1).toLowerCase(),
+                searchTerm: value.substring(colonIndex + 1)
+            };
+        }
+
+        // Ensure input always has a valid prefix
+        function ensurePrefix() {
+            const { prefix, searchTerm } = parseInput(input.value);
+            const hasValidPrefix = validPrefixes.some(p => prefix === p.toLowerCase());
+            if (!hasValidPrefix) {
+                input.value = 'account: ' + input.value.replace(/^[^:]*:?\s*/, '');
+            }
+        }
 
         input.addEventListener("input", () => {
             dropdown.classList.remove("d-none");
+            ensurePrefix();
         });
 
         input.addEventListener("focus", () => {
             dropdown.classList.remove("d-none");
+            // Add default prefix when focusing on empty input
+            if (input.value.trim() === '') {
+                input.value = 'account: ';
+            }
+        });
+
+        input.addEventListener("blur", () => {
+            // Clear back to empty if only prefix remains
+            const trimmed = input.value.trim();
+            if (validPrefixes.some(p => trimmed.toLowerCase() === p.trim().toLowerCase())) {
+                input.value = '';
+            } else {
+                ensurePrefix();
+            }
         });
 
         document.addEventListener("click", (e) => {
@@ -79,7 +116,8 @@
             element.addEventListener("click", (e) => {
                 e.preventDefault();
                 const term = element.getAttribute("data-term");
-                input.value = term;
+                const { searchTerm } = parseInput(input.value);
+                input.value = term + searchTerm;
                 input.focus();
                 // Keep dropdown open so user can continue typing
             });

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

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

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

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

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

@@ -34,12 +34,18 @@
         <%= select_tag :plan_name, options_for_select(@plans), :class => 'form-control' %>
       </div>
     </div>
-    <div class="form-group d-flex pb-3 border-bottom mb-3">
+    <div class="form-group d-flex pb-3">
       <%= label_tag :price_override, 'Price Override', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
         <%= number_field_tag :price_override, nil, :step => :any, :min => 0, :class => 'form-control' %>
       </div>
     </div>
+    <div class="form-group d-flex pb-3 border-bottom mb-3">
+      <%= label_tag :quantity, 'Quantity', :class => 'col-sm-3 control-label' %>
+      <div class="col-sm-9">
+        <%= number_field_tag :quantity, 1, :min => 1, :step => 1, :class => 'form-control' %>
+      </div>
+    </div>
     <div class="form-group d-flex pb-3">
       <%= label_tag :type_change, 'Type', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-offset-2 col-sm-9">