From c36a02978f5c129589b8ca56e11a5f027aa3a659 Mon Sep 17 00:00:00 2001
From: Rene Krenn <rkrenn@sipwise.com>
Date: Fri, 26 Feb 2021 15:34:13 +0100
Subject: [PATCH] TT#111305 TT#111304 add aoc_pulse_amount_per_message field

Change-Id: Id8878c8e39073c66854cc8d9c00943d37ae82d63
---
 etc/ngcp_panel.conf               |  1 +
 lib/NGCP/Panel/Form/BillingFee.pm | 13 ++++++++++++-
 lib/NGCP/Panel/Utils/Billing.pm   |  1 +
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/etc/ngcp_panel.conf b/etc/ngcp_panel.conf
index 396ecb28cf..d1396ece54 100644
--- a/etc/ngcp_panel.conf
+++ b/etc/ngcp_panel.conf
@@ -134,6 +134,7 @@ log4perl.appender.Default.layout.ConversionPattern=%d{ISO8601} [%p] [%F +%L] %m{
   element_order  offpeak_extra_rate
   element_order  offpeak_extra_second
   element_order  offpeak_use_free_time
+  element_order  aoc_pulse_amount_per_message
 </fees_csv>
 
 <sip>
diff --git a/lib/NGCP/Panel/Form/BillingFee.pm b/lib/NGCP/Panel/Form/BillingFee.pm
index 836a62612a..3283060951 100644
--- a/lib/NGCP/Panel/Form/BillingFee.pm
+++ b/lib/NGCP/Panel/Form/BillingFee.pm
@@ -215,6 +215,17 @@ has_field 'offpeak_extra_second' => (
     required => 0,
 );
 
+has_field 'aoc_pulse_amount_per_message' => (
+    type => 'Float',
+    size => 15,
+    precision => 14,
+    element_attr => {
+        rel => ['tooltip'],
+        title => ['The rate of a single AoC pulse message (e.g. 1 cent). For values greater than 0 cents (and follow rate greater than 0 cents), the resulting AoC pulse frequency is given by (<AoC pulse message rate> * <follow interval> / <follow rate>) seconds. This allows you to configure intervals for AoC pulse messages of less than 1 second.']
+    },
+    default => 0,
+);
+
 has_field 'save' => (
     type => 'Submit',
     value => 'Save',
@@ -229,7 +240,7 @@ has_block 'fields' => (
         onpeak_init_rate onpeak_init_interval onpeak_follow_rate
         onpeak_follow_interval offpeak_init_rate offpeak_init_interval
         offpeak_follow_rate offpeak_follow_interval onpeak_use_free_time offpeak_use_free_time
-        onpeak_extra_rate onpeak_extra_second offpeak_extra_rate offpeak_extra_second
+        onpeak_extra_rate onpeak_extra_second offpeak_extra_rate offpeak_extra_second aoc_pulse_amount_per_message
         /],
 );
 
diff --git a/lib/NGCP/Panel/Utils/Billing.pm b/lib/NGCP/Panel/Utils/Billing.pm
index 6b82529d81..3e8049f5de 100644
--- a/lib/NGCP/Panel/Utils/Billing.pm
+++ b/lib/NGCP/Panel/Utils/Billing.pm
@@ -269,6 +269,7 @@ sub process_billing_fees{
         $row->{onpeak_extra_second} = undef if (defined $row->{onpeak_extra_second} and $row->{onpeak_extra_second} eq '');
         $row->{offpeak_extra_second} = undef if (defined $row->{offpeak_extra_second} and $row->{offpeak_extra_second} eq '');
         $row->{offpeak_use_free_time} = $row->{onpeak_use_free_time} if (not defined $row->{offpeak_use_free_time} or $row->{offpeak_use_free_time} eq '');
+        $row->{aoc_pulse_amount_per_message} = 0 unless $row->{aoc_pulse_amount_per_message};
         unless (validate_billing_fee($row,
             sub {
                 my ($field,$error,$error_detail) = @_;