diff options
| -rw-r--r-- | FS/FS/part_pkg/prorate.pm | 2 | ||||
| -rw-r--r-- | FS/FS/part_pkg/voip_inbound.pm | 10 | ||||
| -rwxr-xr-x | httemplate/edit/part_pkg.cgi | 6 |
3 files changed, 8 insertions, 10 deletions
diff --git a/FS/FS/part_pkg/prorate.pm b/FS/FS/part_pkg/prorate.pm index d3ca77ae9..e5773088c 100644 --- a/FS/FS/part_pkg/prorate.pm +++ b/FS/FS/part_pkg/prorate.pm @@ -86,7 +86,7 @@ use FS::part_pkg::flat; }, }, 'fieldorder' => [ 'setup_fee', 'recur_fee', 'unused_credit', 'cutoff_day', - 'seconds', 'upbyte', 'downbytes', 'totalbytes', + 'seconds', 'upbytes', 'downbytes', 'totalbytes', 'recharge_amount', 'recharge_seconds', 'recharge_upbytes', 'recharge_downbytes', 'recharge_totalbytes', 'usage_rollover', 'recharge_reset', 'externalid', ], diff --git a/FS/FS/part_pkg/voip_inbound.pm b/FS/FS/part_pkg/voip_inbound.pm index 15291e31b..4937bb86b 100644 --- a/FS/FS/part_pkg/voip_inbound.pm +++ b/FS/FS/part_pkg/voip_inbound.pm @@ -163,7 +163,6 @@ tie my %granularity, 'Tie::IxHash', FS::rate_detail::granularities(); use_duration output_format usage_mandate summarize_usage usage_section bill_every_call - count_available_phones ) ], 'weight' => 40, @@ -366,15 +365,8 @@ sub is_free { # to indicate it represents a line sub calc_units { my($self, $cust_pkg ) = @_; - my $count = 0; - if ( $self->option('count_available_phones', 1)) { - map { $count += ( $_->quantity || 0 ) } - grep { $_->part_svc->svcdb eq 'svc_phone' } - $cust_pkg->part_pkg->pkg_svc; - } else { - $count = + my $count = scalar(grep { $_->part_svc->svcdb eq 'svc_phone' } $cust_pkg->cust_svc); - } $count; } diff --git a/httemplate/edit/part_pkg.cgi b/httemplate/edit/part_pkg.cgi index f9818c4f9..9ee8d4d0d 100755 --- a/httemplate/edit/part_pkg.cgi +++ b/httemplate/edit/part_pkg.cgi @@ -506,6 +506,12 @@ my $html_bottom = sub { : keys %{ $href }; foreach my $field ( grep $_ !~ /^(setup|recur)_fee$/, @fields ) { + + if(!exists($href->{$field})) { + # shouldn't happen + warn "nonexistent part_pkg option: '$field'\n"; + next; + } $html .= '<TR><TD ALIGN="right">'. $href->{$field}{'name'}. '</TD><TD>'; |