From ef9b6c8513a4af438139f4992b42b9285f64ab1d Mon Sep 17 00:00:00 2001 From: Jonathan Prykop Date: Mon, 25 Apr 2016 16:41:38 -0500 Subject: [PATCH] RT#41866: Punctuation prevented package from billing [disallow negative] --- FS/FS/part_pkg/global_Mixin.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FS/FS/part_pkg/global_Mixin.pm b/FS/FS/part_pkg/global_Mixin.pm index 31d178d8c..0281a51f8 100644 --- a/FS/FS/part_pkg/global_Mixin.pm +++ b/FS/FS/part_pkg/global_Mixin.pm @@ -19,10 +19,10 @@ sub validate_moneyn { my ($option, $valref) = @_; if ( $$valref eq '' ) { return ''; - } elsif ( $$valref =~ /^\s*(\-)?\s*(\d*)(\.\d{1})\s*$/ ) { + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{1})\s*$/ ) { #handle one decimal place without barfing out $$valref = ( ($1||''). ($2||''). ($3.'0') ) || 0; - } elsif ( $$valref =~ /^\s*(\-)?\s*(\d*)(\.\d{2})?\s*$/ ) { + } elsif ( $$valref =~ /^\s*(\d*)(\.\d{2})?\s*$/ ) { $$valref = ( ($1||''). ($2||''). ($3||'') ) || 0; } else { return "Illegal (money) $option: ". $$valref; -- 2.11.0