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

diff --git a/FS/FS/svc_cable.pm b/FS/FS/svc_cable.pm
index f588f43c3..1980c0ee9 100644
--- a/FS/FS/svc_cable.pm
+++ b/FS/FS/svc_cable.pm
@@ -1,9 +1,10 @@
 package FS::svc_cable;
-use base qw( FS::device_Common FS::svc_Common );
+use base qw( FS::svc_Common ); #qw( FS::device_Common FS::svc_Common );
 
 use strict;
-use base qw( FS::Record );
-use FS::Record; # qw( qsearch qsearchs );
+use Tie::IxHash;
+use FS::Record qw( qsearchs ); # qw( qsearch qsearchs );
+use FS::cable_model;
 
 =head1 NAME
 
@@ -52,18 +53,53 @@ 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 search_sql {
+  my( $class, $string ) = @_;
+  if ( $string =~ /^([A-F0-9]{12})$/i ) {
+    $class->search_sql_field('mac_addr', uc($string));
+  } elsif ( $string =~ /^(([A-F0-9]{2}:){5}([A-F0-9]{2}))$/i ) {
+    $string =~ s/://g;
+    $class->search_sql_field('mac_addr', uc($string) );
+  } elsif ( $string =~ /^(\w+)$/ ) {
+    $class->search_sql_field('serialnum', $1);
+  } else {
+    '1 = 0'; #false
+  }
+}
+
 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);
+                                        },
+                    },
+  ;
+
   {
-    'name' => 'Cable Subscriber',
-    #'name_plural' => '', #optional,
+    'name'            => 'Cable Subscriber',
+    #'name_plural'     => '', #optional,
     #'longname_plural' => '', #optional
-    'sorts' => [ 'svcnum', ], #, 'serviceid' ], # optional sort field (or arrayref of sort fields, main first)
-    'display_weight' => 54,
-    'cancel_weight'  => 70, #?  no deps, so
-    'fields' => {
-      'svcnum'     => 'Service',
-      'identifier' => 'Identifier',
-    },
+    'fields'          => \%fields,
+    'sorts'           => [ 'svcnum', 'serialnum', 'mac_addr', ],
+    'display_weight'  => 54,
+    'cancel_weight'   => 70, #?  no deps, so
   };
 }
 
@@ -93,13 +129,27 @@ sub check {
   my $self = shift;
 
   my $error = 
-    $self->ut_numbern('svcnum')
+       $self->ut_numbern('svcnum')
+    || $self->ut_foreign_key('modelnum', 'cable_model', 'modelnum')
+    || $self->ut_alpha('serialnum')
+    || $self->ut_mac_addr('mac_addr')
   ;
   return $error if $error;
 
   $self->SUPER::check;
 }
 
+=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