X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_cable.pm;h=50236f0d74f7a0596121149a5019795c8db8eca4;hb=aacc031f9766621bb5addffeab0fbd334607a265;hp=596f69995730edfca73c0ff7efbc52717737098a;hpb=c472510ffbe145ae090981bc1b0be9b644de6a37;p=freeside.git

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 596f69995..50236f0d7 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;
@@ -54,7 +56,7 @@ points to.  You can ask the object for a copy with the I<hash> method.
 
 sub table { 'svc_cable'; }
 
-sub table_dupcheck_fields { ( 'mac_addr' ); }
+sub table_dupcheck_fields { ( 'serialnum', 'mac_addr' ); }
 
 sub search_sql {
   my( $class, $string ) = @_;
@@ -84,7 +86,7 @@ sub table_info {
                                               $p ? $p->provider : '';
                                             },
                      },
-    #XXX "Circuit ID/Order number"
+    'ordernum'    => 'Order number', #XXX "Circuit ID/Order number"
     'modelnum'    => { label             => 'Model',
                        type              => 'select-cable_model',
                        disable_inventory => 1,
@@ -99,7 +101,7 @@ sub table_info {
                        type           => 'input-mac_addr',
                        value_callback => sub {
                                            my $svc = shift;
-                                           join(':', $svc->mac_addr =~ /../g);
+                                           $svc->mac_addr_formatted('U',':');
                                          },
                      },
   ;
@@ -115,6 +117,24 @@ sub table_info {
   };
 }
 
+=item label
+
+Returns the MAC address and serial number.
+
+=cut
+
+sub label {
+  my $self = shift;
+  my $part_svc = $self->cust_svc->part_svc;
+  my @label = ();
+  push @label, 'MAC:'. $self->mac_addr_pretty
+    if $self->mac_addr;
+  push @label, ($part_svc->part_svc_column('serialnum') || '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,
@@ -142,16 +162,42 @@ sub check {
 
   my $error = 
        $self->ut_numbern('svcnum')
-    || $self->ut_foreign_key('providernum', 'cable_provider', 'providernum')
+    || $self->ut_foreign_keyn('providernum', 'cable_provider', 'providernum')
+    || $self->ut_alphan('ordernum')
     || $self->ut_foreign_key('modelnum', 'cable_model', 'modelnum')
-    || $self->ut_alpha('serialnum')
-    || $self->ut_mac_addr('mac_addr')
+    || $self->ut_alphan('serialnum')
+    || $self->ut_mac_addrn('mac_addr')
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
+sub _check_duplicate {
+  my $self = shift;
+
+  # Not reliable checks because the table isn't locked, but that's why we have
+  # unique indices.  These are just to give friendlier error messages.
+
+  if ( $self->mac_addr ) {
+    my @dup_mac;
+    @dup_mac = $self->find_duplicates('global', 'mac_addr');
+    if ( @dup_mac ) {
+      return "MAC address in use (svcnum ".$dup_mac[0]->svcnum.")";
+    }
+  }
+
+  if ( $self->serialnum ) {
+    my @dup_serial;
+    @dup_serial = $self->find_duplicates('global', 'serialnum');
+    if ( @dup_serial ) {
+      return "Serial number in use (svcnum ".$dup_serial[0]->svcnum.")";
+    }
+  }
+
+  '';
+}
+
 =item cable_provider
 
 Returns the cable_provider object for this record.