X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_forward.cgi;h=dc002d96a61da3d78bd8a639ff8e711685274dc4;hb=1ec49b28c30c84962670d80d1c143e65b5b9370a;hp=1785fa00bf232f1c92e396b6a6ad7911d5491a0a;hpb=d99603dfa659bc8890433e7de0c3e64ecc82fd9c;p=freeside.git

diff --git a/httemplate/search/svc_forward.cgi b/httemplate/search/svc_forward.cgi
index 1785fa00b..dc002d96a 100755
--- a/httemplate/search/svc_forward.cgi
+++ b/httemplate/search/svc_forward.cgi
@@ -1,116 +1,128 @@
-<%
-
-my $conf = new FS::Conf;
-
-my($query)=$cgi->keywords;
-$query ||= ''; #to avoid use of unitialized value errors
-my($orderby);
-if ( $query eq 'svcnum' ) {
-  $orderby = 'ORDER BY svcnum';
-} else {
-  eidiot('unimplemented');
-}
-
-my $count_query = 'SELECT COUNT(*) FROM svc_forward';
-my $sql_query = {
-  'table'     => 'svc_forward',
-  'hashref'   => {},
-  'select'    => join(', ',
-                   'svc_forward.*',
-                   map "cust_main.$_", qw(custnum last first company)
-                 ),
-  'extra_sql' => $orderby,
-  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  )'.
-                 'LEFT JOIN cust_pkg  USING ( pkgnum  )'.
-                 'LEFT JOIN cust_main USING ( custnum )',
-};
-
-#        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
-#        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-#        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
-
-my $link = [ "${p}view/svc_forward.cgi?", 'svcnum' ];
-
-my $format_src = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->srcsvc_acct ) {
-    $svc_forward->srcsvc_acct->email;
-  } else {
-    my $src = $svc_forward->src;
-    $src = "<I>(anything)</I>$src" if $src =~ /^@/;
-    $src;
-  }
-};
-
-my $link_src = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->srcsvc_acct ) {
-    [ "${p}view/svc_acct.cgi?", 'srcsvc' ];
-  } else {
-    '';
-  }
-};
-
-my $format_dst = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->dstsvc_acct ) {
-    $svc_forward->dstsvc_acct->email;
-  } else {
-    $svc_forward->dst;
-  }
-};
-
-my $link_dst = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->dstsvc_acct ) {
-    [ "${p}view/svc_acct.cgi?", 'dstsvc' ];
-  } else {
-    '';
-  }
-};
-
-my $format_cust = sub {
-  my $svc_forward = shift;
-
-  if ( $svc_forward->custnum ) {
-    #false laziness w/FS::cust_main::name
-    my $name = $svc_forward->get('last'). ', '. $svc_forward->first;
-    $name = $svc_forward->company. " ($name)" if $svc_forward->company;
-    $name;
-  } else {
-    '';
-  }
-};
-
-my $link_cust = sub {
-  my $svc_forward = shift;
-  if ( $svc_forward->custnum ) {
-    [ "${p}view/cust_main.cgi?", 'custnum' ];
-  } else {
-    '';
-  }
-};
-
-%><%= include ('elements/search.html',
+%
+%
+%my $conf = new FS::Conf;
+%
+%my($query)=$cgi->keywords;
+%$query ||= ''; #to avoid use of unitialized value errors
+%
+%my $orderby;
+%
+%my @extra_sql = ();
+%if ( $query =~ /^UN_(.*)$/ ) { #UN searches need to be acl'ed (and need to
+%                                    #fix $agentnums_sql
+%  $query = $1;
+%  push @extra_sql, 'pkgnum IS NULL';
+%}
+%
+%if ( $query eq 'svcnum' ) {
+%  $orderby = 'ORDER BY svcnum';
+%} else {
+%  eidiot('unimplemented');
+%}
+%
+%my $addl_from = ' LEFT JOIN cust_svc  USING ( svcnum  ) '.
+%                ' LEFT JOIN part_svc  USING ( svcpart ) '.
+%                ' LEFT JOIN cust_pkg  USING ( pkgnum  ) '.
+%                ' LEFT JOIN cust_main USING ( custnum ) ';
+%
+%#here is the agent virtualization
+%push @extra_sql, $FS::CurrentUser::CurrentUser->agentnums_sql;
+%
+%my $extra_sql = 
+%  scalar(@extra_sql)
+%    ? ' WHERE '. join(' AND ', @extra_sql )
+%    : '';
+%
+%my $count_query = "SELECT COUNT(*) FROM svc_forward $addl_from $extra_sql";
+%my $sql_query = {
+%  'table'     => 'svc_forward',
+%  'hashref'   => {},
+%  'select'    => join(', ',
+%                   'svc_forward.*',
+%                   'part_svc.svc',
+%                   'cust_main.custnum',
+%                   FS::UI::Web::cust_sql_fields(),
+%                 ),
+%  'extra_sql' => "$extra_sql $orderby",
+%  'addl_from' => $addl_from,
+%};
+%
+%#        <TH>Service #<BR><FONT SIZE=-1>(click to view forward)</FONT></TH>
+%#        <TH>Mail to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+%#        <TH>Forwards to<BR><FONT SIZE=-1>(click to view account)</FONT></TH>
+%
+%my $link = [ "${p}view/svc_forward.cgi?", 'svcnum' ];
+%
+%my $format_src = sub {
+%  my $svc_forward = shift;
+%  if ( $svc_forward->srcsvc_acct ) {
+%    $svc_forward->srcsvc_acct->email;
+%  } else {
+%    my $src = $svc_forward->src;
+%    $src = "<I>(anything)</I>$src" if $src =~ /^@/;
+%    $src;
+%  }
+%};
+%
+%my $link_src = sub {
+%  my $svc_forward = shift;
+%  if ( $svc_forward->srcsvc_acct ) {
+%    [ "${p}view/svc_acct.cgi?", 'srcsvc' ];
+%  } else {
+%    '';
+%  }
+%};
+%
+%my $format_dst = sub {
+%  my $svc_forward = shift;
+%  if ( $svc_forward->dstsvc_acct ) {
+%    $svc_forward->dstsvc_acct->email;
+%  } else {
+%    $svc_forward->dst;
+%  }
+%};
+%
+%my $link_dst = sub {
+%  my $svc_forward = shift;
+%  if ( $svc_forward->dstsvc_acct ) {
+%    [ "${p}view/svc_acct.cgi?", 'dstsvc' ];
+%  } else {
+%    '';
+%  }
+%};
+%
+%#smaller false laziness w/svc_*.cgi here
+%my $link_cust = sub {
+%  my $svc_x = shift;
+%  $svc_x->custnum ? [ "${p}view/cust_main.cgi?", 'custnum' ] : '';
+%};
+%
+%
+<% include( 'elements/search.html',
                  'title'             => "Mail forward Search Results",
                  'name'              => 'mail forwards',
                  'query'             => $sql_query,
                  'count_query'       => $count_query,
                  'redirect'          => $link,
                  'header'            => [ '#',
+                                          'Service',
                                           'Mail to',
                                           'Forwards to',
-                                          'Customer',
+                                          FS::UI::Web::cust_header(),
                                         ],
                  'fields'            => [ 'svcnum',
+                                          'svc',
                                           $format_src,
                                           $format_dst,
-                                          $format_cust,
+                                          \&FS::UI::Web::cust_fields,
                                         ],
                  'links'             => [ $link,
+                                          $link,
                                           $link_src,
                                           $link_dst,
-                                          $link_cust,
+                                          ( map { $link_cust }
+                                                FS::UI::Web::cust_header()
+                                          ),
                                         ],
-              )
+             )
 %>