X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_cable.pm;h=12a1dbba59032d5dc57f77ee56a8fbc99b94baee;hp=596f69995730edfca73c0ff7efbc52717737098a;hb=f3ac48703be75c0e2aec161487057eafeb8fc74f;hpb=fe4515eb37d76849dd08c62782d86bc7ba311dcd

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 596f69995..12a1dbba5 100644
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -1,11 +1,10 @@
 package FS::svc_cable;
-use base qw( FS::svc_Common ); #qw( FS::device_Common FS::svc_Common );
+use base qw( FS::MAC_Mixin
+             FS::svc_Common
+           ); #FS::device_Common
 
 use strict;
 use Tie::IxHash;
-use FS::Record qw( qsearchs ); # qw( qsearch qsearchs );
-use FS::cable_provider;
-use FS::cable_model;
 
 =head1 NAME
 
@@ -84,7 +83,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,
@@ -115,6 +114,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,
@@ -142,7 +157,8 @@ 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')
@@ -156,24 +172,10 @@ sub check {
 
 Returns the cable_provider object for this record.
 
-=cut
-
-sub cable_provider {
-  my $self = shift;
-  qsearchs('cable_provider', { 'providernum'=>$self->providernum } );
-}
-
 =item cable_model
 
 Returns the cable_model object for this record.
 
-=cut
-
-sub cable_model {
-  my $self = shift;
-  qsearchs('cable_model', { 'modelnum'=>$self->modelnum } );
-}
-
 =back
 
 =head1 BUGS