projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f8057cb
)
update cust_svc::seconds_since_sqlradacct to deal with any usage-capable export
author
ivan
<ivan>
Mon, 28 Nov 2005 16:34:34 +0000
(16:34 +0000)
committer
ivan
<ivan>
Mon, 28 Nov 2005 16:34:34 +0000
(16:34 +0000)
FS/FS/cust_svc.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_svc.pm
b/FS/FS/cust_svc.pm
index
ecb3e72
..
930e673
100644
(file)
--- a/
FS/FS/cust_svc.pm
+++ b/
FS/FS/cust_svc.pm
@@
-492,10
+492,8
@@
sub attribute_since_sqlradacct {
my $svc_x = $self->svc_x;
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;
unless @part_export;
#or return undef;
@@
-521,14
+519,7
@@
sub attribute_since_sqlradacct {
$str2time = 'extract(epoch from ';
}
$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 $sth = $dbh->prepare("SELECT SUM($attrib)
FROM radacct
my $sth = $dbh->prepare("SELECT SUM($attrib)
FROM radacct