[freeside-commits] branch FREESIDE_3_BRANCH updated. 0ef5486a7d1e3909d242d35792845783004a8344

[Ivan]

The branch, FREESIDE_3_BRANCH has been updated
       via  0ef5486a7d1e3909d242d35792845783004a8344 (commit)
      from  ade732335aaad65e5b3b31174e9e3a739d90bbb7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 0ef5486a7d1e3909d242d35792845783004a8344
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Sun Nov 17 21:52:36 2013 -0800

    svc_cable label, RT#26013

diff --git a/FS/FS/svc_broadband.pm b/FS/FS/svc_broadband.pm
index 6073902..b9c89ce 100755
--- a/FS/FS/svc_broadband.pm
+++ b/FS/FS/svc_broadband.pm
@@ -3,6 +3,7 @@ use base qw(
   FS::svc_Radius_Mixin
   FS::svc_Tower_Mixin
   FS::svc_IP_Mixin 
+  FS::svc_MAC_Mixin
   FS::svc_Common
   );
 
@@ -262,7 +263,7 @@ sub smart_search {
 
 =item label
 
-Returns the IP address.
+Returns the IP address, MAC address and description.
 
 =cut
 
@@ -419,22 +420,6 @@ sub _check_duplicate {
   '';
 }
 
-=item mac_addr_formatted CASE DELIMITER
-
-Format the MAC address (for use by exports).  If CASE starts with "l"
-(for "lowercase"), it's returned in lowercase.  DELIMITER is inserted
-between octets.
-
-=cut
-
-sub mac_addr_formatted {
-  my $self = shift;
-  my ($case, $delim) = @_;
-  my $addr = $self->mac_addr;
-  $addr = lc($addr) if $case =~ /^l/i;
-  join( $delim || '', $addr =~ /../g );
-}
-
 #class method
 sub _upgrade_data {
   my $class = shift;
diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 672a34d..4b42393 100644
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -1,5 +1,7 @@
 package FS::svc_cable;
-use base qw( FS::svc_Common ); #qw( FS::device_Common FS::svc_Common );
+use base qw( FS::svc_MAC_Mixin
+             FS::svc_Common
+           ); #FS::device_Common
 
 use strict;
 use Tie::IxHash;
@@ -115,6 +117,22 @@ sub table_info {
   };
 }
 
+=item label
+
+Returns the MAC address and serial number.
+
+=cut
+
+sub label {
+  my $self = shift;
+  my @label = ();
+  push @label, 'MAC:'. $self->mac_addr_pretty
+    if $self->mac_addr;
+  push @label, 'Serial#:'. $self->serialnum
+    if $self->serialnum;
+  return join(', ', @label);
+}
+
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,

-----------------------------------------------------------------------

Summary of changes:
 FS/FS/svc_broadband.pm |   19 ++-----------------
 FS/FS/svc_cable.pm     |   20 +++++++++++++++++++-
 2 files changed, 21 insertions(+), 18 deletions(-)