From 48f8938dfd301c5a9dd1194ece7f74c8b98bd174 Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Mon, 16 Aug 2021 12:28:37 +0200 Subject: [PATCH] TT#134807 "ignore domain" option for billing profiles fee matching works in 2 attempts: 1. try to find a fee matching 2. if none found, try to find a fee matching the billing_profile record will get a new field "ignore_domain". if set to "1", step#1 above should be skipped. Change-Id: I7f0a8f1dd8d5699ad4e2b8242c68fb9f75fc1bff --- lib/NGCP/Panel/Form/BillingProfile/Admin.pm | 2 +- lib/NGCP/Panel/Form/BillingProfile/PeaktimeAPI.pm | 2 +- lib/NGCP/Panel/Form/BillingProfile/Reseller.pm | 11 ++++++++++- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/NGCP/Panel/Form/BillingProfile/Admin.pm b/lib/NGCP/Panel/Form/BillingProfile/Admin.pm index 09c8cbc8e7..f566f41b5a 100644 --- a/lib/NGCP/Panel/Form/BillingProfile/Admin.pm +++ b/lib/NGCP/Panel/Form/BillingProfile/Admin.pm @@ -15,7 +15,7 @@ has_field 'reseller' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/reseller handle name prepaid prepaid_library advice_of_charge interval_charge interval_free_time interval_free_cash + render_list => [qw/reseller handle name ignore_domain prepaid prepaid_library advice_of_charge interval_charge interval_free_time interval_free_cash fraud_interval_limit fraud_interval_lock fraud_interval_notify fraud_daily_limit fraud_daily_lock fraud_daily_notify fraud_use_reseller_rates currency id diff --git a/lib/NGCP/Panel/Form/BillingProfile/PeaktimeAPI.pm b/lib/NGCP/Panel/Form/BillingProfile/PeaktimeAPI.pm index 4f1f84c2cf..3f3cb26621 100644 --- a/lib/NGCP/Panel/Form/BillingProfile/PeaktimeAPI.pm +++ b/lib/NGCP/Panel/Form/BillingProfile/PeaktimeAPI.pm @@ -55,7 +55,7 @@ has_field 'peaktime_special.stop' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/reseller handle name prepaid prepaid_library advice_of_charge interval_charge interval_free_time interval_free_cash + render_list => [qw/reseller handle name ignore_domain prepaid prepaid_library advice_of_charge interval_charge interval_free_time interval_free_cash fraud_interval_limit fraud_interval_lock fraud_interval_notify fraud_daily_limit fraud_daily_lock fraud_daily_notify fraud_use_reseller_rates currency id diff --git a/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm b/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm index 0f7c96057f..f829c17d88 100644 --- a/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm +++ b/lib/NGCP/Panel/Form/BillingProfile/Reseller.pm @@ -36,6 +36,15 @@ has_field 'handle' => ( }, ); +has_field 'ignore_domain' => ( + type => 'Boolean', + default => 0, + element_attr => { + rel => ['tooltip'], + title => ['Ignore SIP domain part when matching fees.'] + }, +); + has_field 'prepaid' => ( type => 'Boolean', default => 0, @@ -203,7 +212,7 @@ has_field 'save' => ( has_block 'fields' => ( tag => 'div', class => [qw/modal-body/], - render_list => [qw/handle name prepaid prepaid_library advice_of_charge interval_charge interval_free_time interval_free_cash + render_list => [qw/handle name ignore_domain prepaid prepaid_library advice_of_charge interval_charge interval_free_time interval_free_cash fraud_interval_limit fraud_interval_lock fraud_interval_notify fraud_daily_limit fraud_daily_lock fraud_daily_notify fraud_use_reseller_rates currency id