projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
credit for unused portion at cancellation, patch from pbowen
[freeside.git]
/
FS
/
FS
/
cust_svc.pm
diff --git
a/FS/FS/cust_svc.pm
b/FS/FS/cust_svc.pm
index
65f8d58
..
c91eba1
100644
(file)
--- a/
FS/FS/cust_svc.pm
+++ b/
FS/FS/cust_svc.pm
@@
-1,8
+1,8
@@
package FS::cust_svc;
use strict;
package FS::cust_svc;
use strict;
-use vars qw( @ISA $ignore_quantity );
-use Carp qw( cluck );
+use vars qw( @ISA $
DEBUG $
ignore_quantity );
+use Carp qw( c
arp c
luck );
use FS::Conf;
use FS::Record qw( qsearch qsearchs dbh );
use FS::cust_pkg;
use FS::Conf;
use FS::Record qw( qsearch qsearchs dbh );
use FS::cust_pkg;
@@
-19,6
+19,8
@@
use FS::part_export;
@ISA = qw( FS::Record );
@ISA = qw( FS::Record );
+$DEBUG = 0;
+
$ignore_quantity = 0;
sub _cache {
$ignore_quantity = 0;
sub _cache {
@@
-276,37
+278,45
@@
Returns a list consisting of:
sub label {
my $self = shift;
sub label {
my $self = shift;
-
my $svcdb = $self->part_svc->svcdb
;
+
carp "FS::cust_svc::label called on $self" if $DEBUG
;
my $svc_x = $self->svc_x
my $svc_x = $self->svc_x
- or die "can't find $svcdb.svcnum ". $self->svcnum;
+ or die "can't find ". $self->part_svc->svcdb. '.svcnum '. $self->svcnum;
+ $self->_svc_label($svc_x);
+}
+
+sub _svc_label {
+ my( $self, $svc_x ) = ( shift, shift );
+ my $svcdb = $self->part_svc->svcdb;
+
my $tag;
if ( $svcdb eq 'svc_acct' ) {
my $tag;
if ( $svcdb eq 'svc_acct' ) {
- $tag = $svc_x->email;
+ $tag = $svc_x->email
(@_)
;
} elsif ( $svcdb eq 'svc_forward' ) {
if ( $svc_x->srcsvc ) {
} elsif ( $svcdb eq 'svc_forward' ) {
if ( $svc_x->srcsvc ) {
- my $svc_acct = $svc_x->srcsvc_acct;
- $tag = $svc_acct->email;
+ my $svc_acct = $svc_x->srcsvc_acct
(@_)
;
+ $tag = $svc_acct->email
(@_)
;
} else {
$tag = $svc_x->src;
}
$tag .= '->';
if ( $svc_x->dstsvc ) {
} else {
$tag = $svc_x->src;
}
$tag .= '->';
if ( $svc_x->dstsvc ) {
- my $svc_acct = $svc_x->dstsvc_acct;
- $tag .= $svc_acct->email;
+ my $svc_acct = $svc_x->dstsvc_acct
(@_)
;
+ $tag .= $svc_acct->email
(@_)
;
} else {
$tag .= $svc_x->dst;
}
} elsif ( $svcdb eq 'svc_domain' ) {
$tag = $svc_x->getfield('domain');
} elsif ( $svcdb eq 'svc_www' ) {
} else {
$tag .= $svc_x->dst;
}
} elsif ( $svcdb eq 'svc_domain' ) {
$tag = $svc_x->getfield('domain');
} elsif ( $svcdb eq 'svc_www' ) {
- my $domain
= qsearchs( 'domain_record', { 'recnum' => $svc_x->recnum } )
;
- $tag = $domain->zone;
+ 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' ) {
} 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). '-'. $svc_x->title;
+ $tag = sprintf('%010d', $svc_x->id). '-'.
+ substr('0000000000'.uc($svc_x->title), -10);
} else {
$tag = $svc_x->id. ': '. $svc_x->title;
}
} else {
$tag = $svc_x->id. ': '. $svc_x->title;
}
@@
-314,7
+324,9
@@
sub label {
cluck "warning: asked for label of unsupported svcdb; using svcnum";
$tag = $svc_x->getfield('svcnum');
}
cluck "warning: asked for label of unsupported svcdb; using svcnum";
$tag = $svc_x->getfield('svcnum');
}
+
$self->part_svc->svc, $tag, $svcdb;
$self->part_svc->svc, $tag, $svcdb;
+
}
=item svc_x
}
=item svc_x
@@
-542,11
+554,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
=cut
@@
-555,6
+567,7
@@
sub get_session_history {
#$attrib ???
#$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".
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".
@@
-565,10
+578,11
@@
sub get_session_history {
my @sessions = ();
foreach my $part_export ( @part_export ) {
my @sessions = ();
foreach my $part_export ( @part_export ) {
- push @sessions, $part_export->usage_sessions( $self->svc_x, $start, $end );
+ push @sessions,
+ @{ $part_export->usage_sessions( $start, $end, $self->svc_x ) };
}
}
-
\
@sessions;
+ @sessions;
}
}