kaui 4.0.14 → 4.0.16

data/app/controllers/kaui/admin_tenants_controller.rb

@@ -63,6 +63,7 @@ module Kaui
 
       @overdue = flash[:overdue_deleted] ? nil : wait(fetch_overdue)
       @overdue_xml = flash[:overdue_deleted] ? nil : wait(fetch_overdue_xml)
+      @overdue_config_exists = @overdue_xml.present? || (@overdue&.overdue_states.present? && !@overdue.has_states)
       @tenant_plugin_config = begin
         wait(fetch_tenant_plugin_config)
       rescue StandardError
@@ -288,13 +289,19 @@ module Kaui
       options = tenant_options_for_client
       options[:api_key] = @tenant.api_key
       options[:api_secret] = @tenant.api_secret
+      @overdue_config_exists = false
       begin
         @overdue = Kaui::Overdue.get_overdue_json(options)
         @overdue_corrupted = false
+        @overdue_config_exists = @overdue.overdue_states.present? && !@overdue.has_states
+      rescue KillBillClient::API::NotFound
+        @overdue = KillBillClient::Model::Overdue.new.tap { |o| o.overdue_states = [] }
+        @overdue_corrupted = false
       rescue StandardError => e
         Rails.logger.warn("Failed to load overdue configuration for tenant #{@tenant.id}: #{e.class}: #{e.message}")
         @overdue = KillBillClient::Model::Overdue.new.tap { |o| o.overdue_states = [] }
         @overdue_corrupted = true
+        @overdue_config_exists = true
         flash.now[:warning] = 'The existing overdue configuration is corrupted and cannot be loaded. Use the XML upload below to replace it with a valid configuration.'
       end
     end
@@ -342,6 +349,24 @@ module Kaui
       redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_uploaded_successfully')
     end
 
+    def delete_overdue_config
+      current_tenant = safely_find_tenant_by_id(params[:id])
+
+      options = tenant_options_for_client
+      options[:api_key] = current_tenant.api_key
+      options[:api_secret] = current_tenant.api_secret
+
+      begin
+        Kaui::AdminTenant.delete_tenant_user_key_value('OVERDUE_CONFIG', options[:username], nil, comment, options)
+      rescue StandardError => e
+        flash[:error] = "Failed to delete overdue config: #{as_string(e)}"
+        redirect_to admin_tenant_new_overdue_config_path(id: current_tenant.id) and return
+      end
+
+      flash[:overdue_deleted] = true
+      redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_deleted_successfully')
+    end
+
     def upload_invoice_template
       current_tenant = safely_find_tenant_by_id(params[:id])
 

data/app/controllers/kaui/engine_controller.rb

@@ -38,7 +38,8 @@ class Kaui::EngineController < ApplicationController
   end
 
   def populate_account_details
-    @account ||= params[:account_id].present? ? Kaui::Account.find_by_id(params[:account_id], false, false, options_for_klient) : Kaui::Account.new
+    account_id = scalar_account_id_param
+    @account ||= account_id.present? ? Kaui::Account.find_by_id(account_id, false, false, options_for_klient) : Kaui::Account.new
   end
 
   def retrieve_tenants_for_current_user

data/app/controllers/kaui/engine_controller_util.rb

@@ -37,8 +37,8 @@ module Kaui
     end
 
     def paginate(searcher, data_extractor, formatter, table_default_columns = [])
-      search_key = (params[:search] || {})[:value].presence
-      advance_search_query = params[:advance_search_query].presence
+      search_key = normalize_search_key((params[:search] || {})[:value]).presence
+      advance_search_query = normalize_search_key(params[:advance_search_query]).presence
 
       search_key = advance_search_query if advance_search_query
       search_key = handle_balance_search(search_key) if search_key.present?
@@ -84,6 +84,30 @@ module Kaui
       end
     end
 
+    def advanced_search_query?(search_key)
+      search_key.to_s.include?('_q')
+    end
+
+    def scalar_account_id_param
+      path_account_id = request.path_parameters[:account_id].presence
+      return path_account_id if path_account_id.present?
+
+      account_id = params[:account_id]
+      account_id if account_id.is_a?(String) || account_id.is_a?(Numeric)
+    end
+
+    def normalize_search_key(search_key)
+      return if search_key.blank?
+
+      if search_key.respond_to?(:to_unsafe_h)
+        search_key.to_unsafe_h.to_query
+      elsif search_key.is_a?(Hash)
+        search_key.to_query
+      else
+        search_key
+      end
+    end
+
     def promise(&)
       # Evaluation starts immediately
       ::Concurrent::Promises.future do

data/app/controllers/kaui/invoices_controller.rb

@@ -4,7 +4,7 @@ require 'csv'
 module Kaui
   class InvoicesController < Kaui::EngineController
     def index
-      @search_query = params[:account_id]
+      @search_query = scalar_account_id_param
       @advance_search_query = params[:q] || request.query_string
       @ordering = params[:ordering] || 'desc'
       @offset = params[:offset] || 0
@@ -15,7 +15,7 @@ module Kaui
     end
 
     def download
-      account_id = params[:account_id]
+      account_id = scalar_account_id_param
       start_date = params[:startDate]
       end_date = params[:endDate]
       all_fields_checked = params[:allFieldsChecked] == 'true'
@@ -60,7 +60,7 @@ module Kaui
 
       searcher = lambda do |search_key, offset, limit|
         account = begin
-          Kaui::Account.find_by_id_or_key(search_key, false, false, cached_options_for_klient)
+          Kaui::Account.find_by_id_or_key(search_key, false, false, cached_options_for_klient) unless advanced_search_query?(search_key)
         rescue StandardError
           nil
         end

data/app/controllers/kaui/payments_controller.rb

@@ -5,7 +5,7 @@ require 'csv'
 module Kaui
   class PaymentsController < Kaui::EngineController
     def index
-      @search_query = params[:q] || params[:account_id]
+      @search_query = params[:q] || scalar_account_id_param
       @advance_search_query = params[:q] || request.query_string
       @ordering = params[:ordering] || (@search_query.blank? ? 'desc' : 'asc')
       @offset = params[:offset] || 0
@@ -16,7 +16,7 @@ module Kaui
     end
 
     def download
-      account_id = params[:account_id]
+      account_id = scalar_account_id_param
       start_date = params[:startDate]
       end_date = params[:endDate]
       all_fields_checked = params[:allFieldsChecked] == 'true'
@@ -104,7 +104,7 @@ module Kaui
           payments = Kaui::Payment.list_or_search(payment_state, offset, limit, options_for_klient)
         else
           account = begin
-            Kaui::Account.find_by_id_or_key(search_key, false, false, options_for_klient)
+            Kaui::Account.find_by_id_or_key(search_key, false, false, options_for_klient) unless advanced_search_query?(search_key)
           rescue StandardError
             nil
           end

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

@@ -1,212 +1,10 @@
-<div class="modal fade kaui-accounts-index-filterbar" 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>
-          Advanced 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">
-              <% @search_fields.each do |value, title| %>
-                <option value="<%= value %>"><%= title %></option>
-              <% end %>
-            </select>
-            <button type="button" class="border-button custom-hover" id="addSearchField">
-              <%= image_tag("kaui/modal/plus.svg", width: 16, height: 16) %>
-            </button>
-          </div>
-          <div id="search-fields-container">
-          </div>
-          <div id="save-search-container" style="display: none;">
-            <hr class="mt-4 mb-3">
-            <div class="form-group d-flex align-items-center mb-0">
-              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;">Save As Name</label>
-              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="Enter a name for this search...">
-            </div>
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <%= render "kaui/components/button/button", {
-          label: 'Save Search As...',
-          variant: "outline-secondary d-inline-flex align-items-center gap-1",
-          type: "button",
-          html_class: "kaui-button custom-hover",
-          html_options: {
-            id: "saveAdvanceSearch"
-          }
-        } %>
-        <%= 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>
-
-<template id="search-field-template" class="kaui-accounts-index-filterbar">
-  <div class="form-group row align-items-center justify-content-between search-field">
-    <label class="col-sm-3 col-form-label search-field-label"></label>
-    <div class="col-sm-4">
-      <select class="form-control search-field-filter">
-        <option value="eq">Equals</option>
-        <option value="neq">Not Equals</option>
-        <option value="gt">Greater Than</option>
-        <option value="gte">Greater Than Or Equal</option>
-        <option value="lt">Less Than</option>
-        <option value="lte">Less Than Or Equal</option>
-        <option value="like">Like</option>
-      </select>
-    </div>
-    <div class="col-sm-4">
-      <input type="text" class="form-control search-field-value">
-    </div>
-    <button type="button" class="button custom-hover" id="remove-search-field">
-      <%= image_tag("kaui/modal/red-close.svg", width: 16, height: 16) %>
-    </button>
-  </div>
-</template>
-
-<%= javascript_tag do %>
-$(document).ready(function() {
-
-  populateSearchLabelsFromUrl();
-  var dateFields = ['Created date', 'Updated date', 'Reference time'];
-  // Handle the "Add" button click to add new search fields
-  $('#addSearchField').on('click', function() {
-    var selectedField = $('#searchFieldSelect option:selected').text();
-    var template = document.getElementById('search-field-template').content.cloneNode(true);
-
-    // Set the label and input names based on the selected field
-    template.querySelector('.search-field-label').textContent = selectedField.replace(/([A-Z])/g, ' $1').trim();
-    template.querySelector('.search-field-filter').name = selectedField + 'Filter';
-
-    // Check if the field should use a date input
-    if (dateFields.includes(selectedField)) {
-      template.querySelector('.search-field-value').type = 'date';
-    } else {
-      template.querySelector('.search-field-value').type = 'text';
-    }
-    template.querySelector('.search-field-value').name = selectedField;
-
-    // Append the new search field to the container
-    document.getElementById('search-fields-container').appendChild(template);
-  });
-
-  // Handle the "Apply Search" button click inside the modal
-  $('#applyAdvanceSearch').on('click', function() {
-    var searchFields = $('.search-field');
-    var searchLabelsContainer = $('#search-labels-container');
-    searchLabelsContainer.empty();
-
-    // Validate that at least one search field has a value
-    var hasValue = false;
-    searchFields.each(function() {
-      var value = $(this).find('.search-field-value').val().trim();
-      if (value !== '') {
-        hasValue = true;
-        return false; // Break the loop
-      }
-    });
-
-    // If no search field has a value, show an alert and prevent search
-    if (!hasValue) {
-      alert('Please enter a value for at least one search field.');
-      return;
-    }
-
-    var table = $('#accounts-table').DataTable();
-    table.off('preXhr.dt.filter');
-    table.on('preXhr.dt.filter', function(e, settings, data) {
-      data.search.value = searchQuery('');
-    });
-
-    // Update the DataTables ajax URL with the new search parameters
-    var searchParams = searchQuery('');
-    var ajaxUrl = "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>";
-    if (searchParams) {
-      ajaxUrl += (ajaxUrl.includes('?') ? '&' : '?') + searchParams;
-    }
-    table.ajax.url(ajaxUrl).load();
-
-    // Update the URL with the search parameters
-    if (searchParams) {
-      searchParams = searchParams.replace(/account_id/g, 'ac_id');
-      var newUrl = window.location.protocol + "//" + window.location.host + window.location.pathname + '?' + searchParams;
-      window.history.pushState({ path: newUrl }, '', newUrl);
-    }
-
-    searchFields.each(function() {
-      var filter = $(this).find('.search-field-filter option:selected').text().trim();
-      var value = $(this).find('.search-field-value').val().trim();
-      var columnName = $(this).find('.search-field-filter').attr('name').replace('Filter', '').trim();
-
-      // Create and append the search label
-      if (value !== '') {
-        var label = $('<span>', {
-          class: 'label label-info d-inline-flex align-items-center gap-2',
-          'data-field': columnName,
-          'data-filter': filter,
-          'data-value': value
-        });
-        var labelText = $('<span>', { text: columnName + ' [' + filter + '] ' + value });
-        var closeIcon = $('<span>', {
-          class: 'filter-close-icon',
-          style: 'cursor: pointer; margin-left: 5px; display: inline-flex; align-items: center;'
-        }).html('<svg width="12" height="12" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M15.8337 4.1665L4.16699 15.8332M4.16699 4.1665L15.8337 15.8332" stroke="#A4A7AE" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>');
-        label.append(labelText).append(closeIcon);
-        searchLabelsContainer.append(label);
-      }
-    });
-
-    $('#advanceSearchModal').modal('hide');
-  });
-
-  // Populate the modal with the current filters when it is shown
-  $('#advanceSearchModal').on('show.bs.modal', function() {
-    showAdvanceSearchModal();
-    $('#search-fields-container .search-field').each(function() {
-      var input = $(this).find('.search-field-value');
-      if (dateFields.includes(input.attr('name'))) {
-        input.attr('type', 'date');
-      }
-    });
-  });
-
-  $('#clearAdvanceSearch').on('click', function() {
-    clearAdvanceSearch();
-  });
-
-  // Handle the remove icon click event to remove search fields
-  $('#search-fields-container').on('click', '#remove-search-field', function() {
-    $(this).closest('.search-field').remove();
-  });
-});
-<% end %>
+<%= render "kaui/shared/advanced_search_filterbar", {
+  modal_class: "kaui-accounts-index-filterbar",
+  search_fields: @search_fields,
+  date_fields: ['Created date', 'Updated date', 'Reference time'],
+  number_fields: [],
+  table_selector: '#accounts-table',
+  pagination_path: accounts_pagination_path(:ordering => @ordering, :format => :json),
+  search_query: '',
+  balance_notice: false
+} %>

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

@@ -103,7 +103,13 @@ $(document).ready(function() {
     "serverSide": true,
     "search": {"search": "<%= @search_query %>"},
     "ajax": {
-      url: "<%= accounts_pagination_path(:ordering => @ordering, :format => :json, :advance_search_query => @advance_search_query) %>",
+      type: "POST",
+      url: "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>",
+      headers: {"X-CSRF-Token": $("meta[name='csrf-token']").attr("content")},
+      data: function(d) {
+        d.advance_search_query = "<%= j(@advance_search_query.to_s) %>";
+        return d;
+      },
       dataSrc: function(json) {
         var colOrder = table.colReorder.order();
         var reorderedData = json.data.map(function(row) {
@@ -127,9 +133,10 @@ $(document).ready(function() {
   // DataTable request with the correct filters.
   if (window.location.search.includes('_q=1') && '<%= j(@advance_search_query.to_s.strip) %>' === '') {
     var urlSearch = window.location.search.substring(1).replace(/ac_id/g, 'account_id');
-    var ajaxUrl = "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>" + '?' + urlSearch;
+    var ajaxUrl = "<%= accounts_pagination_path(:ordering => @ordering, :format => :json) %>";
     table.on('preXhr.dt.filter', function(e, settings, data) {
       data.search.value = urlSearch;
+      data.advance_search_query = urlSearch;
     });
     table.ajax.url(ajaxUrl).load();
   }

data/app/views/kaui/admin_tenants/_show_overdue.erb

@@ -6,6 +6,17 @@
           <h2>Existing Overdue Config</h2>
         </div>
         <span>
+          <% if @overdue_config_exists && can?(:config_upload, Kaui::AdminTenant) %>
+            <% overdue_delete_confirmation = t('admin_tenants.delete_overdue_config_confirmation') %>
+            <%= link_to kaui_engine.admin_tenant_delete_overdue_config_path(id: @tenant.id), method: :delete, data: { confirm: overdue_delete_confirmation }, class: "text-decoration-none" do %>
+              <%= render "kaui/components/button/button", {
+                  label: "Delete",
+                  variant: "outline-secondary d-inline-flex align-items-center gap-1",
+                  type: "button",
+                  html_class: "kaui-button dots-menu custom-hover",
+              } %>
+            <% end %>
+          <% end %>
           <%= link_to "javascript:void(0);", onclick: "submit_overdue_xml();", class:"text-decoration-none" do %>
               <%= render "kaui/components/button/button", {
                   label: "XML View",

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

@@ -1,4 +1,8 @@
-<div class="modal fade" id="advanceSearchModal" tabindex="-1" role="dialog" aria-labelledby="advanceSearchModalLabel" aria-hidden="true">
+<div class="modal fade kaui-advanced-search-modal" id="advanceSearchModal" tabindex="-1" role="dialog" aria-labelledby="advanceSearchModalLabel" aria-hidden="true"
+     data-save-search-label="<%= t('advanced_search.actions.save_search_as') %>"
+     data-save-label="<%= t('advanced_search.actions.save') %>"
+    data-empty-value-message="<%= t('advanced_search.validation.empty_value') %>"
+    data-missing-field-message="<%= t('advanced_search.validation.missing_field') %>">
   <div class="modal-dialog" role="document">
     <div class="modal-content">
       <div class="modal-header">
@@ -6,9 +10,9 @@
           <span class="icon-container">
             <%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
           </span>
-          Advanced Search
+          <%= t('advanced_search.title') %>
         </h5>
-        <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
+        <button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="<%= t('advanced_search.actions.close') %>">
           <span aria-hidden="true">
             <%= image_tag("kaui/modal/close.svg", width: 20, height: 20) %>
           </span>
@@ -16,49 +20,54 @@
       </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 class="advanced-search-builder">
+            <div class="advanced-search-group">
+              <div class="advanced-search-query-row">
+                <select id="searchFieldSelect" class="form-control" aria-label="<%= t('advanced_search.search_field') %>">
+                  <option value=""><%= t('advanced_search.select_placeholder') %></option>
+                  <% Kaui::Bundle::SEARCH_FIELDS.each do |value, title| %>
+                    <option value="<%= value %>" <%= 'selected' if @search_query.present? && @search_by == value %>><%= title %></option>
+                  <% end %>
+                </select>
+                <input type="text" id="bundleSearchValue" class="form-control" aria-label="<%= t('advanced_search.search_value') %>" placeholder="<%= t('advanced_search.value_placeholder') %>" value="<%= @search_query %>">
+              </div>
+            </div>
           </div>
           <div id="save-search-container" style="display: none;">
             <hr class="mt-4 mb-3">
             <div class="form-group d-flex align-items-center mb-0">
-              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;">Save As Name</label>
-              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="Enter a name for this search...">
+              <label for="savedSearchName" class="mr-2 field-label" style="width: 30%;"><%= t('advanced_search.save_as_name') %></label>
+              <input type="text" id="savedSearchName" class="form-control flex-grow-1" placeholder="<%= t('advanced_search.save_name_placeholder') %>">
             </div>
           </div>
         </form>
       </div>
       <div class="modal-footer">
-        <%= render "kaui/components/button/button", {
-          label: 'Save Search As...',
-          variant: "outline-secondary d-inline-flex align-items-center gap-1",
-          type: "button",
-          html_class: "kaui-button custom-hover",
-          html_options: { id: "saveAdvanceSearch" }
-        } %>
-        <%= 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 class="advanced-search-footer-left">
+          <%= render "kaui/components/button/button", {
+            label: t('advanced_search.actions.save_search_as'),
+            variant: "advanced-search-button advanced-search-button-secondary d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "custom-hover",
+            html_options: { id: "saveAdvanceSearch" }
+          } %>
+        </div>
+        <div class="advanced-search-footer-right">
+          <%= render "kaui/components/button/button", {
+            label: t('advanced_search.actions.clear_search'),
+            variant: "advanced-search-button advanced-search-button-ghost d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "custom-hover",
+            html_options: { id: "clearAdvanceSearch" }
+          } %>
+          <%= render "kaui/components/button/button", {
+            label: t('advanced_search.actions.apply_search'),
+            variant: "advanced-search-button advanced-search-button-primary d-inline-flex align-items-center gap-1",
+            type: "button",
+            html_class: "custom-hover",
+            html_options: { id: "applyAdvanceSearch" }
+          } %>
+        </div>
       </div>
     </div>
   </div>
@@ -69,7 +78,7 @@ $(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 searchBy = params.get('search_by') || '';
     var q = params.get('q') || '';
     $('#searchFieldSelect').val(searchBy);
     $('#bundleSearchValue').val(q);
@@ -79,7 +88,15 @@ $(document).ready(function() {
   $('#applyAdvanceSearch').on('click', function() {
     var searchBy = $('#searchFieldSelect').val();
     var q = $('#bundleSearchValue').val().trim();
-    if (!q) return;
+    if (!searchBy) {
+      alert($('#advanceSearchModal').data('missing-field-message'));
+      return;
+    }
+
+    if (!q) {
+      alert($('#advanceSearchModal').data('empty-value-message'));
+      return;
+    }
 
     var url = new URL(window.location.href);
     url.searchParams.set('search_by', searchBy);