kaui 2.2.1 → 3.0.2

data/app/controllers/kaui/charges_controller.rb

@@ -15,7 +15,7 @@ module Kaui
         currency = params[:currency] || 'USD'
       end
 
-      @charge = Kaui::InvoiceItem.new(account_id: params.require(:account_id), invoice_id: invoice_id, amount: amount, currency: currency)
+      @charge = Kaui::InvoiceItem.new(account_id: params.require(:account_id), invoice_id:, amount:, currency:)
     end
 
     def create

data/app/controllers/kaui/credits_controller.rb

@@ -15,7 +15,7 @@ module Kaui
         currency = params[:currency] || 'USD'
       end
 
-      @credit = Kaui::Credit.new(account_id: params.require(:account_id), invoice_id: invoice_id, amount: amount, currency: currency)
+      @credit = Kaui::Credit.new(account_id: params.require(:account_id), invoice_id:, amount:, currency:)
     end
 
     def create

data/app/controllers/kaui/engine_controller_util.rb

@@ -37,7 +37,7 @@ module Kaui
       pages ||= []
 
       # Until we support server-side sorting
-      ordering = ((params[:order] || {})[:'0'] || {})
+      ordering = (params[:order] || {})[:'0'] || {}
       ordering_column = (ordering[:column] || 0).to_i
       ordering_dir = ordering[:dir] || 'asc'
       unless search_key.nil?
@@ -53,17 +53,15 @@ module Kaui
       pages.each { |page| json[:data] << formatter.call(page) }
 
       respond_to do |format|
-        format.json { render json: json }
+        format.json { render json: }
       end
     end
 
-    def promise
+    def promise(&)
       # Evaluation starts immediately
       ::Concurrent::Promises.future do
         # https://github.com/rails/rails/issues/26847
-        Rails.application.executor.wrap do
-          yield
-        end
+        Rails.application.executor.wrap(&)
       end
     end
 

data/app/controllers/kaui/home_controller.rb

@@ -46,21 +46,29 @@ module Kaui
         elsif true?(fast)
           redirect_to account_path(account.account_id) and return
         else
-          redirect_to accounts_path(q: search_query, fast: fast) and return
+          redirect_to accounts_path(q: search_query, fast:) and return
         end
       end
     end
 
     def invoice_search(search_query, search_by = nil, fast = 0, options = {})
-      if search_by == 'ID'
+      case search_by
+      when 'ID'
         begin
           invoice = Kaui::Invoice.find_by_id(search_query, 'NONE', options)
           redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
         rescue KillBillClient::API::NotFound => _e
           search_error("No invoice matches \"#{search_query}\"")
         end
-      elsif search_by == 'EXTERNAL_KEY'
-        unsupported_external_key_search('INVOICE')
+      when 'EXTERNAL_KEY'
+        unsupported_search_field('INVOICE', search_by)
+      when 'NUMBER'
+        begin
+          invoice = Kaui::Invoice.find_by_number(search_query, 'NONE', options)
+          redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
+        rescue KillBillClient::API::NotFound, KillBillClient::API::BadRequest => _e
+          search_error("No invoice matches \"#{search_query}\"")
+        end
       else
         invoice = Kaui::Invoice.list_or_search(search_query, 0, 1, options).first
         if invoice.blank?
@@ -73,7 +81,7 @@ module Kaui
         elsif true?(fast)
           redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id) and return
         else
-          redirect_to account_invoices_path(account_id: invoice.account_id, q: search_query, fast: fast) and return
+          redirect_to account_invoices_path(account_id: invoice.account_id, q: search_query, fast:) and return
         end
       end
     end
@@ -100,7 +108,7 @@ module Kaui
         elsif true?(fast)
           redirect_to account_payment_path(payment.account_id, payment.payment_id) and return
         else
-          redirect_to account_payments_path(account_id: payment.account_id, q: search_query, fast: fast) and return
+          redirect_to account_payments_path(account_id: payment.account_id, q: search_query, fast:) and return
         end
       end
     end
@@ -157,7 +165,7 @@ module Kaui
           search_error("No credit matches \"#{search_query}\"")
         end
       else
-        unsupported_external_key_search('CREDIT')
+        unsupported_search_field('CREDIT', search_by)
       end
     end
 
@@ -167,10 +175,10 @@ module Kaui
         if custom_field.blank?
           search_error("No custom field matches \"#{search_query}\"")
         else
-          redirect_to custom_fields_path(q: search_query, fast: fast)
+          redirect_to custom_fields_path(q: search_query, fast:)
         end
       else
-        unsupported_external_key_search('CUSTOM FIELD')
+        unsupported_search_field('CUSTOM FIELD', search_by)
       end
     end
 
@@ -183,7 +191,7 @@ module Kaui
           search_error("No invoice payment matches \"#{search_query}\"")
         end
       else
-        unsupported_external_key_search('INVOICE PAYMENT')
+        unsupported_search_field('INVOICE PAYMENT', search_by)
       end
     end
 
@@ -196,7 +204,7 @@ module Kaui
           search_error("No subscription matches \"#{search_query}\"")
         end
       else
-        unsupported_external_key_search('SUBSCRIPTION')
+        unsupported_search_field('SUBSCRIPTION', search_by)
       end
     end
 
@@ -206,10 +214,10 @@ module Kaui
         if tag.blank?
           search_error("No tag matches \"#{search_query}\"")
         else
-          redirect_to tags_path(q: search_query, fast: fast)
+          redirect_to tags_path(q: search_query, fast:)
         end
       else
-        unsupported_external_key_search('TAG')
+        unsupported_search_field('TAG', search_by)
       end
     end
 
@@ -217,29 +225,30 @@ module Kaui
       if search_by == 'ID'
         begin
           Kaui::TagDefinition.find_by_id(search_query, 'NONE', options)
-          redirect_to tag_definitions_path(q: search_query, fast: fast)
+          redirect_to tag_definitions_path(q: search_query, fast:)
         rescue KillBillClient::API::NotFound => _e
           search_error("No tag definition matches \"#{search_query}\"")
         end
       elsif search_by == 'EXTERNAL_KEY'
-        unsupported_external_key_search('TAG DEFINITION')
+        unsupported_search_field('TAG DEFINITION', search_by)
       else
         tag_definition = Kaui::TagDefinition.find_by_name(search_query, 'NONE', options)
         if tag_definition.blank?
           begin
             Kaui::TagDefinition.find_by_id(search_query, 'NONE', options)
-            redirect_to tag_definitions_path(q: search_query, fast: fast) and return
+            redirect_to tag_definitions_path(q: search_query, fast:) and return
           rescue KillBillClient::API::NotFound => _e
             search_error("No tag definition matches \"#{search_query}\"")
           end
         else
-          redirect_to tag_definitions_path(q: search_query, fast: fast)
+          redirect_to tag_definitions_path(q: search_query, fast:)
         end
       end
     end
 
-    def unsupported_external_key_search(object_type)
-      search_error("\"#{object_type}\": Search by \"EXTERNAL KEY\" is not supported.")
+    def unsupported_search_field(object_type, object_field)
+      field_name = object_field.gsub('_', ' ')
+      search_error("\"#{object_type}\": Search by \"#{field_name}\" is not supported.")
     end
 
     def search_error(message)
@@ -267,7 +276,7 @@ module Kaui
         '0'
       end
 
-      search_error("\"#{search_by}\" is not a valid search by value") if !search_by.blank? && !%w[ID EXTERNAL_KEY].include?(search_by)
+      search_error("\"#{search_by}\" is not a valid search by value") if !search_by.blank? && !search_by.in?(Kaui::ObjectHelper::ADVANCED_SEARCH_OBJECT_FIELDS)
 
       [object_type, search_for, search_by, fast]
     end

data/app/controllers/kaui/invoice_tags_controller.rb

@@ -18,7 +18,7 @@ module Kaui
       invoice_id = params.require(:invoice_id)
 
       tags = []
-      params.each do |tag, _tag_name|
+      params.each_key do |tag|
         tag_info = tag.split('_')
         next if (tag_info.size != 2) || (tag_info[0] != 'tag')
 
@@ -26,7 +26,7 @@ module Kaui
       end
 
       Kaui::Tag.set_for_invoice(invoice_id, tags, current_user.kb_username, params[:reason], params[:comment], options_for_klient)
-      redirect_to kaui_engine.invoice_path(invoice_id, account_id: account_id), notice: 'Invoice tags successfully set'
+      redirect_to kaui_engine.invoice_path(invoice_id, account_id:), notice: 'Invoice tags successfully set'
     end
   end
 end

data/app/controllers/kaui/invoices_controller.rb

@@ -39,7 +39,7 @@ module Kaui
         end
         formatter = lambda do |invoice|
           row = [view_context.link_to(invoice.invoice_number, view_context.url_for(controller: :invoices, action: :show, account_id: invoice.account_id, id: invoice.invoice_id))]
-          row += Kaui.invoice_search_columns.call(invoice, view_context)[1]
+          row += Kaui.invoice_search_columns.call(invoice, view_context, cached_options_for_klient)[1]
           row
         end
       else
@@ -147,6 +147,11 @@ module Kaui
       redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id)
     end
 
+    def restful_show_by_number
+      invoice = Kaui::Invoice.find_by_number(params.require(:number), 'NONE', options_for_klient)
+      redirect_to account_invoice_path(invoice.account_id, invoice.invoice_id)
+    end
+
     def show_html
       render html: Kaui::Invoice.as_html(params.require(:id), options_for_klient).html_safe
     end

data/app/controllers/kaui/payment_methods_controller.rb

@@ -47,7 +47,7 @@ module Kaui
       }
 
       @plugin_properties = begin
-        params[:plugin_properties].values.reject { |item| (item['value'].blank? || item['key'].blank?) }
+        params[:plugin_properties].values.reject { |item| item['value'].blank? || item['key'].blank? }
       rescue StandardError
         @plugin_properties = nil
       end

data/app/controllers/kaui/subscriptions_controller.rb

@@ -193,10 +193,11 @@ module Kaui
     def update_tags
       subscription_id = params.require(:id)
       subscription = Kaui::Subscription.find_by_id(subscription_id, options_for_klient)
-
       tags = []
-      params.each do |tag|
-        tag_info = tag.split('_')
+      params.each_key do |key|
+        next unless key.include? 'tag'
+
+        tag_info = key.split('_')
         next if (tag_info.size != 2) || (tag_info[0] != 'tag')
 
         tags << tag_info[1]
@@ -210,7 +211,7 @@ module Kaui
 
     def lookup_bundle_and_plan_details(subscription, base_product_name = nil)
       if subscription.product_category == 'ADD_ON'
-        bundle = Kaui::Bundle.find_by_id(@subscription.bundle_id, options_for_klient)
+        bundle = Kaui::Bundle.find_by_id(subscription.bundle_id, options_for_klient)
         if base_product_name.blank?
           bundle.subscriptions.each do |sub|
             if sub.product_category == 'BASE'
@@ -222,17 +223,17 @@ module Kaui
         plans_details = Kaui::Catalog.available_addons(base_product_name, subscription.account_id, options_for_klient)
       else
         bundle = nil
-        plans_details = catalog_plans(subscription.product_category == 'BASE' ? nil : subscription.product_category)
+        plans_details = catalog_plans(subscription.product_category == 'BASE' ? nil : subscription.product_category, subscription.account_id)
       end
       [bundle, plans_details]
     end
 
-    def catalog_plans(product_category = nil)
-      return Kaui::Catalog.available_base_plans(@subscription.account_id, options_for_klient) if product_category == 'BASE'
+    def catalog_plans(product_category = nil, account_id = nil)
+      return Kaui::Catalog.available_base_plans(account_id, options_for_klient) if product_category == 'BASE'
 
       options = options_for_klient
 
-      catalog = Kaui::Catalog.get_tenant_catalog_json(DateTime.now.to_s, @subscription.account_id, options)
+      catalog = Kaui::Catalog.get_tenant_catalog_json(DateTime.now.to_s, account_id, options)
       return [] if catalog.blank?
 
       plans = []

data/app/controllers/kaui/transactions_controller.rb

@@ -26,7 +26,7 @@ module Kaui
     def create
       transaction = Kaui::Transaction.new(params[:transaction].delete_if { |_key, value| value.blank? })
 
-      plugin_properties = params[:plugin_properties].values.reject { |item| (item['value'].blank? || item['key'].blank?) } unless params[:plugin_properties].blank?
+      plugin_properties = params[:plugin_properties].values.reject { |item| item['value'].blank? || item['key'].blank? } unless params[:plugin_properties].blank?
       unless plugin_properties.blank?
         plugin_properties.map! do |property|
           KillBillClient::Model::PluginPropertyAttributes.new(property)

data/app/helpers/kaui/date_helper.rb

@@ -17,7 +17,7 @@ module Kaui
 
       # If not, convert into account timezone and return the date part only
       parsed_date = DateTime.parse(date.to_s).in_time_zone(timezone)
-      parsed_date.to_s(:date_only)
+      parsed_date.to_fs(:date_only)
     end
 
     def truncate_millis(date_s)

data/app/helpers/kaui/object_helper.rb

@@ -2,6 +2,13 @@
 
 module Kaui
   module ObjectHelper
+    ADVANCED_SEARCH_OBJECT_FIELDS = %w[ID EXTERNAL_KEY NUMBER].freeze
+    ADVANCED_SEARCH_OBJECT_FIELDS_MAP = {
+      # ID is supported by all object types, hence not listed.
+      EXTERNAL_KEY: %w[ACCOUNT PAYMENT TRANSACTION BUNDLE],
+      NUMBER: %w[INVOICE]
+    }.freeze
+
     # Because we don't have access to the account_id, we use the restful_show routes
     def url_for_object(object_id, object_type)
       case object_type
@@ -27,7 +34,15 @@ module Kaui
     end
 
     def object_types_for_advanced_search
-      %i[ACCOUNT BUNDLE INVOICE CREDIT CUSTOM_FIELD INVOICE_PAYMENT INVOICE PAYMENT SUBSCRIPTION TRANSACTION TAG TAG_DEFINITION]
+      %i[ACCOUNT BUNDLE INVOICE CREDIT CUSTOM_FIELD INVOICE_PAYMENT PAYMENT SUBSCRIPTION TRANSACTION TAG TAG_DEFINITION]
+    end
+
+    def object_fields_for_advanced_search
+      [' '] + ADVANCED_SEARCH_OBJECT_FIELDS
+    end
+
+    def advanced_search_object_fields_map
+      ADVANCED_SEARCH_OBJECT_FIELDS_MAP
     end
   end
 end

data/app/helpers/kaui/plugin_helper.rb

@@ -21,7 +21,7 @@ module Kaui
         plugin_key = plugin.plugin_key
         installed_plugins << {
           # Unique identifier chosen by the user and used for kpm operations
-          plugin_key: plugin_key,
+          plugin_key:,
           # Notes:
           #   * plugin.plugin_name comes from kpm and is arbitrary (see Utils.get_plugin_name_from_file_path in the kpm codebase for instance)
           #   * plugin_name here is the plugin name as seen by Kill Bill and is typically defined in the Activator.java (this value is the one that matters for plugin configuration)

data/app/helpers/kaui/uuid_helper.rb

@@ -12,10 +12,10 @@ module Kaui
 
     def object_id_popover(object_id, placement = 'right', title = nil)
       content_tag(:span, truncate_uuid(object_id),
-                  id: "#{object_id}-popover", class: 'object-id-popover', title: title,
+                  id: "#{object_id}-popover", class: 'object-id-popover', title:,
                   data: {
                     id: object_id,
-                    placement: placement
+                    placement:
                   })
     end
   end

data/app/models/kaui/account_email.rb

@@ -3,17 +3,17 @@
 module Kaui
   class AccountEmail < KillBillClient::Model::AccountEmailAttributes
     def self.find_all_sorted_by_account_id(account_id, audit = 'NONE', options = {})
-      emails = Kaui::Account.new(account_id: account_id).emails(audit, options)
+      emails = Kaui::Account.new(account_id:).emails(audit, options)
       emails.map { |email| Kaui::AccountEmail.new(email.to_hash) }.sort
     end
 
     def create(user = nil, reason = nil, comment = nil, options = {})
-      account = Kaui::Account.new(account_id: account_id)
+      account = Kaui::Account.new(account_id:)
       account.add_email(email, user, reason, comment, options)
     end
 
     def destroy(user = nil, reason = nil, comment = nil, options = {})
-      account = Kaui::Account.new(account_id: account_id)
+      account = Kaui::Account.new(account_id:)
       account.remove_email(email, user, reason, comment, options)
     end
 

data/app/models/kaui/admin.rb

@@ -27,9 +27,9 @@ module Kaui
                                 { transactionStatus: transaction_status }.to_json,
                                 {},
                                 {
-                                  user: user,
-                                  reason: reason,
-                                  comment: comment
+                                  user:,
+                                  reason:,
+                                  comment:
                                 }.merge(options)
       end
 

data/app/models/kaui/admin_tenant.rb

@@ -33,7 +33,7 @@ module Kaui
 
         raw_tenant_config.each_with_object({}) do |e, hsh|
           # Strip prefix '/PLUGIN_CONFIG_'
-          plugin_name = e.key.gsub!(/PLUGIN_CONFIG_/, '')
+          plugin_name = e.key.gsub!('PLUGIN_CONFIG_', '')
 
           # Construct simple hash with one property (first value)
           hsh[plugin_name] = e.values[0]

data/app/models/kaui/catalog.rb

@@ -35,8 +35,8 @@ module Kaui
         raise e
       end
 
-      def get_catalog_json(latest, requested_date, options)
-        catalogs = get_tenant_catalog_json(requested_date, nil, options)
+      def get_catalog_json(latest, requested_date, account_id, options)
+        catalogs = get_tenant_catalog_json(requested_date, account_id, options)
         return catalogs.length.positive? ? catalogs[catalogs.length - 1] : nil if latest
 
         # Order by latest

data/app/models/kaui/invoice_payment.rb

@@ -21,7 +21,7 @@ module Kaui
           result.send("#{attr}=", raw_payment.send(attr))
         end
         # Use  Kaui::Transaction to benefit from additional fields (e.g next_retry_date)
-        original_transactions = (result.transactions || [])
+        original_transactions = result.transactions || []
         result.transactions = []
         original_transactions.each do |transaction|
           new_transaction = Kaui::Transaction.new

data/app/models/kaui/killbill_authenticatable.rb

@@ -31,8 +31,8 @@ module Devise
         # Invoked by the KillbillAuthenticatable strategy to lookup the user
         # before attempting authentication
         def find_for_killbill_authentication(kb_username)
-          find_for_authentication(kb_username: kb_username) ||
-            new(kb_username: 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

data/app/models/kaui/overdue.rb

@@ -19,7 +19,7 @@ module Kaui
             state.subscription_cancellation_policy = nil
           else
             state.is_disable_entitlement = true
-            state.subscription_cancellation_policy = state_model['subscription_cancellation_policy'].blank? ? :NONE : state_model['subscription_cancellation_policy'].to_s.gsub!(/POLICY_/, '')
+            state.subscription_cancellation_policy = state_model['subscription_cancellation_policy'].blank? ? :NONE : state_model['subscription_cancellation_policy'].to_s.gsub!('POLICY_', '')
           end
 
           if state_model['condition']
@@ -60,7 +60,7 @@ module Kaui
             attr_accessor :subscription_cancellation
           end
           state.subscription_cancellation = if state.is_disable_entitlement
-                                              state.subscription_cancellation_policy ? "POLICY_#{state.subscription_cancellation_policy}".to_sym : :NONE
+                                              state.subscription_cancellation_policy ? :"POLICY_#{state.subscription_cancellation_policy}" : :NONE
                                             else
                                               :NONE
                                             end

data/app/models/kaui/tag.rb

@@ -13,12 +13,12 @@ module Kaui
     class << self
       %i[account bundle subscription invoice].each do |model|
         define_method "all_for_#{model}" do |model_id, included_deleted, audit, options|
-          instance = Kaui.const_get(model.to_s.camelize).new("#{model}_id".to_sym => model_id)
+          instance = Kaui.const_get(model.to_s.camelize).new("#{model}_id": model_id)
           instance.tags(included_deleted, audit, options)
         end
 
         define_method "set_for_#{model}" do |model_id, tags, user, reason, comment, options|
-          instance = Kaui.const_get(model.to_s.camelize).new("#{model}_id".to_sym => model_id)
+          instance = Kaui.const_get(model.to_s.camelize).new("#{model}_id": model_id)
           instance.set_tags(tags, user, reason, comment, options)
         end
       end

data/app/models/kaui/tag_definition.rb

@@ -25,7 +25,7 @@ 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) || tag_definition.is_control_tag }).sort
+        (all('NONE', options_for_klient).delete_if { |tag_definition| !tag_definition.applicable_object_types.include?(object_type) }).sort
       end
     end
 

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

@@ -110,7 +110,7 @@
               <% end %>
             </table>
 
-            <% if can? :trigger, Kaui::Invoice %>
+            <% if (can? :trigger, Kaui::Invoice) || (can? :dry_run, Kaui::Invoice) %>
                 <div style="padding-bottom: 50px;">
                   <%= form_tag kaui_engine.trigger_invoice_path(params.to_h), :method => :post do %>
                       <div class="form-group">
@@ -118,13 +118,11 @@
                         <div class="col-sm-3">
                           <input class="form-control" id="target_date" name="target_date" type="text" data-provide="datepicker" data-date-format="yyyy-mm-dd" data-date-today-highlight="true">
                         </div>
-                        <% if can? :dry_run, Kaui::Invoice %>
                           <div style="width: 14.5%; float: left; padding: 0;">
                             <%= label_tag :dry_run do %>
-                                <%= check_box_tag :dry_run, '1', true %>&nbsp;<small>Dry-run</small>
+                                <%= check_box_tag :dry_run, '1', true, :disabled => !can?(:trigger, Kaui::Invoice) %>&nbsp;<small>Dry-run</small>
                             <% end %>
                           </div>
-                        <% end %>
                         <div class="col-xs-1" style="padding: 0;">
                           <%= button_tag '<i class="fa fa-magic"></i>'.html_safe, :class => 'btn btn-xs' %>
                         </div>

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

@@ -45,7 +45,7 @@
         <div class="form-group">
           <%= f.label :bill_cycle_day_local, 'Bill cycle day', :class => 'col-sm-3 control-label' %>
           <div class="col-sm-9">
-            <%= f.text_field :bill_cycle_day_local, :class => 'form-control' %>
+            <%= f.number_field :bill_cycle_day_local, :class => 'form-control', :min => 0, max: 31 %>
           </div>
         </div>
         <div class="form-group">
@@ -111,13 +111,13 @@
     <div class="form-group">
       <%= f.label :country, 'Country', :class => 'col-sm-3 control-label' %>
       <div class="col-sm-9">
-        <%= f.country_select :country, {:priority_countries => %w(US CA), :selected => @account.country}, :class => 'form-control' %>
+        <%= f.country_select :country, {:priority_countries => %w(US CA), :selected => @account.country, :sort_provided => false}, :class => 'form-control' %>
       </div>
     </div>
     <div class="form-group">
         <%= f.label :phone, 'Phone', :class => 'col-sm-3 control-label' %>
         <div class="col-sm-9">
-            <%= f.text_field :phone, :class => 'form-control' %>
+            <%= f.number_field :phone, :class => 'form-control' %>
         </div>
     </div>
     <div class="form-group">

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

@@ -65,7 +65,6 @@ $(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? %>
     $('#accounts-table').on('draw.dt', function() {
-      $.noConflict();
       var noMoreData = table.column(0)
                             .data()
                             .length == 0;

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

@@ -38,11 +38,11 @@
                     <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.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>
-                      <td><%= condition.number_field :total_unpaid_invoice_balance_equals_or_exceeds, :step => :any, :value => state.condition.total_unpaid_invoice_balance_equals_or_exceeds %></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 %></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>
+                      <td><%= condition.number_field :total_unpaid_invoice_balance_equals_or_exceeds, :step => :any, :value => state.condition&.total_unpaid_invoice_balance_equals_or_exceeds %></td>
                     <% end %>
                   <% end %>
                 <% end %>

data/app/views/kaui/home/_advanced_search_modal.html.erb

@@ -23,7 +23,7 @@
           <div class="form-group">
             <%= label_tag :search_by, 'Search by', :class => 'col-sm-4 control-label' %>
             <div class="col-sm-8">
-              <%= select_tag :search_by, options_for_select(['', 'ID', 'EXTERNAL_KEY'],''), :class => 'form-control' %>
+              <%= select_tag :search_by, options_for_select(object_fields_for_advanced_search,''), :class => 'form-control' %>
             </div>
           </div>
           <div class="form-group">
@@ -68,13 +68,34 @@
             $('#advancedQuery').val(query);
         }
 
+        const searchByFieldsMap = <%= advanced_search_object_fields_map.to_json.html_safe %>;
+        function refresh_search_by() {
+            var objectType = $('#object_type').val();
+
+            // Clears the selected field if it's not supported by the selected object type
+            var searchBy = $('#search_by').val();
+            if (searchByFieldsMap[searchBy] && !searchByFieldsMap[searchBy].includes(objectType)) {
+              $('#search_by').val(' ');
+              refresh_query();
+            }
+
+            // Updates search options to only show fields supported by the selected object type
+            for (field in searchByFieldsMap) {
+                var isSupported = searchByFieldsMap[field].includes(objectType);
+                var fieldOption = $(`#search_by > option[value=${field}]`);
+                isSupported ? fieldOption.show() : fieldOption.hide();
+            }
+        }
+
         $('#search_for').keyup(function(){ refresh_query(); });
         $('#search_for').change(function(){ refresh_query(); });
         $('#object_type').change(function(){ refresh_query(); });
+        $('#object_type').change(function(){ refresh_search_by(); });
         $('#search_by').change(function(){ refresh_query(); });
         $('#fast').change(function(){ refresh_query(); });
 
         refresh_query();
+        refresh_search_by();
 
     });
 <% end %>

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

@@ -4,8 +4,9 @@
 
     <h1>
       Invoice <%= @invoice.invoice_number %>
-      <% unless @invoice.invoice_number.blank? %>
+      <% if !@invoice.invoice_number.blank? %>
         <%= Kaui.customer_invoice_link.call(@invoice, self) %>
+        <%= Kaui.additional_invoice_links.call(@invoice, self) %>
       <% end %>
     </h1>