- my $cutoff_day = $self->option('cutoff_day') || 1;
- return $self->calc_prorate(@_, $cutoff_day) - $self->calc_discount(@_);
+ #my($cust_pkg, $sdate, $details, $param ) = @_;
+ my $cust_pkg = $_[0];
+
+ my $charge = $self->calc_prorate(@_, $self->cutoff_day($cust_pkg));
+
+ $charge += $self->usageprice_recur(@_);
+ $cust_pkg->apply_usageprice(); #$sdate for prorating?
+
+ my $discount = $self->calc_discount(@_);
+
+ sprintf( '%.2f', ($cust_pkg->quantity || 1) * ($charge - $discount) );
+
+}
+
+sub cutoff_day {
+ my( $self, $cust_pkg ) = @_;
+ my $prorate_day = $cust_pkg->cust_main->prorate_day;
+ $prorate_day ? ( $prorate_day )
+ : split(/\s*,\s*/, $self->option('cutoff_day', 1) || '1');