diff options
| -rwxr-xr-x | httemplate/search/report_cust_pkg.html | 5 | ||||
| -rwxr-xr-x | httemplate/search/svc_acct.cgi | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/httemplate/search/report_cust_pkg.html b/httemplate/search/report_cust_pkg.html index dd62f3ead..d210446b4 100755 --- a/httemplate/search/report_cust_pkg.html +++ b/httemplate/search/report_cust_pkg.html @@ -6,8 +6,11 @@ <TABLE BGCOLOR="#cccccc" CELLSPACING=0> <TR> - <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"><FONT SIZE="+1">Search options</FONT></TH> + <TH BGCOLOR="#e8e8e8" COLSPAN=2 ALIGN="left"> + <FONT SIZE="+1">Search options</FONT> + </TH> </TR> + <% include( '/elements/tr-select-agent.html', 'curr_value' => scalar( $cgi->param('agentnum') ), ) diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi index 8cd689a04..e30b8c7b3 100755 --- a/httemplate/search/svc_acct.cgi +++ b/httemplate/search/svc_acct.cgi @@ -91,13 +91,16 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) { my $cust_pkg = $svc_acct->cust_svc->cust_pkg; my $part_pkg = $cust_pkg->part_pkg; my $timepermonth = $part_pkg->option('seconds'); + $timepermonth = $timepermonth / $part_pkg->freq + if $part_pkg->freq =~ /^\d+$/ && $part_pkg->freq != 0; return format_time($seconds) unless $timepermonth; #my $recur = $part_pkg->calc_recur($cust_pkg); my $recur = $part_pkg->base_recur($cust_pkg); my $balance = $cust_pkg->cust_main->balance; my $months_unpaid = $balance / $recur; my $time_unpaid = $months_unpaid * $timepermonth; - format_time($seconds-$time_unpaid); + format_time($seconds-$time_unpaid). + sprintf(' (%.2fx monthly)', ( $seconds-$time_unpaid ) / $timepermonth ); }; push @links, ''; $align .= 'r'; |