X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.html;h=4d5d18fe88af825a7d3d546af90792d4892f30ac;hb=d0ccab3fd755d1f3b81b8cfc27e99665ee3f20ec;hp=7729da4198ca9a005661bc301890593e67393b6b;hpb=c742a74ec444c4606006a14e814d06e0b1795ea4;p=freeside.git diff --git a/httemplate/search/cust_main.html b/httemplate/search/cust_main.html index 7729da419..4d5d18fe8 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 ], @@ -47,6 +51,7 @@ my %search_hash = (); my @scalars = qw ( agentnum salesnum status address city county state zip country location_history + daytime night mobile paydate_year paydate_month invoice_terms no_censustract with_geocode with_email tax no_tax POST no_POST custbatch usernum @@ -68,6 +73,15 @@ for my $param (qw( classnum refnum payby tagnum pkg_classnum )) { $search_hash{$param} = [ $cgi->param($param) ]; } +my $params = $cgi->Vars; + +#contacts +$search_hash{'contacts'} = { + map { $_ => $cgi->param($_), } + grep { /^(contacts_*)/ && $cgi->param($_) } + keys %$params +}; + ### # parse dates ### @@ -103,9 +117,10 @@ $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' ]; @@ -119,8 +134,16 @@ my $menubar = []; if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) { + # 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') => @@ -128,4 +151,13 @@ if ( $FS::CurrentUser::CurrentUser->access_right('Bulk send customer notices') ) } +### +# agent transfer link +### + +my $agent_transfer_link = include('/elements/agent_transfer_link.html', { + 'search' => \%search_hash, +}); +push @$menubar, emt('popup') => '
'.$agent_transfer_link.'
'; +