diff options
author | Jonathan Prykop <jonathan@freeside.biz> | 2016-06-21 23:54:30 -0500 |
---|---|---|
committer | Jonathan Prykop <jonathan@freeside.biz> | 2016-06-22 04:17:22 -0500 |
commit | dab2632c3799d37ef575ccc186f45bc81a734b0d (patch) | |
tree | acd04390e1eceea893992f936d3dcc2ddf5e223f /FS/FS/part_pkg | |
parent | 3afb93419e298b765104a6ed4df856d8e4d6fc25 (diff) |
RT#71166: Catch blank intro_duration at package definition setup
Diffstat (limited to 'FS/FS/part_pkg')
-rw-r--r-- | FS/FS/part_pkg/flat_introrate.pm | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm index 1fc9cd2..786841b 100644 --- a/FS/FS/part_pkg/flat_introrate.pm +++ b/FS/FS/part_pkg/flat_introrate.pm @@ -6,6 +6,31 @@ use vars qw( %info ); use FS::Log; +# mostly false laziness with FS::part_pkg::global_Mixin::validate_moneyn, +# except for blank string handling... +sub validate_money { + my ($option, $valref) = @_; + if ( $$valref eq '' ) { + $$valref = '0'; + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{1})\s*$/ ) { + #handle one decimal place without barfing out + $$valref = ( ($1||''). ($2.'0') ) || 0; + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{2})?\s*$/ ) { + $$valref = ( ($1||''). ($2||'') ) || 0; + } else { + return "Illegal (money) $option: ". $$valref; + } + return ''; +} + +sub validate_number { + my ($option, $valref) = @_; + $$valref = 0 unless $$valref; + return "Invalid $option" + unless ($$valref) = ($$valref =~ /^\s*(\d+)\s*$/); + return ''; +} + %info = ( 'name' => 'Introductory price for X months, then flat rate,'. 'relative to setup date (anniversary billing)', @@ -14,10 +39,12 @@ use FS::Log; 'fields' => { 'intro_fee' => { 'name' => 'Introductory recurring fee for this package', 'default' => 0, + 'validate' => \&validate_money, }, 'intro_duration' => { 'name' => 'Duration of the introductory period, in number of months', 'default' => 0, + 'validate' => \&validate_number, }, }, 'fieldorder' => [ qw(intro_duration intro_fee) ], |