diff options
author | ivan <ivan> | 2006-04-21 14:20:05 +0000 |
---|---|---|
committer | ivan <ivan> | 2006-04-21 14:20:05 +0000 |
commit | 33f3d32f1d13b8342f208f8633f5f9a3a7bcb392 (patch) | |
tree | 678abf913cdf789923b2334e874780a8e1a732c2 /FS/FS/part_pkg/subscription.pm | |
parent | 1e0dbd55775c7d9eba7db3d17a6173d03e3c2d0a (diff) |
fix some indentation and the default cutoff day
Diffstat (limited to 'FS/FS/part_pkg/subscription.pm')
-rw-r--r-- | FS/FS/part_pkg/subscription.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/FS/FS/part_pkg/subscription.pm b/FS/FS/part_pkg/subscription.pm index ccfcc00..bfb0582 100644 --- a/FS/FS/part_pkg/subscription.pm +++ b/FS/FS/part_pkg/subscription.pm @@ -20,8 +20,12 @@ use FS::part_pkg::flat; 'cutoff_day' => { 'name' => 'billing day', 'default' => 1, }, - + #it would be better if this had to be turned on, its confusing + 'externalid' => { 'name' => 'Optional External ID', + 'default' => '', + }, }, + 'fieldorder' => [ 'setup_fee', 'recur_fee', 'cutoff_day', 'externalid' ], 'fieldorder' => [ 'setup_fee', 'recur_fee','cutoff_day'], 'freq' => 'm', 'weight' => 30, @@ -29,16 +33,18 @@ use FS::part_pkg::flat; sub calc_recur { my($self, $cust_pkg, $sdate ) = @_; - my $cutoff_day=$self->option('cutoff_day') or 1; + my $cutoff_day = $self->option('cutoff_day') || 1; my $mnow = $$sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($mnow) )[0,1,2,3,4,5]; - if($mday <$cutoff_day){ + if ( $mday < $cutoff_day ) { if ($mon==0) {$mon=11;$year--;} else {$mon--;} } -$$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year); + + $$sdate = timelocal(0,0,0,$cutoff_day,$mon,$year); $self->option('recur_fee'); } + 1; |