add svc_dsl.gateway_access_number

diff --git a/FS/FS/Schema.pm b/FS/FS/Schema.pm
index 9733e85..181335b 100644 (file)
--- a/FS/FS/Schema.pm
+++ b/FS/FS/Schema.pm
@@ -2011,31 +2011,32 @@ sub tables_hashref {
     
     'svc_dsl' => {
       'columns' => [
-        'svcnum',           'int',    '',        '', '', '',
-       'pushed',     'int', 'NULL',       '', '', '',
-       'desired_due_date',     'int', 'NULL',       '', '', '',
-       'due_date',     'int', 'NULL',       '', '', '',
-        'vendor_order_id',              'varchar', 'NULL', $char_d,  '', '',
-        'vendor_qual_id',              'varchar', 'NULL', $char_d,  '', '',
-        'vendor_order_type',   'varchar', 'NULL', $char_d,  '', '',
+        'svcnum',                    'int',    '',        '', '', '',
+        'pushed',                    'int', 'NULL',       '', '', '',
+        'desired_due_date',          'int', 'NULL',       '', '', '',
+        'due_date',                  'int', 'NULL',       '', '', '',
+        'vendor_order_id',       'varchar', 'NULL', $char_d,  '', '',
+        'vendor_qual_id',        'varchar', 'NULL', $char_d,  '', '',
+        'vendor_order_type',     'varchar', 'NULL', $char_d,  '', '',
         'vendor_order_status',   'varchar', 'NULL', $char_d,  '', '',
-        'first',              'varchar', 'NULL', $char_d,  '', '',
-        'last',              'varchar', 'NULL', $char_d,  '', '',
-        'company',              'varchar', 'NULL', $char_d,  '', '',
-       'phonenum',     'varchar', 'NULL',       24, '', '',
-        'loop_type',   'char', 'NULL',       1,  '', '', 
-        'local_voice_provider', 'varchar', 'NULL', $char_d,  '', '',
-        'circuitnum',              'varchar', 'NULL', $char_d,  '', '',
-        'rate_band',              'varchar', 'NULL', $char_d,  '', '',
-       'vpi',     'int', 'NULL',       '', '', '',
-       'vci',     'int', 'NULL',       '', '', '',
-        'isp_chg',   'char', 'NULL',       1,  '', '', 
-        'isp_prev',              'varchar', 'NULL', $char_d,  '', '',
-        'username',              'varchar', 'NULL', $char_d,  '', '',
-        'password',              'varchar', 'NULL', $char_d,  '', '',
-        'staticips',             'text', 'NULL', '',  '', '',
-        'monitored',           'char', 'NULL',       1,  '', '', 
-       'last_pull',     'int', 'NULL',       '', '', '',
+        'first',                 'varchar', 'NULL', $char_d,  '', '',
+        'last',                  'varchar', 'NULL', $char_d,  '', '',
+        'company',               'varchar', 'NULL', $char_d,  '', '',
+        'phonenum',              'varchar', 'NULL',      24, '', '',
+        'gateway_access_number', 'varchar', 'NULL',      24, '', '',
+        'loop_type',                'char', 'NULL',       1, '', '', 
+        'local_voice_provider',  'varchar', 'NULL', $char_d, '', '',
+        'circuitnum',            'varchar', 'NULL', $char_d, '', '',
+        'rate_band',             'varchar', 'NULL', $char_d, '', '',
+        'vpi',                       'int', 'NULL',      '', '', '',
+        'vci',                       'int', 'NULL',      '', '', '',
+        'isp_chg',                  'char', 'NULL',       1, '', '', 
+        'isp_prev',              'varchar', 'NULL', $char_d, '', '',
+        'username',              'varchar', 'NULL', $char_d, '', '',
+        'password',              'varchar', 'NULL', $char_d, '', '',
+        'staticips',                'text', 'NULL',      '', '', '',
+        'monitored',                'char', 'NULL',       1, '', '', 
+        'last_pull',                 'int', 'NULL',      '', '', '',
       ],
       'primary_key' => 'svcnum',
       'unique' => [ ],

diff --git a/FS/FS/svc_dsl.pm b/FS/FS/svc_dsl.pm
index 89f1159..b02e74f 100644 (file)
--- a/FS/FS/svc_dsl.pm
+++ b/FS/FS/svc_dsl.pm
@@ -76,6 +76,8 @@ Vendor/telco DSL order status (e.g. (N)ew, (A)ssigned, (R)ejected, (M)revised,
 
 =item phonenum - DSL Telephone Number
 
+=item gateway_access_number - Gateway access number, if different
+
 =item loop_type - Loop-type - vendor/telco-specific
 
 =item local_voice_provider - Local Voice Provider's name
@@ -129,56 +131,55 @@ sub table_info {
     my %dis2 = ( disable_inventory=>1, disable_select=>1 );
 
     {
-       'name' => 'DSL',
-       'name_plural' => 'DSLs',
-       'lcname_plural' => 'DSLs',
-       'sorts' => [ 'phonenum' ],
-       'display_weight' => 55,
-       'cancel_weight' => 75,
-       'fields' => {
-           'pushed' => {       label => 'Pushed', 
-                               type => 'disabled' },
-           'desired_due_date' => {     label => 'Desired Due Date', %dis2, },
-           'due_date' => {             label => 'Due Date', %dis2, },
-           'vendor_order_id' => { label => 'Vendor Order ID', %dis2, },
-           'vendor_qual_id' => { label => 'Vendor Qualification ID', 
-                               type => 'disabled' },
-           'vendor_order_type' => { label => 'Vendor Order Type',
-                                   disable_inventory => 1,
-                               },
-           'vendor_order_status' => { label => 'Vendor Order Status',
-                                   disable_inventory => 1,
-                                   },
-           'first' => {        label => 'First Name', %dis2, },
-           'last' => {         label => 'Last Name', %dis2, },
-           'company' => {      label => 'Company Name', %dis2, },
-           'phonenum' => {     label => 'Service Telephone Number', },
-           'loop_type' => {    label => 'Loop Type',
-                                   disable_inventory => 1,
-                       },
-           'local_voice_provider' => {         label => 'Local Voice Provider',
-                                   disable_inventory => 1,
-                       },
-           'circuitnum' => {   label => 'Circuit #',   },
-           'rate_band' => {    label => 'Rate Band',
-                                   disable_inventory => 1,
-                       },
-           'vpi' => { label => 'VPI', disable_inventory => 1 },
-           'vci' => { label => 'VCI', disable_inventory => 1 },
-           'isp_chg' => {      label => 'ISP Changing?', 
-                               type => 'checkbox', %dis2 },
-           'isp_prev' => {     label => 'Current or Previous ISP',
-                                   disable_inventory => 1,
-                       },
-           'username' => {     label => 'PPPoE Username',
-                               type => 'text',
-                       },
-           'password' => {     label => 'PPPoE Password', %dis2 },
-           'staticips' => {    label => 'Static IPs', %dis1 },
-           'monitored' => {    label => 'Monitored', 
-                               type => 'checkbox', %dis2 },
-           'last_pull' => {    label => 'Last Pull', type => 'disabled' },
-       },
+        'name' => 'DSL',
+        'name_plural' => 'DSLs',
+        'lcname_plural' => 'DSLs',
+        'sorts' => [ 'phonenum' ],
+        'display_weight' => 55,
+        'cancel_weight' => 75,
+        'fields' => {
+            'pushed'                => { label => 'Pushed', 
+                                         type  => 'disabled' },
+            'desired_due_date'      => { label => 'Desired Due Date', %dis2, },
+            'due_date'              => { label => 'Due Date', %dis2, },
+            'vendor_order_id'       => { label => 'Vendor Order ID', %dis2, },
+            'vendor_qual_id'        => { label => 'Vendor Qualification ID', 
+                                         type => 'disabled' },
+            'vendor_order_type'     => { label => 'Vendor Order Type',
+                                         disable_inventory => 1, },
+            'vendor_order_status'   => { label => 'Vendor Order Status',
+                                         disable_inventory => 1, },
+            'first'                 => { label => 'First Name', %dis2, },
+            'last'                  => { label => 'Last Name', %dis2, },
+            'company'               => { label => 'Company Name', %dis2, },
+            'phonenum'              => { label => 'Service Telephone Number', },
+            'gateway_access_number' => { label => 'Gateway Access Number'.
+                                                  ' (if different)', },
+            'loop_type'             => { label => 'Loop Type',
+                                         disable_inventory => 1, },
+            'local_voice_provider'  => { label => 'Local Voice Provider',
+                                         disable_inventory => 1, },
+            'circuitnum'            => { label => 'Circuit #',        },
+            'rate_band'             => { label => 'Rate Band',
+                                         disable_inventory => 1, },
+            'vpi'                   => { label => 'VPI',
+                                         disable_inventory => 1 },
+            'vci'                   => { label => 'VCI',
+                                         disable_inventory => 1 },
+            'isp_chg'               => { label => 'ISP Changing?', 
+                                         type  => 'checkbox',
+                                         %dis2, },
+            'isp_prev'              => { label => 'Current or Previous ISP',
+                                         disable_inventory => 1, },
+            'username'              => { label => 'PPPoE Username',
+                                         type  => 'text', },
+            'password'              => { label => 'PPPoE Password', %dis2 },
+            'staticips'             => { label => 'Static IPs', %dis1 },
+            'monitored'             => { label => 'Monitored', 
+                                         type => 'checkbox', %dis2 },
+            'last_pull'             => { label => 'Last Pull',
+                                         type  => 'disabled' },
+        },
     };
 }
 
@@ -255,6 +256,7 @@ sub check {
     || $self->ut_textn('last')
     || $self->ut_textn('company')
     || $self->ut_numbern('phonenum')
+    || $self->ut_numbern('gateway_access_number')
     || $self->ut_alphasn('loop_type')
     || $self->ut_textn('local_voice_provider')
     || $self->ut_textn('circuitnum')
@@ -271,6 +273,9 @@ sub check {
   ;
   return $error if $error;
 
+  $self->gateway_access_number('')
+    if $self->phonenum && $self->phonenum eq $self->gateway_access_number;
+
   $self->SUPER::check;
 }
 

diff --git a/httemplate/edit/svc_dsl.cgi b/httemplate/edit/svc_dsl.cgi
index 989564e..1aeadb3 100644 (file)
--- a/httemplate/edit/svc_dsl.cgi
+++ b/httemplate/edit/svc_dsl.cgi
@@ -24,11 +24,16 @@ my $html_foot = sub { "
   function ikano_loop_type_changed() {
         var loop_type = document.getElementById('loop_type').value;
         var phonenum = document.getElementById('phonenum');
+        var gateway_access_number = document.getElementById('gateway_access_number');
         if(loop_type == '0') {
             phonenum.value = '';
             phonenum.disabled = true;        
+            gateway_access_number.value = '';
+            gateway_access_number.disabled = true;
+        } else {
+            phonenum.disabled = false;
+            gateway_access_number.disabled = false;
         }
-        else phonenum.disabled = false;
   }
 </SCRIPT>
 "; };
@@ -58,7 +63,7 @@ my $edit_cb = sub {
         # else add any other export-specific stuff here
     }
     else {
-        push @fields, qw( first last company phonenum circuitnum rate_band vpi vci );
+        push @fields, qw( first last company phonenum gateway_access_number circuitnum rate_band vpi vci );
     }
 };
 
@@ -123,6 +128,10 @@ my $new_cb = sub {
         { field => 'phonenum',
           value => $phonenum,
         };
+        { field => 'gateway_access_number',
+          value => '',
+        };
+
 
     }