X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_svc.pm;h=2bc20ff5892d2ab2e87722a5559738167c34d1f5;hb=e96a3fd1c8ee8c711a7e119c0937da6866bbd4f0;hp=fae265d2ef8e5e9bddd9b601a35990aca11b2524;hpb=edf90a3eb4219f72c8962ad86caacf409b896e8f;p=freeside.git diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index fae265d2e..2bc20ff58 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -1,8 +1,9 @@ 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( carp cluck ); +use FS::Conf; use FS::Record qw( qsearch qsearchs dbh ); use FS::cust_pkg; use FS::part_pkg; @@ -12,11 +13,14 @@ use FS::svc_acct; use FS::svc_domain; use FS::svc_forward; use FS::svc_broadband; +use FS::svc_external; use FS::domain_record; use FS::part_export; @ISA = qw( FS::Record ); +$DEBUG = 0; + $ignore_quantity = 0; sub _cache { @@ -171,15 +175,10 @@ sub replace { local $FS::UID::AutoCommit = 0; my $dbh = dbh; - my $error = $new->SUPER::replace($old); - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return $error if $error; - } - if ( $new->svcpart != $old->svcpart ) { my $svc_x = $new->svc_x; - my $new_svc_x = ref($svc_x)->new({$svc_x->hash}); + 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; @@ -187,6 +186,12 @@ sub replace { } } + my $error = $new->SUPER::replace($old); + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error if $error; + } + $dbh->commit or die $dbh->errstr if $oldAutoCommit; ''; #no error @@ -274,40 +279,55 @@ Returns a list consisting of: 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 - 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' ) { - $tag = $svc_x->email; + $tag = $svc_x->email(@_); } 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 ) { - 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' ) { - 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' ) { - $tag = $svc_x->id. ': '. $svc_x->title; + my $conf = new FS::Conf; + if ( $conf->config('svc_external-display_type') eq 'artera_turbo' ) { + $tag = sprintf('%010d', $svc_x->id). '-'. + substr('0000000000'.uc($svc_x->title), -10); + } else { + $tag = $svc_x->id. ': '. $svc_x->title; + } } else { cluck "warning: asked for label of unsupported svcdb; using svcnum"; $tag = $svc_x->getfield('svcnum'); } + $self->part_svc->svc, $tag, $svcdb; + } =item svc_x @@ -323,6 +343,7 @@ sub svc_x { if ( $svcdb eq 'svc_acct' && $self->{'_svc_acct'} ) { $self->{'_svc_acct'}; } else { + #require "FS/$svcdb.pm"; qsearchs( $svcdb, { 'svcnum' => $self->svcnum } ); } } @@ -534,59 +555,35 @@ sub attribute_since_sqlradacct { } -=item get_session_history_sqlradacct TIMESTAMP_START TIMESTAMP_END +=item get_session_history TIMESTAMP_START TIMESTAMP_END -See L. Equivalent to -$cust_svc->svc_x->get_session_history_sqlradacct, but more efficient. -Meaningless for records where B is not "svc_acct". +See L. Equivalent to +$cust_svc->svc_x->get_session_history, but more efficient. Meaningless for +records where B is not "svc_acct". =cut sub get_session_history { my($self, $start, $end, $attrib) = @_; - my $username = $self->svc_x->username; + #$attrib ??? - my @part_export = $self->part_svc->part_export('sqlradius') - or die "no sqlradius export configured for this service type"; + #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" + unless @part_export; #or return undef; my @sessions = (); foreach my $part_export ( @part_export ) { - - my $dbh = DBI->connect( map { $part_export->option($_) } - qw(datasrc username password) ) - or die "can't connect to sqlradius database: ". $DBI::errstr; - - #select a unix time conversion function based on database type - my $str2time; - if ( $dbh->{Driver}->{Name} =~ /^mysql(PP)?$/ ) { - $str2time = 'UNIX_TIMESTAMP('; - } elsif ( $dbh->{Driver}->{Name} eq 'Pg' ) { - $str2time = 'EXTRACT( EPOCH FROM '; - } else { - warn "warning: unknown database type ". $dbh->{Driver}->{Name}. - "; guessing how to convert to UNIX timestamps"; - $str2time = 'extract(epoch from '; - } - - my @fields = qw( acctstarttime acctstoptime acctsessiontime - acctinputoctets acctoutputoctets framedipaddress ); - - my $sth = $dbh->prepare('SELECT '. join(', ', @fields). - " FROM radacct - WHERE UserName = ? - AND $str2time AcctStopTime ) >= ? - AND $str2time AcctStopTime ) <= ? - ORDER BY AcctStartTime DESC - ") or die $dbh->errstr; - $sth->execute($username, $start, $end) or die $sth->errstr; - - push @sessions, map { { %$_ } } @{ $sth->fetchall_arrayref({}) }; - + push @sessions, + @{ $part_export->usage_sessions( $start, $end, $self->svc_x ) }; } - \@sessions + + @sessions; }