projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ebc849c
)
fix flat_introrate without an introductory period, RT#18124
author
Ivan Kohler
<ivan@freeside.biz>
Wed, 20 Jun 2012 09:45:27 +0000
(
02:45
-0700)
committer
Ivan Kohler
<ivan@freeside.biz>
Wed, 20 Jun 2012 09:45:27 +0000
(
02:45
-0700)
FS/FS/part_pkg/flat_introrate.pm
patch
|
blob
|
history
diff --git
a/FS/FS/part_pkg/flat_introrate.pm
b/FS/FS/part_pkg/flat_introrate.pm
index
33cc3d4
..
10c2056
100644
(file)
--- a/
FS/FS/part_pkg/flat_introrate.pm
+++ b/
FS/FS/part_pkg/flat_introrate.pm
@@
-32,8
+32,8
@@
sub base_recur {
warn "flat_introrate base_recur requires date!" if !$time;
my $now = $time ? $$time : time;
warn "flat_introrate base_recur requires date!" if !$time;
my $now = $time ? $$time : time;
- my ($duration) = ($self->option('intro_duration') =~ /^
(\d+)
$/);
- unless (
$duration
) {
+ my ($duration) = ($self->option('intro_duration') =~ /^
\s*(\d+)\s*
$/);
+ unless (
length($duration)
) {
die "Invalid intro_duration: " . $self->option('intro_duration');
}
my $intro_end = $self->add_freq($cust_pkg->setup, $duration);
die "Invalid intro_duration: " . $self->option('intro_duration');
}
my $intro_end = $self->add_freq($cust_pkg->setup, $duration);