[freeside-commits] freeside/FS/FS/part_pkg flat.pm, 1.8,
1.9 prorate.pm, 1.6, 1.7 subscription.pm, 1.6, 1.7
Ivan,,,
ivan at wavetail.420.am
Fri Apr 21 07:20:07 PDT 2006
Update of /home/cvs/cvsroot/freeside/FS/FS/part_pkg
In directory wavetail:/tmp/cvs-serv15382
Modified Files:
flat.pm prorate.pm subscription.pm
Log Message:
fix some indentation and the default cutoff day
Index: prorate.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/prorate.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- prorate.pm 31 Mar 2006 09:20:54 -0000 1.6
+++ prorate.pm 21 Apr 2006 14:20:05 -0000 1.7
@@ -24,34 +24,38 @@
'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', 'unused_credit', 'cutoff_day' ],
- #'setup' => 'what.setup_fee.value',
- #'recur' => '\'my $mnow = $sdate; my ($sec,$min,$hour,$mday,$mon,$year) = (localtime($sdate) )[0,1,2,3,4,5]; my $mstart = timelocal(0,0,0,1,$mon,$year); my $mend = timelocal(0,0,0,1, $mon == 11 ? 0 : $mon+1, $year+($mon==11)); $sdate = $mstart; ( $part_pkg->freq - 1 ) * \' + what.recur_fee.value + \' / $part_pkg->freq + \' + what.recur_fee.value + \' / $part_pkg->freq * ($mend-$mnow) / ($mend-$mstart) ; \'',
+ 'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day',
+ 'externalid', ],
'freq' => 'm',
'weight' => 20,
);
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];
my $mend;
my $mstart;
- if($mday > $cutoff_day){
- $mend = timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
- $mstart= timelocal(0,0,0,$cutoff_day,$mon,$year);
+
+ if ( $mday > $cutoff_day ) {
+ $mend =
+ timelocal(0,0,0,$cutoff_day, $mon == 11 ? 0 : $mon+1, $year+($mon==11));
+ $mstart =
+ timelocal(0,0,0,$cutoff_day,$mon,$year);
- }
- else{
+ } else {
$mend = timelocal(0,0,0,$cutoff_day, $mon, $year);
- if ($mon==0) {$mon=11;$year--;} else {$mon--;}
+ if ($mon==0) {$mon=11;$year--;} else {$mon--;}
$mstart= timelocal(0,0,0,$cutoff_day,$mon,$year);
}
- $$sdate = $mstart;
+ $$sdate = $mstart;
my $permonth = $self->option('recur_fee') / $self->freq;
$permonth * ( ( $self->freq - 1 ) + ($mend-$mnow) / ($mend-$mstart) );
Index: flat.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/flat.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- flat.pm 20 Oct 2005 12:30:13 -0000 1.8
+++ flat.pm 21 Apr 2006 14:20:05 -0000 1.9
@@ -20,10 +20,11 @@
' of service at cancellation',
'type' => 'checkbox',
},
+ 'externalid' => { 'name' => 'Optional External ID',
+ 'default' => '',
+ },
},
- 'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit' ],
- #'setup' => 'what.setup_fee.value',
- #'recur' => 'what.recur_fee.value',
+ 'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'externalid' ],
'weight' => 10,
);
Index: subscription.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/part_pkg/subscription.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- subscription.pm 31 Mar 2006 09:20:54 -0000 1.6
+++ subscription.pm 21 Apr 2006 14:20:05 -0000 1.7
@@ -20,8 +20,12 @@
'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 @@
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;
More information about the freeside-commits
mailing list