X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.html;h=06a0d54280855e4bdc8221653639ace8daeb9328;hp=b0ce31ae912d75fe5c105f6c3c4e2527e0579cce;hb=6b5dda03831aef0cb5689cf2acf3fac47e4b12cb;hpb=7eb4daaa7d76c7195d0bf357a99ccf4ee1962b8a diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index b0ce31ae9..06a0d5428 100755 --- a/httemplate/search/cust_main.html +++ b/httemplate/search/cust_main.html @@ -13,6 +13,10 @@ \&FS::UI::Web::cust_fields, @extra_fields, ], + 'sort_fields' => [ + FS::UI::Web::cust_sort_fields(), + @extra_sort_fields, + ], 'color' => [ FS::UI::Web::cust_colors(), map '', @extra_fields ], @@ -27,7 +31,11 @@ $cgi->param('cust_fields') ) ), - map '', @extra_fields + map { $_ eq 'num_referrals' + ? $referral_link + : '' + } + @extra_fields ], &> <%init> @@ -43,6 +51,7 @@ my %search_hash = (); my @scalars = qw ( agentnum salesnum status address city county state zip country location_history + daytime night mobile invoice_terms no_censustract with_geocode with_email tax no_tax POST no_POST custbatch usernum @@ -51,6 +60,7 @@ my @scalars = qw ( all_tags all_pkg_classnums any_pkg_status + with_referrals referral_status ); for my $param ( @scalars ) { @@ -63,11 +73,20 @@ for my $param (qw( classnum refnum pkg_classnum )) { $search_hash{$param} = [ $cgi->param($param) ]; } -#tags my $params = $cgi->Vars; + +#contacts +$search_hash{'contacts'} = { + map { $_ => $cgi->param($_), } + grep { /^(contacts_*)/ && $cgi->param($_) } + keys %$params +}; + +#tags $search_hash{'tagnum'} = [ map { /^tagnum(\d+)/ && $1 } - grep { /^tagnum(\d+)/ && $cgi->param($_) } keys %$params + grep { /^tagnum(\d+)/ && $cgi->param($_) } + keys %$params ]; ### @@ -105,12 +124,15 @@ $search_hash{'current_balance'} = ### my $sql_query = FS::cust_main::Search->search(\%search_hash); -my $count_query = delete($sql_query->{'count_query'}); -my @extra_headers = @{ delete($sql_query->{'extra_headers'}) }; -my @extra_fields = @{ delete($sql_query->{'extra_fields'}) }; +my $count_query = delete($sql_query->{'count_query'}); +my @extra_headers = @{ delete($sql_query->{'extra_headers'}) }; +my @extra_fields = @{ delete($sql_query->{'extra_fields'}) }; +my @extra_sort_fields = @{ delete($sql_query->{'extra_sort_fields'}) }; my $link = [ "${p}view/cust_main.cgi?", 'custnum' ]; +my $referral_link = [ "${p}search/cust_main.cgi?referral_custnum=", 'custnum' ]; + ### # email links ### @@ -119,13 +141,34 @@ my $menubar = []; if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) { + # set so invoice emails are default if showing that field. + $search_hash{'classnums'} = 'invoice' if $cgi->param('cust_fields') =~ /Invoicing email/; + + # URI::query_from does not support hashref + # results in: ...&contacts=HASH(0x55e16cb81da8)&... + my %query_hash = %search_hash; + foreach (keys %{$query_hash{contacts}}) { $query_hash{$_} = $query_hash{contacts}{$_}; } + + delete $query_hash{contacts} + if exists $query_hash{contacts} && ref $query_hash{contacts}; + my $uri = new URI; - $uri->query_form( \%search_hash ); + $uri->query_form( \%query_hash ); my $query = $uri->query; - push @$menubar, emt('Email a notice to these customers') => - "${p}misc/email-customers.html?table=cust_main&$query", - + push @$menubar, emt('Email a notice to these customers message recipients') => + "${p}misc/email-customers.html?table=cust_main&classnums=message&$query"; + push @$menubar, emt('Email a notice to these customers invoice recipients') => + "${p}misc/email-customers.html?table=cust_main&classnums=invoice&$query"; } +### +# agent transfer link +### + +my $agent_transfer_link = include('/elements/agent_transfer_link.html', { + 'search' => \%search_hash, +}); +push @$menubar, emt('popup') => '
'.$agent_transfer_link.'
'; +