diff options
author | mark <mark> | 2011-04-29 08:58:19 +0000 |
---|---|---|
committer | mark <mark> | 2011-04-29 08:58:19 +0000 |
commit | 91fd4ea0e91ee9e6717e0b12e01eebb8f8b21322 (patch) | |
tree | 9d2cb55cb767422e00e6cadd6c91714a77e87943 /FS/FS | |
parent | 4cd3537f6e3e14a596c67478bb83b2095303ec50 (diff) |
svc_dish and svc_hardware fixes, #11454
Diffstat (limited to 'FS/FS')
-rw-r--r-- | FS/FS/Schema.pm | 5 | ||||
-rw-r--r-- | FS/FS/svc_dish.pm | 8 | ||||
-rw-r--r-- | FS/FS/svc_hardware.pm | 4 |
3 files changed, 14 insertions, 3 deletions
diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm index cc0f21ffc..5d453ac27 100644 --- a/FS/FS/Schema.pm +++ b/FS/FS/Schema.pm @@ -2022,6 +2022,7 @@ sub tables_hashref { 'columns' => [ 'svcnum', 'int', '', '', '', '', 'acctnum', 'varchar', '', 16, '', '', + 'installdate', @date_type, '', '', 'note', 'text', 'NULL', '', '', '', ], 'primary_key' => 'svcnum', @@ -2036,7 +2037,8 @@ sub tables_hashref { 'serial', 'varchar', 'NULL', $char_d, '', '', 'ip_addr', 'varchar', 'NULL', 40, '', '', 'hw_addr', 'varchar', 'NULL', 12, '', '', - 'statusnum','int', 'NULL', '', '', '', + 'smartcard','varchar', 'NULL', 30, '', '', + 'statusnum','int', 'NULL', '', '', '', 'note', 'text', 'NULL', '', '', '', ], 'primary_key' => 'svcnum', @@ -2069,6 +2071,7 @@ sub tables_hashref { 'columns' => [ 'statusnum', 'serial', '', '', '', '', 'label' ,'varchar', '', $char_d, '', '', + 'disabled', 'char', 'NULL', 1, '', '', ], 'primary_key' => 'statusnum', 'unique' => [ ], diff --git a/FS/FS/svc_dish.pm b/FS/FS/svc_dish.pm index 5dac4f4d5..e254bf5d3 100644 --- a/FS/FS/svc_dish.pm +++ b/FS/FS/svc_dish.pm @@ -36,6 +36,8 @@ The following fields are currently supported: =item acctnum - DISH account number +=item installdate - Installation date (as Unix timestamp) + =item note - Installation notes: location on property, physical access, etc. =back @@ -62,8 +64,9 @@ sub table_info { 'display_weight' => 58, 'cancel_weight' => 85, 'fields' => { - 'svcnum' => { label => 'Service' }, - 'acctnum' => { label => 'DISH account#', %opts }, + 'svcnum' => { label => 'Service' }, + 'acctnum' => { label => 'DISH account#', %opts }, + 'installdate' => { label => 'Install date', %opts }, 'note' => { label => 'Installation notes', %opts }, } } @@ -112,6 +115,7 @@ sub check { my $error = $self->ut_numbern('svcnum') || $self->ut_text('acctnum') + || $self->ut_numbern('installdate') || $self->ut_textn('note') ; return $error if $error; diff --git a/FS/FS/svc_hardware.pm b/FS/FS/svc_hardware.pm index 96a8e762b..8f037f712 100644 --- a/FS/FS/svc_hardware.pm +++ b/FS/FS/svc_hardware.pm @@ -45,6 +45,8 @@ The following fields are currently supported: =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 @@ sub table_info { '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 @@ sub check { || $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') ; |