X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_cable.pm;h=daaf680c59150a5409f5484b079e40ad773b88f7;hp=1980c0ee90d7b8afd287b5a728262303c30dd803;hb=25386efd0e3f725d6cef005eba729840d3b4b3cb;hpb=ec9b0f903dfa57efc0c82791b9efa74f0c746bc0

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index 1980c0ee9..daaf680c5 100644
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -1,10 +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_model;
 
 =head1 NAME
 
@@ -36,6 +36,26 @@ from FS::Record.  The following fields are currently supported:
 
 primary key
 
+=item providernum
+
+Provider (see L<FS::cable_provider>)
+
+=item ordernum
+
+Provider order number
+
+=item modelnum
+
+Cable device model (see L<FS::cable_model>)
+
+=item serialnum
+
+Cable device serial number
+
+=item mac_addr
+
+Cable device MAC address
+
 =back
 
 =head1 METHODS
@@ -53,7 +73,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 ) = @_;
@@ -72,24 +92,35 @@ sub search_sql {
 sub table_info {
 
   tie my %fields, 'Tie::IxHash',
-    'svcnum'     => 'Service',
-    'modelnum'   => { label             => 'Model',
-                      type              => 'select-cable_model',
-                      disable_inventory => 1,
-                      disable_select    => 1,
-                      value_callback    => sub {
-                                             my $svc = shift;
-                                             $svc->cable_model->model_name;
-                                           },
-                    },
-    'serialnum'  => 'Serial number',
-    'mac_addr'   => { label          => 'MAC address',
-                      type           => 'input-mac_addr',
-                      value_callback => sub {
-                                          my $svc = shift;
-                                          join(':', $svc->mac_addr =~ /../g);
-                                        },
-                    },
+    'svcnum'      => 'Service',
+    'providernum' => { label             => 'Provider',
+                       type              => 'select-cable_provider',
+                       disable_inventory => 1,
+                       disable_select    => 1,
+                       value_callback    => sub {
+                                              my $svc = shift;
+                                              my $p = $svc->cable_provider;
+                                              $p ? $p->provider : '';
+                                            },
+                     },
+    'ordernum'    => 'Order number', #XXX "Circuit ID/Order number"
+    'modelnum'    => { label             => 'Model',
+                       type              => 'select-cable_model',
+                       disable_inventory => 1,
+                       disable_select    => 1,
+                       value_callback    => sub {
+                                              my $svc = shift;
+                                              $svc->cable_model->model_name;
+                                            },
+                     },
+    'serialnum'   => 'Serial number',
+    'mac_addr'    => { label          => 'MAC address',
+                       type           => 'input-mac_addr',
+                       value_callback => sub {
+                                           my $svc = shift;
+                                           $svc->mac_addr_formatted('U',':');
+                                         },
+                     },
   ;
 
   {
@@ -103,6 +134,27 @@ 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;
+  if ( $self->serialnum ) {
+    my $serialnum_label = $part_svc->part_svc_column('serialnum');
+    push @label,
+      ($serialnum_label && $serialnum_label->columnlabel || 'Serial#').
+      $self->serialnum;
+  }
+  return join(', ', @label);
+}
+
 =item insert
 
 Adds this record to the database.  If there is an error, returns the error,
@@ -130,26 +182,50 @@ sub check {
 
   my $error = 
        $self->ut_numbern('svcnum')
+    || $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;
 }
 
-=item cable_model
+sub _check_duplicate {
+  my $self = shift;
 
-Returns the cable_model object for this record.
+  # 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.
 
-=cut
+  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.")";
+    }
+  }
 
-sub cable_model {
-  my $self = shift;
-  qsearchs('cable_model', { 'modelnum'=>$self->modelnum } );
+  if ( $self->serialnum ) {
+    my @dup_serial;
+    @dup_serial = $self->find_duplicates('global', 'modelnum', '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.
+
+=item cable_model
+
+Returns the cable_model object for this record.
+
 =back
 
 =head1 BUGS