[freeside-commits] freeside/FS/FS Schema.pm, 1.292, 1.293 svc_dish.pm, 1.1, 1.2 svc_hardware.pm, 1.2, 1.3

[Mark Wells]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail.420.am:/tmp/cvs-serv18870/FS/FS

Modified Files:
	Schema.pm svc_dish.pm svc_hardware.pm 
Log Message:
svc_dish and svc_hardware fixes, #11454

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.292
retrieving revision 1.293
diff -u -w -d -r1.292 -r1.293
--- Schema.pm	27 Apr 2011 05:22:21 -0000	1.292
+++ Schema.pm	29 Apr 2011 08:58:18 -0000	1.293
@@ -2022,6 +2022,7 @@
       'columns' => [
         'svcnum',   'int',     '',     '', '', '',
         'acctnum',  'varchar', '',     16, '', '',
+        'installdate', @date_type,         '', '', 
         'note',     'text',    'NULL', '', '', '',
       ],
       'primary_key' => 'svcnum',
@@ -2036,6 +2037,7 @@
         'serial',   'varchar', 'NULL', $char_d, '', '',
         'ip_addr',  'varchar', 'NULL',      40, '', '',
         'hw_addr',  'varchar', 'NULL',      12, '', '',
+        'smartcard','varchar', 'NULL',      30, '', '',
         'statusnum','int', 'NULL',          '', '', '',
         'note',     'text',    'NULL',      '', '', '',
       ],
@@ -2069,6 +2071,7 @@
       'columns' => [
         'statusnum', 'serial', '',      '', '', '',
         'label'    ,'varchar', '', $char_d, '', '',
+        'disabled',    'char', 'NULL',   1, '', '', 
       ],
       'primary_key' => 'statusnum',
       'unique' => [ ],

Index: svc_hardware.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_hardware.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -w -d -r1.2 -r1.3
--- svc_hardware.pm	14 Apr 2011 18:00:01 -0000	1.2
+++ svc_hardware.pm	29 Apr 2011 08:58:18 -0000	1.3
@@ -45,6 +45,8 @@
 
 =item serial - Serial number
 
+=item smartcard - Smartcard number, for devices that use a smartcard
+
 =item statusnum - Service status (see L<FS::hardware_status>)
 
 =item note - Installation notes: location on property, physical access, etc.
@@ -82,6 +84,7 @@
       'serial'    => { label => 'Serial number', %opts },
       'hw_addr'   => { label => 'Hardware address', %opts },
       'ip_addr'   => { label => 'IP address', %opts },
+      'smartcard' => { label => 'Smartcard #', %opts },
       'statusnum' => { label => 'Service status', 
                        type  => 'select',
                        select_table => 'hardware_status',
@@ -165,6 +168,7 @@
     || $self->ut_ip46n('ip_addr')
     || $self->ut_hexn('hw_addr')
     || $self->ut_alphan('serial')
+    || $self->ut_alphan('smartcard')
     || $self->ut_foreign_keyn('statusnum', 'hardware_status', 'statusnum')
     || $self->ut_textn('note')
   ;

Index: svc_dish.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_dish.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -w -d -r1.1 -r1.2
--- svc_dish.pm	1 Apr 2011 02:52:12 -0000	1.1
+++ svc_dish.pm	29 Apr 2011 08:58:18 -0000	1.2
@@ -36,6 +36,8 @@
 
 =item acctnum - DISH account number
 
+=item installdate - Installation date (as Unix timestamp)
+
 =item note - Installation notes: location on property, physical access, etc.
 
 =back
@@ -64,6 +66,7 @@
     'fields' => {
       'svcnum'    => { label => 'Service' },
       'acctnum'   => { label => 'DISH account#', %opts },
+      'installdate' => { label => 'Install date', %opts },
       'note'      => { label => 'Installation notes', %opts },
     }
   }
@@ -112,6 +115,7 @@
   my $error = 
     $self->ut_numbern('svcnum')
     || $self->ut_text('acctnum')
+    || $self->ut_numbern('installdate')
     || $self->ut_textn('note')
   ;
   return $error if $error;