diff options
| author | Christopher Burger <burgerc@freeside.biz> | 2019-01-09 12:28:19 -0500 |
|---|---|---|
| committer | Christopher Burger <burgerc@freeside.biz> | 2019-01-10 09:34:00 -0500 |
| commit | ae6359efac06d899093f799052ef8d472effbe98 (patch) | |
| tree | ff60be7c8a2e324ed67847629cb8dc1f00fd3412 /FS/FS | |
| parent | b944b927f03a8b7d8c8978e6adb1ae0251d1295f (diff) | |
RT# 81249 - added ability to validate price plan option fields
Diffstat (limited to 'FS/FS')
| -rw-r--r-- | FS/FS/part_pkg.pm | 8 | ||||
| -rw-r--r-- | FS/FS/part_pkg/voip_cdr.pm | 4 | ||||
| -rw-r--r-- | FS/FS/part_pkg/voip_inbound.pm | 4 |
3 files changed, 16 insertions, 0 deletions
diff --git a/FS/FS/part_pkg.pm b/FS/FS/part_pkg.pm index c088205..1895404 100644 --- a/FS/FS/part_pkg.pm +++ b/FS/FS/part_pkg.pm @@ -693,6 +693,14 @@ sub replace { ''; } +sub validate_number { + my ($option, $valref) = @_; + $$valref = 0 unless $$valref; + return "Invalid $option" + unless ($$valref) = ($$valref =~ /^\s*(\d+)\s*$/); + return ''; +} + =item check Checks all fields to make sure this is a valid package definition. If diff --git a/FS/FS/part_pkg/voip_cdr.pm b/FS/FS/part_pkg/voip_cdr.pm index 49e43e9..715d5c0 100644 --- a/FS/FS/part_pkg/voip_cdr.pm +++ b/FS/FS/part_pkg/voip_cdr.pm @@ -166,9 +166,13 @@ tie my %accountcode_tollfree_field, 'Tie::IxHash', }, 'use_cdrtypenum' => { 'name' => 'Only charge for CDRs where the CDR Type is set to this cdrtypenum: ', + 'validate' => \&FS::part_pkg::validate_number, + 'js_validate' => 'digits', }, 'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to this cdrtypenum: ', + 'validate' => \&FS::part_pkg::validate_number, + 'js_validate' => 'digits', }, 'use_calltypenum' => { 'name' => 'Only charge for CDRs where the CDR Call Type is set to this calltypenum: ', diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm index 1cfa31b..45a7428 100644 --- a/FS/FS/part_pkg/voip_inbound.pm +++ b/FS/FS/part_pkg/voip_inbound.pm @@ -64,9 +64,13 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); }, 'use_cdrtypenum' => { 'name' => 'Only charge for CDRs where the CDR Type is set to this cdrtypenum: ', + 'validate' => \&FS::part_pkg::validate_number, + 'js_validate' => 'digits', }, 'ignore_cdrtypenum' => { 'name' => 'Do not charge for CDRs where the CDR Type is set to this cdrtypenum: ', + 'validate' => \&FS::part_pkg::validate_number, + 'js_validate' => 'digits', }, 'use_calltypenum' => { 'name' => 'Only charge for CDRs where the CDR Call Type is set to this cdrtypenum: ', |