X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=httemplate%2Fsearch%2Fsvc_hardware.cgi;h=93fc2c391691d22f4c8810ea83f78794703daa6e;hb=dd003d59f56742f9374cec309ad81d527e88c846;hp=2ff868ef51ee890f44a02c9035cede803cef84c9;hpb=fb4ab1073f0d15d660c6cdc4e07afebf68ef3924;p=freeside.git

diff --git a/httemplate/search/svc_hardware.cgi b/httemplate/search/svc_hardware.cgi
index 2ff868ef5..93fc2c391 100644
--- a/httemplate/search/svc_hardware.cgi
+++ b/httemplate/search/svc_hardware.cgi
@@ -1,4 +1,4 @@
-<% include('elements/search.html',
+<& elements/svc_Common.html,
             'title'             => 'Hardware service search results',
             'name'              => 'installations',
             'query'             => $sql_query,
@@ -7,6 +7,7 @@
             'header'            => [ '#',
                                      'Service',
                                      'Device type',
+                                     '', #revision
                                      'Serial #',
                                      'Hardware addr.',
                                      'IP addr.',
@@ -16,35 +17,34 @@
             'fields'            => [ 'svcnum',
                                      'svc',
                                      'model',
+                                     'revision',
                                      'serial',
-                                     'hw_addr',
+                                     'display_hw_addr',
                                      'ip_addr',
                                      'smartcard',
                                      \&FS::UI::Web::cust_fields,
                                    ],
-            'links'             => [ ($link_svc) x 7,
+            'links'             => [ ($link_svc) x 8,
                                      ( map { $_ ne 'Cust. Status' ? 
                                                 $link_cust : '' }
                                        FS::UI::Web::cust_header() )
                                    ],
-            'align'             => 'rllllll' . FS::UI::Web::cust_aligns(),
-            'color'             => [ ('') x 7,
+            'align'             => 'rlllllll' . FS::UI::Web::cust_aligns(),
+            'color'             => [ ('') x 8,
                                       FS::UI::Web::cust_colors() ],
-            'style'             => [ $svc_cancel_style, ('') x 6,
+            'style'             => [ $svc_cancel_style, ('') x 7,
                                       FS::UI::Web::cust_styles() ],
-            )
-%>
+&>
 <%init>
 
 die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('List services');
 
-
 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 )
+ LEFT JOIN cust_pkg  USING ( pkgnum  )'.
+ FS::UI::Web::join_cust_main('cust_pkg', 'cust_pkg').'
  LEFT JOIN hardware_type USING ( typenum )';
 
 my @extra_sql;
@@ -66,9 +66,9 @@ if ( $cgi->param('hw_addr') =~ /^(\S+)$/ ) {
   push @extra_sql, "hw_addr LIKE '%$hw_addr%'";
 }
 
-my $ip = NetAddr::IP->new($cgi->param('ip_addr'));
-if ( $ip ) {
-  push @extra_sql, "ip_addr = '".lc($ip->addr)."'";
+if ( $cgi->param('ip_addr') ) {
+  my $ip = NetAddr::IP->new($cgi->param('ip_addr'));
+  push @extra_sql, "ip_addr = '".lc($ip->addr)."'" if $ip;
 }
 
 if ( lc($cgi->param('smartcard')) =~ /^(\w+)$/ ) {
@@ -81,9 +81,14 @@ if ( $cgi->param('statusnum') =~ /^(\d+)$/ ) {
 
 if ( $cgi->param('classnum') =~ /^(\d+)$/ ) {
   push @extra_sql, "hardware_type.classnum = $1";
-  if ( $cgi->param('classnum'.$1.'typenum') =~ /^(\d+)$/ ) {
-    push @extra_sql, "svc_hardware.typenum = $1";
-  }
+}
+
+if ( $cgi->param('model') =~ /^([\w\s]+)$/ ) {
+  push @extra_sql, "hardware_type.model = '$1'";
+}
+
+if ( $cgi->param('typenum') =~ /^(\d+)$/ ) {
+  push @extra_sql, "svc_hardware.typenum = $1";
 }
 
 if ( $cgi->param('svcpart') =~ /^(\d+)$/ ) {
@@ -103,6 +108,7 @@ my $sql_query = {
                     'part_svc.svc',
                     'cust_main.custnum',
                     'hardware_type.model',
+                    'hardware_type.revision',
                     'cust_pkg.cancel',
                     FS::UI::Web::cust_sql_fields(),
                  ),
@@ -111,7 +117,6 @@ my $sql_query = {
   'order_by'  => "ORDER BY $orderby",
   'addl_from' => $addl_from,
 };
-
 my $count_query = "SELECT COUNT(*) FROM svc_hardware $addl_from $extra_sql";
 my $link_svc = [ $p.'view/svc_hardware.cgi?', 'svcnum' ];
 my $link_cust = [ $p.'view/cust_main.cgi?', 'custnum' ];