sub calc_setup {
# moved from all descendant packages which just had $self->option('setup_fee')
- my($self, $cust_pkg, $sdate, $details, $param) = @_;
+ my($self, $cust_pkg, $time, $details, $param) = @_;
- return 0 if $self->prorate_setup($cust_pkg, $sdate);
+ return 0 if $self->prorate_setup($cust_pkg, $time);
my $charge = $self->option('setup_fee');
my $discount = 0;
if ( $charge > 0 ) {
$param->{'setup_charge'} = $charge;
- $discount = $self->calc_discount($cust_pkg, $sdate, $details, $param);
+ $discount = $self->calc_discount($cust_pkg, \$time, $details, $param);
delete $param->{'setup_charge'};
}
- sprintf('%.2f', $charge - $discount);
+ sprintf('%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
}
sub cutoff_day {
# prorate/subscription only; we don't support sync_bill_date here
my( $self, $cust_pkg ) = @_;
my $recur_method = $self->option('recur_method',1) || 'anniversary';
- return () unless $recur_method eq 'prorate'
- || $recur_method eq 'subscription';
+ my $cust_main = $cust_pkg->cust_main;
- #false laziness w/prorate.pm::cutoff_day
- my $prorate_day = $cust_pkg->cust_main->prorate_day;
- $prorate_day ? ( $prorate_day )
- : split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1');
+ return ( $cust_main->prorate_day )
+ if $cust_main->prorate_day and ( $cust_main->force_prorate_day
+ || $recur_method eq 'prorate'
+ || $recur_method eq 'subscription'
+ );
+
+ return split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1')
+ if $recur_method eq 'prorate'
+ || $recur_method eq 'subscription';
+
+ return ();
}
sub calc_recur_Common {
my $recur_method = $self->option('recur_method', 1) || 'anniversary';
my @cutoff_day = $self->cutoff_day($cust_pkg);
- $charges = $self->base_recur($cust_pkg);
+ $charges = $self->base_recur($cust_pkg, $sdate, $details, $param);
$charges += $param->{'override_charges'} if $param->{'override_charges'};
if ( $recur_method eq 'prorate' ) {