From: ivan Date: Wed, 16 Jul 2008 23:55:31 +0000 (+0000) Subject: fix account search by time remaining to deal with situations w/o a recurring amount X-Git-Tag: root_of_webpay_support~479 X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=commitdiff_plain;h=3502f19e6371bee6d974f05b2d3f22f8ccd03891 fix account search by time remaining to deal with situations w/o a recurring amount --- diff --git a/httemplate/search/svc_acct.cgi b/httemplate/search/svc_acct.cgi index c2b3d8fa0..d8451f210 100755 --- a/httemplate/search/svc_acct.cgi +++ b/httemplate/search/svc_acct.cgi @@ -120,13 +120,17 @@ if ( $cgi->param('magic') =~ /^(all|unlinked)$/ ) { my $seconds = $svc_acct->seconds; my $cust_pkg = $svc_acct->cust_svc->cust_pkg; my $part_pkg = $cust_pkg->part_pkg; + #my $timepermonth = $part_pkg->option('seconds'); $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); + + return format_time($seconds) unless $timepermonth && $recur; + my $balance = $cust_pkg->cust_main->balance; my $months_unpaid = $balance / $recur; my $time_unpaid = $months_unpaid * $timepermonth;