projects
/
freeside.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
afab30d
)
update cust_svc::seconds_since_sqlradacct to deal with any usage-capable export
author
ivan
<ivan>
Mon, 28 Nov 2005 16:21:50 +0000
(16:21 +0000)
committer
ivan
<ivan>
Mon, 28 Nov 2005 16:21:50 +0000
(16:21 +0000)
FS/FS/cust_svc.pm
patch
|
blob
|
history
diff --git
a/FS/FS/cust_svc.pm
b/FS/FS/cust_svc.pm
index
e69befc
..
ecb3e72
100644
(file)
--- a/
FS/FS/cust_svc.pm
+++ b/
FS/FS/cust_svc.pm
@@
-410,14
+410,7
@@
sub seconds_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 $query;
my $query;
@@
-567,11
+560,8
@@
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".
- "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;
unless @part_export;
#or return undef;