projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RT#41866: Punctuation prevented package from billing [disallow negative]
[freeside.git]
/
FS
/
FS
/
part_pkg
/
flat_introrate.pm
diff --git
a/FS/FS/part_pkg/flat_introrate.pm
b/FS/FS/part_pkg/flat_introrate.pm
index
33cc3d4
..
7337602
100644
(file)
--- a/
FS/FS/part_pkg/flat_introrate.pm
+++ b/
FS/FS/part_pkg/flat_introrate.pm
@@
-1,12
+1,8
@@
package FS::part_pkg::flat_introrate;
package FS::part_pkg::flat_introrate;
+use base qw( FS::part_pkg::flat );
use strict;
use strict;
-use vars qw(@ISA %info $DEBUG $me);
-use FS::part_pkg::flat;
-
-@ISA = qw(FS::part_pkg::flat);
-$me = '[' . __PACKAGE__ . ']';
-$DEBUG = 0;
+use vars qw( %info );
%info = (
'name' => 'Introductory price for X months, then flat rate,'.
%info = (
'name' => 'Introductory price for X months, then flat rate,'.
@@
-32,8
+28,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);