X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_dsl.pm;h=89f1159bd2e7f7b26b41e946008f1e443e4ff5c5;hb=5d1a52f6d855d1bd2dbb414cefef06f1da7e94b0;hp=2c30b006eb1cbad57d2ccd67bca7c1f798a4061a;hpb=1594e450be1c4f0c9f9a2d98ab72c714a4695bdc;p=freeside.git

diff --git a/FS/FS/svc_dsl.pm b/FS/FS/svc_dsl.pm
index 2c30b006e..89f1159bd 100644
--- a/FS/FS/svc_dsl.pm
+++ b/FS/FS/svc_dsl.pm
@@ -4,6 +4,9 @@ use strict;
 use vars qw( @ISA $conf $DEBUG $me );
 use FS::Record qw( qsearch qsearchs );
 use FS::svc_Common;
+use FS::dsl_device;
+use FS::dsl_note;
+use FS::qual;
 
 @ISA = qw( FS::svc_Common );
 $DEBUG = 0;
@@ -79,6 +82,10 @@ Vendor/telco DSL order status (e.g. (N)ew, (A)ssigned, (R)ejected, (M)revised,
 
 =item circuitnum - Circuit #
 
+=item vpi
+
+=item vci
+
 =item rate_band - Rate Band
 
 =item isp_chg
@@ -123,6 +130,8 @@ sub table_info {
 
     {
 	'name' => 'DSL',
+	'name_plural' => 'DSLs',
+	'lcname_plural' => 'DSLs',
 	'sorts' => [ 'phonenum' ],
 	'display_weight' => 55,
 	'cancel_weight' => 75,
@@ -131,8 +140,8 @@ sub table_info {
 				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', 
+	    '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,
@@ -154,6 +163,8 @@ sub table_info {
 	    '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',
@@ -234,20 +245,22 @@ sub check {
   my $error = 
     $self->ut_numbern('svcnum')
     || $self->ut_numbern('pushed')
-    || $self->ut_number('desired_due_date')
+    || $self->ut_numbern('desired_due_date')
     || $self->ut_numbern('due_date')
     || $self->ut_textn('vendor_order_id')
     || $self->ut_textn('vendor_qual_id')
-    || $self->ut_alpha('vendor_order_type')
+    || $self->ut_alphan('vendor_order_type')
     || $self->ut_alphan('vendor_order_status')
-    || $self->ut_text('first')
-    || $self->ut_text('last')
+    || $self->ut_textn('first')
+    || $self->ut_textn('last')
     || $self->ut_textn('company')
     || $self->ut_numbern('phonenum')
     || $self->ut_alphasn('loop_type')
     || $self->ut_textn('local_voice_provider')
     || $self->ut_textn('circuitnum')
     || $self->ut_textn('rate_band')
+    || $self->ut_numbern('vpi')
+    || $self->ut_numbern('vci')
     || $self->ut_alphan('isp_chg')
     || $self->ut_textn('isp_prev')
     || $self->ut_textn('username')
@@ -261,6 +274,39 @@ sub check {
   $self->SUPER::check;
 }
 
+=item dsl_device
+
+Returns the MAC addresses associated with this DSL service, as FS::dsl_device
+objects.
+
+=cut
+
+sub dsl_device {
+  my $self = shift;
+  qsearch('dsl_device', { 'svcnum' => $self->svcnum });
+}
+
+sub predelete_hook_first {
+    my $self = shift;
+    my @exports = $self->part_svc->part_export_dsl_pull;
+    return 'More than one DSL-pulling export attached' if scalar(@exports) > 1;
+    if ( scalar(@exports) == 1 ) {
+	my $export = $exports[0];
+	return $export->dsl_pull($self);
+    }
+    '';
+}
+
+sub predelete_hook {
+    my $self = shift;
+    my @notes = $self->notes;
+    foreach my $note ( @notes ) {
+	my $error = $note->delete;
+	return $error if $error;
+    }
+    '';
+}
+
 =back
 
 =head1 SEE ALSO