[freeside-commits] freeside/FS/FS Schema.pm, 1.317.2.14, 1.317.2.15 svc_dsl.pm, 1.10.2.2, 1.10.2.3

[Ivan,,,]

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

Modified Files:
      Tag: FREESIDE_2_3_BRANCH
	Schema.pm svc_dsl.pm 
Log Message:
add svc_dsl.gateway_access_number

Index: Schema.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Schema.pm,v
retrieving revision 1.317.2.14
retrieving revision 1.317.2.15
diff -u -w -d -r1.317.2.14 -r1.317.2.15
--- Schema.pm	25 Oct 2011 23:47:02 -0000	1.317.2.14
+++ Schema.pm	30 Oct 2011 20:58:50 -0000	1.317.2.15
@@ -2023,6 +2023,7 @@
         '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,  '', '',

Index: svc_dsl.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/svc_dsl.pm,v
retrieving revision 1.10.2.2
retrieving revision 1.10.2.3
diff -u -w -d -r1.10.2.2 -r1.10.2.3
--- svc_dsl.pm	6 Oct 2011 07:00:07 -0000	1.10.2.2
+++ svc_dsl.pm	30 Oct 2011 20:58:51 -0000	1.10.2.3
@@ -76,6 +76,8 @@
 
 =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
@@ -144,40 +146,39 @@
 	    'vendor_qual_id' => { label => 'Vendor Qualification ID', 
 				type => 'disabled' },
 	    'vendor_order_type' => { label => 'Vendor Order Type',
-				    disable_inventory => 1,
-				},
+                                         disable_inventory => 1, },
 	    'vendor_order_status' => { label => 'Vendor Order Status',
-				    disable_inventory => 1,
-				    },
+                                         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,
-			},
+                                         disable_inventory => 1, },
 	    'local_voice_provider' => {		label => 'Local Voice Provider',
-				    disable_inventory => 1,
-			},
+                                         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 },
+                                         disable_inventory => 1, },
+            'vpi'                   => { label => 'VPI',
+                                         disable_inventory => 1 },
+            'vci'                   => { label => 'VCI',
+                                         disable_inventory => 1 },
 	    'isp_chg' => {	label => 'ISP Changing?', 
-				type => 'checkbox', %dis2 },
+                                         type  => 'checkbox',
+                                         %dis2, },
 	    'isp_prev' => {	label => 'Current or Previous ISP',
-				    disable_inventory => 1,
-			},
+                                         disable_inventory => 1, },
 	    'username' => {	label => 'PPPoE Username',
-				type => 'text',
-			},
+                                         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' },
+            'last_pull'             => { label => 'Last Pull',
+                                         type  => 'disabled' },
 	},
     };
 }
@@ -255,6 +256,7 @@
     || $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 @@
   ;
   return $error if $error;
 
+  $self->gateway_access_number('')
+    if $self->phonenum && $self->phonenum eq $self->gateway_access_number;
+
   $self->SUPER::check;
 }