From: Jonathan Prykop <jonathan@freeside.biz>
Date: Fri, 30 Jan 2015 21:27:36 +0000 (-0600)
Subject: #32873: Hardware Service Display of variable on interface
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=4c6648c06d62df50aeb39baf81552ecde0a5f6ba;p=freeside.git

#32873: Hardware Service Display of variable on interface
---

diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm
index b28cc9ef5..d9c3c464e 100644
--- a/FS/FS/svc_hardware.pm
+++ b/FS/FS/svc_hardware.pm
@@ -133,7 +133,17 @@ sub search_sql {
 
 sub label {
   my $self = shift;
-  $self->serial || $self->display_hw_addr;
+  my @label = ();
+  if (my $type = $self->hardware_type) {
+    push @label, 'Type:' . $type->description;
+  }
+  if (my $ser = $self->serial) {
+    push @label, 'Serial#' . $ser;
+  }
+  if (my $mac = $self->display_hw_addr) {
+    push @label, 'MAC:'. $mac;
+  }
+  return join(', ', @label);
 }
 
 =item insert