- my $setup = $self->option('setup_fee') || 0;
- my $recur = $self->option('recur_fee', 1) || 0;
+ my $setup = $opt{cust_pkg} ? $self->base_setup( $opt{cust_pkg} )
+ : ($self->option('setup_fee') || 0);
+ my $recur = $opt{cust_pkg} ? $self->base_recur( $opt{cust_pkg} )
+ : ($self->option('recur_fee', 1) || 0);
+ $recur += $self->usageprice_recur( $opt{cust_pkg} ) if $opt{cust_pkg};