X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_www.cgi;h=ae51c61fce4548796ab9fc21b78bb003086a6515;hb=2c757d7db4cb6a7b9655de13206fcc84fb7ce61f;hp=14166199252389bcc68d020aefd9d8440a812e1f;hpb=34647c32b50ce3b8ee1b6d3d7aef4ba9d0297bdb;p=freeside.git

diff --git a/httemplate/search/svc_www.cgi b/httemplate/search/svc_www.cgi
index 141661992..ae51c61fc 100755
--- a/httemplate/search/svc_www.cgi
+++ b/httemplate/search/svc_www.cgi
@@ -4,7 +4,7 @@
 
 my($query)=$cgi->keywords;
 $query ||= ''; #to avoid use of unitialized value errors
-my(@svc_www, $orderby);
+my $orderby;
 if ( $query eq 'svcnum' ) {
   $orderby = 'ORDER BY svcnum';
 } else {
@@ -15,27 +15,55 @@ my $count_query = 'SELECT COUNT(*) FROM svc_www';
 my $sql_query = {
   'table'     => 'svc_www',
   'hashref'   => {},
+  'select'    => join(', ',
+                   'svc_www.*',
+                   'cust_main.custnum',
+                   FS::UI::Web::cust_sql_fields(),
+                 ),
   'extra_sql' => $orderby,
+  'addl_from' => 'LEFT JOIN cust_svc  USING ( svcnum  )'.
+                 'LEFT JOIN cust_pkg  USING ( pkgnum  )'.
+                 'LEFT JOIN cust_main USING ( custnum )',
 };
 
 my $link  = [ "${p}view/svc_www.cgi?", 'svcnum', ];
 #my $dlink = [ "${p}view/svc_www.cgi?", 'svcnum', ];
 my $ulink = [ "${p}view/svc_acct.cgi?", 'usersvc', ];
 
+#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'       => 'Virtual Host Search Results',
                  'name'        => 'virtual hosts',
                  'query'       => $sql_query,
                  'count_query' => $count_query,
-                 'header'      => [ '#', 'Zone', 'User', ],
+                 'redirect'    => $link,
+                 'header'      => [ '#',
+                                    'Zone',
+                                    'User',
+                                    FS::UI::Web::cust_header(),
+                                  ],
                  'fields'      => [ 'svcnum',
                                     sub { $_[0]->domain_record->zone },
-                                    sub { $_[0]->svc_acct->email },
+                                    sub {
+                                          my $svc_www = shift;
+                                          my $svc_acct = $svc_www->svc_acct;
+                                          $svc_acct
+                                            ? $svc_acct->email
+                                            : '';
+                                        },
+                                    \&FS::UI::Web::cust_fields,
                                   ],
                  'links'       => [ $link,
                                     '',
                                     $ulink,
+                                    ( map { $link_cust }
+                                          FS::UI::Web::cust_header()
+                                    ),
                                   ],
              )
 %>