my( $self, $opt, $ornull ) = @_;
#cache: was pulled up in the original part_pkg query
- if ( $opt =~ /^(setup|recur)_fee$/ && defined($self->hashref->{"_$opt"}) ) {
- return $self->hashref->{"_$opt"};
- }
+ return $self->hashref->{"_opt_$opt"}
+ if exists $self->hashref->{"_opt_$opt"};
cluck "$self -> option: searching for $opt" if $DEBUG;
my $part_pkg_option =
sub unit_setup {
my($self, $cust_pkg, $sdate, $details ) = @_;
- ( exists( $self->{'Hash'}{'_opt_setup_fee'} )
- ? $self->{'Hash'}{'_opt_setup_fee'}
- : $self->option('setup_fee', 1)
- )
- || 0;
+ $self->option('setup_fee', 1) || 0;
}
sub calc_recur {
sub base_recur {
my($self, $cust_pkg, $sdate) = @_;
- ( exists( $self->{'Hash'}{'_opt_recur_fee'} )
- ? $self->{'Hash'}{'_opt_recur_fee'}
- : $self->option('recur_fee', 1)
- )
- || 0;
+ $self->option('recur_fee', 1) || 0;
}
sub base_recur_permonth {