X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2Fsvc_phone.pm;h=19bef94fc8dccfe6ab1d052376e8dbb8f04d1245;hp=b61a93dabd9c135d1248d5cbfc29a432b425d0dc;hb=a9579d4fc556a54ad76b863cdd19abba79f3fc5f;hpb=35359a73152b3d7a9ad5e3d37faf81f6fedb76e8

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index b61a93dab..19bef94fc 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -79,6 +79,41 @@ Voicemail PIN
 
 Optional svcnum from svc_pbx
 
+=item forwarddst
+
+Forwarding destination
+
+=item email
+
+Email address for virtual fax (fax-to-email) services
+
+=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
@@ -136,10 +171,20 @@ sub table_info {
                            disable_inventory => 1,
                            disable_select    => 1,
                          },
+	'forwarddst' => {	label => 'Forward Destination', 
+				%dis2,
+			},
+	'email' => {		label => 'Email',
+				%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, 
@@ -353,6 +398,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;
@@ -414,16 +470,33 @@ 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_numbern('forwarddst')
+    || $self->ut_textn('email')
     || $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;
@@ -654,7 +727,8 @@ sub get_cdrs {
       'table'      => 'cdr',
       'hashref'    => \%hash,
       'extra_sql'  => $extra_sql,
-      'order_by'   => "ORDER BY startdate $for_update",
+      'order_by'   => $options{'billsec_sum'} ? '' : "ORDER BY startdate $for_update",
+      'select'     => $options{'billsec_sum'} ? 'sum(billsec) as billsec_sum' : '*',
     } );
 
   @cdrs;