add signup server default package

[freeside.git] / FS / FS / cust_svc.pm

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index e7afa77..a760761 100644 (file)
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -1,7 +1,7 @@
 package FS::cust_svc;
 
 use strict;
-use vars qw( @ISA $DEBUG $ignore_quantity );
+use vars qw( @ISA $DEBUG $me $ignore_quantity );
 use Carp qw( carp cluck );
 use FS::Conf;
 use FS::Record qw( qsearch qsearchs dbh );
@@ -13,6 +13,7 @@ use FS::svc_acct;
 use FS::svc_domain;
 use FS::svc_forward;
 use FS::svc_broadband;
+use FS::svc_phone;
 use FS::svc_external;
 use FS::domain_record;
 use FS::part_export;
@@ -21,6 +22,7 @@ use FS::cdr;
 @ISA = qw( FS::Record );
 
 $DEBUG = 0;
+$me = '[cust_svc]';
 
 $ignore_quantity = 0;
 
@@ -277,6 +279,10 @@ Returns a list consisting of:
 - The table name (i.e. svc_domain) for this service
 - svcnum
 
+Usage example:
+
+  my($label, $value, $svcdb) = $cust_svc->label;
+
 =cut
 
 sub label {
@@ -315,6 +321,8 @@ sub _svc_label {
     $tag = $domain_record->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
+  } elsif ( $svcdb eq 'svc_phone' ) {
+    $tag = $svc_x->phonenum; #XXX format it better
   } elsif ( $svcdb eq 'svc_external' ) {
     my $conf = new FS::Conf;
     if ( $conf->config('svc_external-display_type') eq 'artera_turbo' ) {
@@ -346,6 +354,9 @@ sub svc_x {
     $self->{'_svc_acct'};
   } else {
     #require "FS/$svcdb.pm";
+    warn "$me svc_x: part_svc.svcpart ". $self->part_svc->svcpart.
+         ", so searching for $svcdb.svcnum ". $self->svcnum. "\n"
+      if $DEBUG;
     qsearchs( $svcdb, { 'svcnum' => $self->svcnum } );
   }
 }
@@ -586,30 +597,29 @@ sub get_cdrs_for_update {
 
   my $default_prefix = $options{'default_prefix'};
 
-  #Currently CDRs are associated with svc_acct services via a DID in the
-  #username.  This part is rather tenative and still subject to change...
-  #return () unless $self->svc_x->isa('FS::svc_acct');
-  return () unless $self->part_svc->svcdb eq 'svc_acct';
-  my $number = $self->svc_x->username;
+  #CDRs are now associated with svc_phone services via svc_phone.phonenum
+  #return () unless $self->svc_x->isa('FS::svc_phone');
+  return () unless $self->part_svc->svcdb eq 'svc_phone';
+  my $number = $self->svc_x->phonenum;
 
   my @cdrs = 
-    qsearch(
+    qsearch( {
       'table'      => 'cdr',
       'hashref'    => { 'freesidestatus' => '',
                         'charged_party'  => $number
                       },
       'extra_sql'  => 'FOR UPDATE',
-    );
+    } );
 
   if ( length($default_prefix) ) {
     push @cdrs,
-      qsearch(
+      qsearch( {
         'table'      => 'cdr',
         'hashref'    => { 'freesidestatus' => '',
                           'charged_party'  => "$default_prefix$number",
                         },
         'extra_sql'  => 'FOR UPDATE',
-      );
+      } );
   }
 
   @cdrs;