Skip to content

Commit 723a6de

Browse files
committed
Update overdue delete flow and rename search box
1 parent f122d6a commit 723a6de

9 files changed

Lines changed: 17 additions & 13 deletions

File tree

app/assets/stylesheets/kaui/subscription.css

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -691,7 +691,7 @@ table tr.expired td {
691691
margin-bottom: 0.25rem;
692692
}
693693

694-
/* Advance Search modal – Subscription Bundles page */
694+
/* Advanced Search modal – Subscription Bundles page */
695695
.subscription-bundl-index .close-button {
696696
background: transparent;
697697
padding: 0;

app/controllers/kaui/admin_tenants_controller.rb

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,12 +306,16 @@ def modify_overdue_config
306306
options[:api_key] = current_tenant.api_key
307307
options[:api_secret] = current_tenant.api_secret
308308

309-
view_form_model = params.require(:kill_bill_client_model_overdue).permit!.to_h.compact_blank
309+
view_form_model = params[:kill_bill_client_model_overdue]&.permit!&.to_h&.compact_blank || {}
310310
view_form_model['states'] = view_form_model['states'].values if view_form_model['states'].present?
311-
312-
overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
313-
Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
314-
redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
311+
if view_form_model['states'].blank?
312+
Kaui::AdminTenant.delete_tenant_user_key_value('OVERDUE_CONFIG', options[:username], nil, comment, options)
313+
redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_updated_successfully')
314+
else
315+
overdue = Kaui::Overdue.from_overdue_form_model(view_form_model)
316+
Kaui::Overdue.upload_tenant_overdue_config_json(overdue.to_json, options[:username], nil, comment, options)
317+
redirect_to admin_tenant_path(current_tenant.id, active_tab: 'OverdueShow'), notice: I18n.t('flashes.notices.overdue_added_successfully')
318+
end
315319
end
316320

317321
def upload_overdue_config

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<span class="icon-container">
77
<%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
88
</span>
9-
Advance Search
9+
Advanced Search
1010
</h5>
1111
<button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
1212
<span aria-hidden="true">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<span class="icon-container">
77
<%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
88
</span>
9-
Advance Search
9+
Advanced Search
1010
</h5>
1111
<button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
1212
<span aria-hidden="true">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
</div>
1212
<span class="d-flex align-items-center gap-2">
1313
<%= render "kaui/components/button/button", {
14-
label: "Advance Search",
14+
label: "Advanced Search",
1515
icon: "kaui/search.svg",
1616
variant: "outline-secondary d-inline-flex align-items-center gap-1",
1717
type: "button",

app/views/kaui/invoices/_invoice_filterbar.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<span class="icon-container">
77
<%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
88
</span>
9-
Advance Search
9+
Advanced Search
1010
</h5>
1111
<button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
1212
<span aria-hidden="true">

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="filter-bar-container">
33
<div class="filter-bar">
44
<%= render "kaui/components/button/button", {
5-
label: "Advance Search",
5+
label: "Advanced Search",
66
icon: "kaui/search.svg",
77
variant: "outline-secondary d-inline-flex align-items-center gap-1",
88
type: "button",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<div class="filter-bar-container">
33
<div class="filter-bar">
44
<%= render "kaui/components/button/button", {
5-
label: "Advance Search",
5+
label: "Advanced Search",
66
icon: "kaui/search.svg",
77
variant: "outline-secondary d-inline-flex align-items-center gap-1",
88
type: "button",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<span class="icon-container">
88
<%= image_tag("kaui/modal/search.svg", width: 20, height: 20) %>
99
</span>
10-
Advance Search
10+
Advanced Search
1111
</h5>
1212
<button type="button" class="close close-button custom-hover" data-bs-dismiss="modal" aria-label="Close">
1313
<span aria-hidden="true">

0 commit comments

Comments
 (0)