X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fcust_main.cgi;h=8fbf6364cb9bf6a0fcdc12c67f8121dd2c867dd5;hb=636dd1f25af52d35efe7a323a5765ff5adeadf83;hp=d66d1617202d0a21a7486af77ac13517a330fa6a;hpb=d11f7c132bb3f235980ecc9a98617fcb853f08f3;p=freeside.git

diff --git a/httemplate/search/cust_main.cgi b/httemplate/search/cust_main.cgi
index d66d16172..8fbf6364c 100755
--- a/httemplate/search/cust_main.cgi
+++ b/httemplate/search/cust_main.cgi
@@ -1,5 +1,7 @@
+%my $curuser = $FS::CurrentUser::CurrentUser;
+%
 %die "access denied"
-%  unless $FS::CurrentUser::CurrentUser->access_right('List customers');
+%  unless $curuser->access_right('List customers');
 %
 %my $conf = new FS::Conf;
 %my $maxrecords = $conf->config('maxsearchrecordsperpage');
@@ -62,8 +64,13 @@
 %  if ( $cgi->param('browse') ) {
 %    my $query = $cgi->param('browse');
 %    if ( $query eq 'custnum' ) {
-%      $sortby=\*custnum_sort;
-%      $orderby = "ORDER BY custnum";
+%      if ( $conf->exists('cust_main-default_agent_custid') ) {
+%        $sortby=\*display_custnum_sort;
+%        $orderby = "ORDER BY CASE WHEN agent_custid IS NOT NULL AND agent_custid != '' THEN CAST(agent_custid AS BIGINT) ELSE custnum END";
+%      } else {
+%        $sortby=\*custnum_sort;
+%        $orderby = "ORDER BY custnum";
+%      }
 %    } elsif ( $query eq 'last' ) {
 %      $sortby=\*last_sort;
 %      $orderby = "ORDER BY LOWER(last || ' ' || first)";
@@ -87,10 +94,10 @@
 %  if ( $cgi->param('otaker_on') ) {
 %    die "access denied"
 %      unless $FS::CurrentUser::CurrentUser->access_right('Configuration');
-%    $cgi->param('otaker') =~ /^(\w{1,32})$/ or eidiot "Illegal otaker\n";
+%    $cgi->param('otaker') =~ /^(\w{1,32})$/ or errorpage("Illegal otaker");
 %    $search{otaker} = $1;
 %  } elsif ( $cgi->param('agentnum_on') ) {
-%    $cgi->param('agentnum') =~ /^(\d+)$/ or eidiot "Illegal agentnum\n";
+%    $cgi->param('agentnum') =~ /^(\d+)$/ or errorpage("Illegal agentnum");
 %    $search{agentnum} = $1;
 %#  } else {
 %#    die "unknown query...";
@@ -197,7 +204,9 @@
 %  if ( $cgi->param('search_cust') ) {
 %    $sortby = \*company_sort;
 %    $orderby = "ORDER BY LOWER(company || ' ' || last || ' ' || first )";
-%    push @cust_main, smart_search( 'search' => $cgi->param('search_cust') );
+%    push @cust_main, smart_search( 'search' => $cgi->param('search_cust'),
+%                                   'no_fuzzy_on_exact' => 1, #pref?
+%                                 );
 %  }
 %
 %  @cust_main = grep { $_->ncancelled_pkgs || ! $_->all_pkgs } @cust_main
@@ -232,7 +241,7 @@
 
 <!-- mason kludge -->
 %
-%  eidiot "No matching customers found!\n";
+%  errorpage("No matching customers found!");
 %} else { 
 %
 
@@ -263,12 +272,12 @@
 %      $cgi->param('offset', 0);
 %      print qq!( <a href="!. $cgi->self_url. qq!">hide!;
 %    }
-%    print ' cancelled customers</a> )';
+%    print ' canceled customers</a> )';
 %  }
 %
 %  if ( $cgi->param('referral_custnum') ) {
 %    $cgi->param('referral_custnum') =~ /^(\d+)$/
-%      or eidiot "Illegal referral_custnum\n";
+%      or errorpage("Illegal referral_custnum");
 %    my $referral_custnum = $1;
 %    my $cust_main = qsearchs('cust_main', { custnum => $referral_custnum } );
 %    print '<FORM METHOD="GET">'.
@@ -288,7 +297,7 @@
 %    print ' <SELECT NAME="referral_depth" SIZE="1" onChange="changed(this)">';
 %    my $max = 8; #config file
 %    $cgi->param('referral_depth') =~ /^(\d*)$/ 
-%      or eidiot "Illegal referral_depth";
+%      or errorpage("Illegal referral_depth");
 %    my $referral_depth = $1;
 %
 %    foreach my $depth ( 1 .. $max ) {
@@ -376,10 +385,10 @@
 %      : '<FONT SIZE=-1>&nbsp;</FONT>';
 %    
 %    my $status = $cust_main->status;
-%    my $statuscol = $FS::cust_main::statuscolor{$status};
+%    my $statuscol = $cust_main->statuscolor;
 
     <TR>
-      <TD CLASS="grid" ALIGN="right" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><A HREF="<% $view %>"><FONT SIZE=-1><% $custnum %></FONT></A></TD>
+      <TD CLASS="grid" ALIGN="right" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><A HREF="<% $view %>"><FONT SIZE=-1><% $cust_main->display_custnum %></FONT></A></TD>
       <TD CLASS="grid" ALIGN="center" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><FONT SIZE="-1" COLOR="#<% $statuscol %>"><B><% ucfirst($status) %></B></FONT></TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><A HREF="<% $view %>"><FONT SIZE=-1><% "$last, $first" %></FONT></A></TD>
       <TD CLASS="grid" BGCOLOR="<% $bgcolor %>" ROWSPAN=<% $rowspan || 1 %>><% $pcompany %></TD>
@@ -478,14 +487,17 @@
 %#      my $part_pkg = qsearchs( 'part_pkg', { pkgpart => $_->pkgpart } );
 %      my $part_pkg = $_->part_pkg;
 %
-%      my $pkg = $part_pkg->pkg;
-%      my $comment = $part_pkg->comment;
-%      my $pkgview = "${p}view/cust_main.cgi?$custnum#cust_pkg$pkgnum";
+%      my $pkg_comment = $part_pkg->pkg_comment(nopkgpart => 1);
+%      my $show = $curuser->default_customer_view =~ /^(jumbo|packages)$/
+%                   ? ''
+%                   : ';show=packages';
+%      my $frag = "cust_pkg$pkgnum"; #hack for IE ignoring real #fragment
+%      my $pkgview = "${p}view/cust_main.cgi?custnum=$custnum$show;fragment=$frag#$frag";
 %      my @cust_svc = @{shift @lol_cust_svc};
 %      #my(@cust_svc) = qsearch( 'cust_svc', { 'pkgnum' => $_->pkgnum } );
 %      my $rowspan = scalar(@cust_svc) || 1;
 %
-%      print $n1, qq!<TD CLASS="grid" BGCOLOR="$bgcolor"  ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg - $comment</FONT></A></TD>!;
+%      print $n1, qq!<TD CLASS="grid" BGCOLOR="$bgcolor"  ROWSPAN=$rowspan><A HREF="$pkgview"><FONT SIZE=-1>$pkg_comment</FONT></A></TD>!;
 %
 %      my($n2)='';
 %      foreach my $cust_svc ( @cust_svc ) {
@@ -538,6 +550,10 @@
 %  || lc($a->first) cmp lc($b->first);;
 %}
 %
+%sub display_custnum_sort {
+%  $a->display_custnum <=> $b->display_custnum;
+%}
+%
 %sub custnum_sort {
 %  $a->getfield('custnum') <=> $b->getfield('custnum');
 %}
@@ -550,7 +566,7 @@
 %
 %  my $custnum = $cgi->param('custnum_text');
 %  $custnum =~ s/\D//g;
-%  $custnum =~ /^(\d{1,23})$/ or eidiot "Illegal customer number\n";
+%  $custnum =~ /^(\d{1,23})$/ or errorpage("Illegal customer number");
 %  $custnum = $1;
 %  
 %  [ qsearchs('cust_main', { 'custnum' => $custnum } ) ];
@@ -560,7 +576,7 @@
 %
 %  my($card)=$cgi->param('card');
 %  $card =~ s/\D//g;
-%  $card =~ /^(\d{13,16})$/ or eidiot "Illegal card number\n";
+%  $card =~ /^(\d{13,16})$/ or errorpage("Illegal card number");
 %  my($payinfo)=$1;
 %
 %  [ qsearch('cust_main',{'payinfo'=>$payinfo, 'payby'=>'CARD'}),
@@ -570,13 +586,13 @@
 %
 %sub referralsearch {
 %  $cgi->param('referral_custnum') =~ /^(\d+)$/
-%    or eidiot "Illegal referral_custnum";
+%    or errorpage("Illegal referral_custnum");
 %  my $cust_main = qsearchs('cust_main', { 'custnum' => $1 } )
-%    or eidiot "Customer $1 not found";
+%    or errorpage("Customer $1 not found");
 %  my $depth;
 %  if ( $cgi->param('referral_depth') ) {
 %    $cgi->param('referral_depth') =~ /^(\d+)$/
-%      or eidiot "Illegal referral_depth";
+%      or errorpage("Illegal referral_depth");
 %    $depth = $1;
 %  } else {
 %    $depth = 1;
@@ -592,7 +608,7 @@
 %  }
 %
 %  $cgi->param('last_text') =~ /^([\w \,\.\-\']*)$/
-%    or eidiot "Illegal last name";
+%    or errorpage("Illegal last name");
 %  my($last)=$1;
 %
 %  if ( $last_type{'Exact'} || $last_type{'Fuzzy'} ) {
@@ -620,7 +636,7 @@
 %  }
 %
 %  if ( $last_type{'Fuzzy'} || $last_type{'All'} ) {
-%    push @cust_main, FS::cust_main->fuzzy_search( { 'last' => $last } );
+%    push @cust_main, FS::cust_main::Search->fuzzy_search( { 'last' => $last } );
 %  }
 %
 %  #if ($last_type{'Sound-alike'}) {
@@ -639,7 +655,7 @@
 %
 %  $cgi->param('company_text') =~
 %    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-%      or eidiot "Illegal company";
+%      or errorpage("Illegal company");
 %  my $company = $1;
 %
 %  if ( $company_type{'Exact'} || $company_type{'Fuzzy'} ) {
@@ -667,7 +683,7 @@
 %  }
 %
 %  if ( $company_type{'Fuzzy'} || $company_type{'All'} ) {
-%    push @cust_main, FS::cust_main->fuzzy_search( { 'company' => $company } );
+%    push @cust_main, FS::cust_main::Search->fuzzy_search( { 'company' => $company } );
 %  }
 %
 %  if ($company_type{'Sound-alike'}) {
@@ -681,16 +697,15 @@
 %
 %  $cgi->param('address2_text') =~
 %    /^([\w \!\@\#\$\%\&\(\)\-\+\;\:\'\"\,\.\?\/\=]*)$/
-%      or eidiot "Illegal address2";
+%      or errorpage("Illegal address2");
 %  my $address2 = $1;
 %
 %  push @cust_main, qsearch( 'cust_main',
 %                            { 'address2' => { 'op'    => 'ILIKE',
 %                                              'value' => $address2 } } );
 %  push @cust_main, qsearch( 'cust_main',
-%                            { 'address2' => { 'op'    => 'ILIKE',
-%                                              'value' => $address2 } } )
-%    if defined dbdef->table('cust_main')->column('ship_last');
+%                            { 'ship_address2' => { 'op'    => 'ILIKE',
+%                                                   'value' => $address2 } } );
 %
 %  \@cust_main;
 %}
@@ -711,7 +726,7 @@
 %  } elsif ( $phone =~ /^(\d{3,4})$/ ) {
 %    $phone = $1;
 %  } else {
-%    eidiot gettext('illegal_phone'). ": $phone";
+%    errorpage(gettext('illegal_phone'). ": $phone");
 %  }
 %
 %  my @fields = qw(daytime night fax);