X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_svc.pm;h=ecb3e725a2a3cd55688433010a1cc0bad857173b;hb=f8057cbccbb028ad33891e8c735cb4f40cf54b2d;hp=37b73b124a1f31e8a462bb408e0847162944688d;hpb=02f0f4ce6f01b9f6d67c44b8884320e6204a95a1;p=freeside.git

diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm
index 37b73b124..ecb3e725a 100644
--- a/FS/FS/cust_svc.pm
+++ b/FS/FS/cust_svc.pm
@@ -178,6 +178,7 @@ sub replace {
   if ( $new->svcpart != $old->svcpart ) {
     my $svc_x = $new->svc_x;
     my $new_svc_x = ref($svc_x)->new({$svc_x->hash, svcpart=>$new->svcpart });
+    local($FS::Record::nowarn_identical) = 1;
     my $error = $new_svc_x->replace($svc_x);
     if ( $error ) {
       $dbh->rollback if $oldAutoCommit;
@@ -257,8 +258,8 @@ sub part_svc {
 
 =item cust_pkg
 
-Returns the definition for this service, as a FS::part_svc object (see
-L<FS::part_svc>).
+Returns the package this service belongs to, as a FS::cust_pkg object (see
+L<FS::cust_pkg>).
 
 =cut
 
@@ -273,6 +274,7 @@ Returns a list consisting of:
 - The name of this service (from part_svc)
 - A meaningful identifier (username, domain, or mail alias)
 - The table name (i.e. svc_domain) for this service
+- svcnum
 
 =cut
 
@@ -308,14 +310,15 @@ sub _svc_label {
   } elsif ( $svcdb eq 'svc_domain' ) {
     $tag = $svc_x->getfield('domain');
   } elsif ( $svcdb eq 'svc_www' ) {
-    my $domain_record = $svc_x->domain_record;
+    my $domain_record = $svc_x->domain_record(@_);
     $tag = $domain_record->zone;
   } elsif ( $svcdb eq 'svc_broadband' ) {
     $tag = $svc_x->ip_addr;
   } elsif ( $svcdb eq 'svc_external' ) {
     my $conf = new FS::Conf;
     if ( $conf->config('svc_external-display_type') eq 'artera_turbo' ) {
-      $tag = sprintf('%010d', $svc_x->id). '-'. sprintf('%010d', $svc_x->title);
+      $tag = sprintf('%010d', $svc_x->id). '-'.
+             substr('0000000000'.uc($svc_x->title), -10);
     } else {
       $tag = $svc_x->id. ': '. $svc_x->title;
     }
@@ -324,7 +327,7 @@ sub _svc_label {
     $tag = $svc_x->getfield('svcnum');
   }
 
-  $self->part_svc->svc, $tag, $svcdb;
+  $self->part_svc->svc, $tag, $svcdb, $self->svcnum;
 
 }
 
@@ -381,10 +384,8 @@ sub seconds_since_sqlradacct {
 
   my $svc_x = $self->svc_x;
 
-  my @part_export = $self->part_svc->part_export('sqlradius');
-  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
-  die "no sqlradius or sqlradius_withdomain export configured for this".
-      "service type"
+  my @part_export = $self->part_svc->part_export_usage;
+  die "no usage-capable export configured for this service type"
     unless @part_export;
     #or return undef;
 
@@ -409,14 +410,7 @@ sub seconds_since_sqlradacct {
       $str2time = 'extract(epoch from ';
     }
 
-    my $username;
-    if ( $part_export->exporttype eq 'sqlradius' ) {
-      $username = $svc_x->username;
-    } elsif ( $part_export->exporttype eq 'sqlradius_withdomain' ) {
-      $username = $svc_x->email;
-    } else {
-      die 'unknown exporttype '. $part_export->exporttype;
-    }
+    my $username = $part_export->export_username($svc_x);
 
     my $query;
   
@@ -553,11 +547,11 @@ sub attribute_since_sqlradacct {
 
 }
 
-=item get_session_history_sqlradacct TIMESTAMP_START TIMESTAMP_END
+=item get_session_history TIMESTAMP_START TIMESTAMP_END
 
-See L<FS::svc_acct/get_session_history_sqlradacct>.  Equivalent to
-$cust_svc->svc_x->get_session_history_sqlradacct, but more efficient.
-Meaningless for records where B<svcdb> is not "svc_acct".
+See L<FS::svc_acct/get_session_history>.  Equivalent to
+$cust_svc->svc_x->get_session_history, but more efficient.  Meaningless for
+records where B<svcdb> is not "svc_acct".
 
 =cut
 
@@ -566,21 +560,19 @@ sub get_session_history {
 
   #$attrib ???
 
-  #my @part_export = $cust_svc->part_svc->part_export->can('usage_sessions');
-  my @part_export = $self->part_svc->part_export('sqlradius');
-  push @part_export, $self->part_svc->part_export('sqlradius_withdomain');
-  die "no sqlradius or sqlradius_withdomain export configured for this".
-      "service type"
+  my @part_export = $self->part_svc->part_export_usage;
+  die "no accounting-capable exports are enabled for this service definition"
     unless @part_export;
     #or return undef;
                      
   my @sessions = ();
 
   foreach my $part_export ( @part_export ) {
-    push @sessions, $part_export->usage_sessions( $start, $end, $self->svc_x );
+    push @sessions,
+      @{ $part_export->usage_sessions( $start, $end, $self->svc_x ) };
   }
 
-  \@sessions;
+  @sessions;
 
 }