X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fsvc_phone.pm;h=49453915005e62032156aab254c72d318ef87c9f;hb=dafdfc24616b04a5ff594da31e2cdd03f58634b6;hp=56f3f3c2ef4ea062a8545789b6648ec064cc0875;hpb=1058f6e338399f9b22a5f294ef17b14403ca0848;p=freeside.git

diff --git a/FS/FS/svc_phone.pm b/FS/FS/svc_phone.pm
index 56f3f3c2e..494539150 100644
--- a/FS/FS/svc_phone.pm
+++ b/FS/FS/svc_phone.pm
@@ -79,6 +79,14 @@ 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,
@@ -163,6 +171,12 @@ 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,
@@ -456,6 +470,8 @@ 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')
@@ -690,8 +706,8 @@ sub get_cdrs {
 
   my @orwhere =  map " $_ = '$number'        ", @fields;
   push @orwhere, map " $_ = '$prefix$number' ", @fields
-    if length($prefix);
-  if ( $prefix =~ /^\+(\d+)$/ ) {
+    if defined($prefix) && length($prefix);
+  if ( $prefix && $prefix =~ /^\+(\d+)$/ ) {
     push @orwhere, map " $_ = '$1$number' ", @fields
   }
 
@@ -711,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;