X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_pkg.cgi;h=b16aba446f493f436b988071e88def2b426c837e;hb=0c1fa9eb26c907cedb566dba005f6b96e8c418a8;hp=2b6db8c754ca80a36bc350471645660568aff5ce;hpb=ecaa27cc0539d08a90cdf7ea17c0ff1f5d268994;p=freeside.git
diff --git a/httemplate/search/cust_pkg.cgi b/httemplate/search/cust_pkg.cgi
index 2b6db8c75..b16aba446 100755
--- a/httemplate/search/cust_pkg.cgi
+++ b/httemplate/search/cust_pkg.cgi
@@ -93,19 +93,7 @@
}
}
else {
- [ map {
- [
- { 'data' => $_->[0]. ':',
- 'align'=> 'right',
- },
- { 'data' => $_->[1],
- 'align'=> 'left',
- 'link' => $p. 'view/' .
- $_->[2]. '.cgi?'. $_->[3],
- },
- ];
- } $cust_pkg->labels
- ];
+ [ $process_svc_labels->( $cust_pkg ) ]
}
}
],
@@ -180,20 +168,28 @@ my %search_hash = ();
$search_hash{'query'} = $cgi->keywords;
#scalars
-for (qw( agentnum custnum magic status classnum custom cust_fields pkgbatch )) {
+for (qw( agentnum custnum magic status custom cust_fields pkgbatch )) {
$search_hash{$_} = $cgi->param($_) if $cgi->param($_);
}
-$search_hash{'pkgpart'} = [ $cgi->param('pkgpart') ];
+#arrays
+for my $param (qw( pkgpart classnum )) {
+ $search_hash{$param} = [ $cgi->param($param) ]
+ if grep { $_ eq $param } $cgi->param;
+}
-for my $param ( qw(censustract) ) {
+#scalars that need to be passed if empty
+for my $param (qw( censustract censustract2 )) {
$search_hash{$param} = $cgi->param($param) || ''
- if ( grep { /$param/ } $cgi->param );
+ if grep { $_ eq $param } $cgi->param;
}
-my @report_option = $cgi->param('report_option')
- if $cgi->param('report_option');
-$search_hash{report_option} = join(',', @report_option) if @report_option;
+my $report_option = $cgi->param('report_option');
+$search_hash{report_option} = $report_option if $report_option;
+
+for my $param (grep /^report_option_any/, $cgi->params) {
+ $search_hash{$param} = $cgi->param($param);
+}
###
# parse dates
@@ -296,9 +292,55 @@ my $html_init = sub {
$text .= include( '/elements/email-link.html',
'search_hash' => \%search_hash,
'table' => 'cust_pkg',
- );
+ ). '
';
}
return $text;
};
+my $large_pkg_size = $conf->config('cust_pkg-large_pkg_size');
+
+my $process_svc_labels = sub {
+ my $cust_pkg = shift;
+ my @out;
+ foreach my $part_svc ( $cust_pkg->part_svc) {
+ # some false laziness with view/cust_main/packages/services.html
+
+ my $num_cust_svc = $cust_pkg->num_cust_svc( $part_svc->svcpart );
+
+ if ( $large_pkg_size > 0 and $large_pkg_size <= $num_cust_svc ) {
+ my $href = $p.'search/cust_pkg_svc.html?svcpart='.$part_svc->svcpart.
+ ';pkgnum='.$cust_pkg->pkgnum;
+ push @out, [
+ { 'data' => $part_svc->svc . ':',
+ 'align' => 'right',
+ 'rowspan' => 2 },
+ { 'data' => '(view all '. $num_cust_svc .')',
+ 'data_style' => 'b',
+ 'align' => 'left',
+ 'link' => $href, },
+ ],
+ [
+ { 'data' => include('/elements/search-cust_svc.html',
+ 'svcpart' => $part_svc->svcpart,
+ 'pkgnum' => $cust_pkg->pkgnum,
+ ),
+ 'align' => 'left' },
+ ];
+ }
+ else {
+ foreach ( map { [ $_->label ] } @{ $part_svc->cust_pkg_svc } ) {
+ push @out, [
+ { 'data' => $_->[0]. ':',
+ 'align'=> 'right', },
+ { 'data' => $_->[1],
+ 'align'=> 'left',
+ 'link' => $p. 'view/' .
+ $_->[2]. '.cgi?'. $_->[3], },
+ ];
+ }
+ }
+ } #foreach $cust_pkg
+ return @out;
+};
+
%init>