projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
quiet warnings about CGI::param in list context
[freeside.git]
/
httemplate
/
edit
/
process
/
part_event.html
diff --git
a/httemplate/edit/process/part_event.html
b/httemplate/edit/process/part_event.html
index
0293af8
..
9a244a8
100644
(file)
--- a/
httemplate/edit/process/part_event.html
+++ b/
httemplate/edit/process/part_event.html
@@
-40,6
+40,7
@@
};
} elsif ( $info->{'type'} eq 'freq' ) {
$value = '0' if !length($value) and !$info->{'allow_blank'};
};
} elsif ( $info->{'type'} eq 'freq' ) {
$value = '0' if !length($value) and !$info->{'allow_blank'};
+ $value = '0' if $value =~ /[^\d]/;
$value .= $params->{$cgi_field.'_units'} if length($value);
}
$value .= $params->{$cgi_field.'_units'} if length($value);
}
@@
-75,13
+76,13
@@
}
( $option => $value );
}
}
( $option => $value );
}
- @{ $object->option_fields_listref };
+ @{ $object->option_fields_listref
|| []
};
},
'precheck_callback' => sub {
my $cgi = shift;
my $action = $cgi->param('action') or return;
},
'precheck_callback' => sub {
my $cgi = shift;
my $action = $cgi->param('action') or return;
- my %actionfields = map { $_ =~ /^$action\.(.*)/; $1 =>
$cgi->param($_
) }
+ my %actionfields = map { $_ =~ /^$action\.(.*)/; $1 =>
scalar($cgi->param($_)
) }
grep { /^$action\./ } $cgi->param;
if ( exists($actionfields{'reasonnum'}) and
length($actionfields{'reasonnum'}) == 0 ) {
grep { /^$action\./ } $cgi->param;
if ( exists($actionfields{'reasonnum'}) and
length($actionfields{'reasonnum'}) == 0 ) {
@@
-91,6
+92,10
@@
$cgi->param('disabled', 'Y');
}
$cgi->param('disabled', 'Y');
}
+ if ( $action eq 'pkg_fee' && !$actionfields{feepart} ) {
+ return "Select a Fee Definition to use this Event Action";
+ }
+
my $balance_age_rx = qr/^(condition.+)\.balance_age\.age$/;
foreach my $param ( keys %{ $cgi->Vars() } ){
my $balance_age_rx = qr/^(condition.+)\.balance_age\.age$/;
foreach my $param ( keys %{ $cgi->Vars() } ){
@@
-99,8
+104,10
@@
next unless $cgi->param($1) eq 'balance_age';
my $errstr = FS::part_event::Condition::balance_age->
next unless $cgi->param($1) eq 'balance_age';
my $errstr = FS::part_event::Condition::balance_age->
- check_options( { age => $cgi->param($param),
- age_units => $cgi->param("${param}_units") } );
+ check_options( { age => scalar($cgi->param($param)),
+ age_units => scalar($cgi->param("${param}_units")),
+ }
+ );
return $errstr if $errstr;
}
return $errstr if $errstr;
}