X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_phone.pm;h=0b001d706695afe2906bdb0ef4984f3fa4b156a5;hb=8ae589024036a94bb71da0e05f645b00697e271f;hp=be6e2f7c271d08c940f647a398f10fdb8c0d6a4e;hpb=7353f670ef61e617a9dfb6c258907eb70e0345f6;p=freeside.git

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index be6e2f7c2..0b001d706 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -79,6 +79,37 @@ Voicemail PIN
 
 Optional svcnum from svc_pbx
 
+=item route
+
+Route id/number
+
+=item lnp_status
+
+LNP Status (can be null, native, portedin, portingin, portin-reject,
+portingout, portout-reject)
+
+=item portable
+
+=item lrn
+
+=item lnp_desired_due_date
+
+=item lnp_due_date
+
+=item lnp_other_provider
+
+If porting the number in or out, name of the losing or winning provider, 
+respectively.
+
+=item lnp_other_provider_account
+
+Account number of other provider. See lnp_other_provider.
+
+=item lnp_reject_reason
+
+See lnp_status. If lnp_status is portin-reject or portout-reject, this is an
+optional reject reason.
+
 =back
 
 =head1 METHODS
@@ -104,13 +135,14 @@ sub table_info {
     'display_weight' => 60,
     'cancel_weight'  => 80,
     'fields' => {
+        'svcnum'       => 'Service',
         'countrycode'  => { label => 'Country code',
                             type  => 'text',
                             disable_inventory => 1,
                             disable_select => 1,
                           },
         'phonenum'     => 'Phone number',
-        'pin'          => { label => 'Personal Identification Number',
+        'pin'          => { label => 'Voicemail PIN', #'Personal Identification Number',
                             type  => 'text',
                             disable_inventory => 1,
                             disable_select => 1,
@@ -135,10 +167,17 @@ sub table_info {
                            disable_inventory => 1,
                            disable_select    => 1,
                          },
+	'route' => {	label => 'Route',
+			%dis2, 
+		    },
 	'lnp_status' => {   	label => 'LNP Status',
 				type => 'select-lnp_status.html',
 				%dis2,
 			},
+	'lnp_reject_reason' => { 
+				label => 'LNP Reject Reason',
+				%dis2,
+			},
 	'portable' => 	{	label => 'Portable?', %dis2, },
 	'lrn' 	=>	{	label => 'LRN', 
 				disable_inventory => 1, 
@@ -352,6 +391,17 @@ sub replace {
   }
   #what about on-the-fly edits?  if the ui supports it?
 
+  # LNP data validation
+ return 'Invalid LNP status' # if someone does really stupid stuff
+    if (  ($old->lnp_status eq 'portingout' && $new->lnp_status eq 'portingin')
+	|| ($old->lnp_status eq 'portout-reject' && $new->lnp_status eq 'portingin')
+	|| ($old->lnp_status eq 'portin-reject' && $new->lnp_status eq 'portingout')
+	|| ($old->lnp_status eq 'portingin' && $new->lnp_status eq 'native')
+	|| ($old->lnp_status eq 'portin-reject' && $new->lnp_status eq 'native')
+	|| ($old->lnp_status eq 'portingin' && $new->lnp_status eq 'portingout')
+	|| ($old->lnp_status eq 'portingout' && $new->lnp_status eq 'portin-reject')
+	);
+
   my $error = $new->SUPER::replace($old, %options);
   if ( $error ) {
     $dbh->rollback if $oldAutoCommit;
@@ -413,16 +463,32 @@ sub check {
     || $self->ut_foreign_keyn('pbxsvc', 'svc_pbx',    'svcnum' )
     || $self->ut_foreign_keyn('domsvc', 'svc_domain', 'svcnum' )
     || $self->ut_foreign_keyn('locationnum', 'cust_location', 'locationnum')
+    || $self->ut_textn('route')
     || $self->ut_numbern('lrn')
     || $self->ut_numbern('lnp_desired_due_date')
     || $self->ut_numbern('lnp_due_date')
     || $self->ut_textn('lnp_other_provider')
     || $self->ut_textn('lnp_other_provider_account')
-    || $self->ut_enumn('lnp_status', ['','portingin','portingout','portedin','native'])
+    || $self->ut_enumn('lnp_status', ['','portingin','portingout','portedin',
+				'native', 'portin-reject', 'portout-reject'])
     || $self->ut_enumn('portable', ['','Y'])
+    || $self->ut_textn('lnp_reject_reason')
   ;
   return $error if $error;
 
+    # LNP data validation
+    return 'Cannot set LNP fields: no LNP in progress'
+	if ( ($self->lnp_desired_due_date || $self->lnp_due_date 
+	    || $self->lnp_other_provider || $self->lnp_other_provider_account
+	    || $self->lnp_reject_reason) 
+	    && (!$self->lnp_status || $self->lnp_status eq 'native') );
+    return 'Cannot set LNP reject reason: no LNP in progress or status is not reject'
+	if ($self->lnp_reject_reason && (!$self->lnp_status 
+			    || $self->lnp_status !~ /^port(in|out)-reject$/) );
+    return 'Cannot port-out a non-portable number' 
+	if (!$self->portable && $self->lnp_status eq 'portingout');
+
+
   return 'Name ('. $self->phone_name.
          ") is longer than $phone_name_max characters"
     if $phone_name_max && length($self->phone_name) > $phone_name_max;