X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2F477.html;h=244bfa1df1df3b213f777a2686dac50431b129b9;hb=3146245f510ef873c4176bc06dc891f990db8f1e;hp=fb85f1e09b4771408a54c0c37d8b5192960482ee;hpb=7c370a4579d1ed8b81dba2fb5fae9978b283b49e;p=freeside.git diff --git a/httemplate/search/477.html b/httemplate/search/477.html index fb85f1e09..244bfa1df 100644 --- a/httemplate/search/477.html +++ b/httemplate/search/477.html @@ -49,13 +49,23 @@ a.download { <& $header &> +% my $rownum = 0; % foreach my $row (@$data) { +% my $first = 1; % foreach my $item (@$row) { - <% $item %> + +% if ($first and $part_link{$partname}) { + "><% $item || '(empty)' %> +% $first = 0; +% } else { + <% $item %> % } + +% } #foreach $item -% } +% $rownum++; +% } #foreach $row % } # foreach $partname <& /elements/footer.html &> @@ -64,6 +74,7 @@ die "access denied" unless $FS::CurrentUser::CurrentUser->access_right('List packages'); my %parts; +my %part_link; # load from cache if possible my $session; if ( $cgi->param('session') =~ /^(\d+)$/ ) { @@ -80,11 +91,22 @@ if ($cgi->param('agentnum') =~ /^(\d+)$/ ) { } my $date = parse_datetime($cgi->param('date')) || time; my @partnames = grep /^\w+$/, $cgi->param('parts'); +my $ignore_quantity = ($cgi->param('ignore_quantity') ? 1 : 0); + foreach my $partname (@partnames) { $parts{$partname} ||= FS::Report::FCC_477->report( $partname, - date => $date, - agentnum => $agentnum + date => $date, + agentnum => $agentnum, + ignore_quantity => $ignore_quantity, ); + my $detail_table = FS::Report::FCC_477->part_table($partname); + if ($detail_table eq 'cust_pkg') { + my $link = popurl(1).'cust_pkg.cgi?477part='.$partname.";date=$date;"; + if ($agentnum) { + $link .= "agentnum=$agentnum;"; + } + $part_link{$partname} = $link; + } # don't include detail links to deploy_blocks, that's pointless } $m->cache->set($session, \%parts, '1h');