[freeside-commits] branch master updated. b7d8bc26840a8238cd8c41faf5ba78abfceac383

Ivan ivan at 420.am
Wed Jun 20 02:45:28 PDT 2012


The branch, master has been updated
       via  b7d8bc26840a8238cd8c41faf5ba78abfceac383 (commit)
      from  ebc849c7b6d613f4853a581277d72db004a0bc9d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b7d8bc26840a8238cd8c41faf5ba78abfceac383
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Wed Jun 20 02:45:27 2012 -0700

    fix flat_introrate without an introductory period, RT#18124

diff --git a/FS/FS/part_pkg/flat_introrate.pm b/FS/FS/part_pkg/flat_introrate.pm
index 33cc3d4..10c2056 100644
--- 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;
 
-  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);

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/part_pkg/flat_introrate.pm |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)




More information about the freeside-commits mailing list