projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
26c21ea
)
also fix attribute_since_sqlradacct for data charging
author
ivan
<ivan>
Fri, 7 Nov 2003 08:39:04 +0000
(08:39 +0000)
committer
ivan
<ivan>
Fri, 7 Nov 2003 08:39:04 +0000
(08:39 +0000)
FS/FS/cust_svc.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_svc.pm
b/FS/FS/cust_svc.pm
index
139dd9d
..
af0abf7
100644
(file)
--- a/
FS/FS/cust_svc.pm
+++ b/
FS/FS/cust_svc.pm
@@
-468,10
+468,13
@@
for records where B<svcdb> is not "svc_acct".
sub attribute_since_sqlradacct {
my($self, $start, $end, $attrib) = @_;
sub attribute_since_sqlradacct {
my($self, $start, $end, $attrib) = @_;
- my $
username = $self->svc_x->username
;
+ my $
svc_x = $self->svc_x
;
- my @part_export = $self->part_svc->part_export('sqlradius')
- or die "no sqlradius export configured for this service type";
+ 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"
+ unless @part_export;
#or return undef;
my $sum = 0;
#or return undef;
my $sum = 0;
@@
-494,6
+497,15
@@
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 $sth = $dbh->prepare("SELECT SUM($attrib)
FROM radacct
WHERE UserName = ?
my $sth = $dbh->prepare("SELECT SUM($attrib)
FROM radacct
WHERE UserName = ?