X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_svc.pm;h=30b23908c942024f688a29ce22804c0fe9a9d88f;hb=7d0b690f5684cdfdcd68d25568a101f6b088ad98;hp=af54f2230b22e727ee7d95d1ddb2122a56505cdb;hpb=556cefb34ed648303951009e3bec919e18532bed;p=freeside.git diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index af54f2230..30b23908c 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -3,6 +3,7 @@ package FS::cust_svc; use strict; use vars qw( @ISA $DEBUG $me $ignore_quantity ); use Carp; +#use Scalar::Util qw( blessed ); use FS::Conf; use FS::Record qw( qsearch qsearchs dbh str2time_sql ); use FS::cust_pkg; @@ -16,7 +17,7 @@ use FS::cdr; #most FS::svc_ classes are autoloaded in svc_x emthod use FS::svc_acct; #this one is used in the cache stuff -@ISA = qw( FS::cust_main_Mixin FS::Record ); +@ISA = qw( FS::cust_main_Mixin FS::option_Common ); #FS::Record ); $DEBUG = 0; $me = '[cust_svc]'; @@ -132,22 +133,30 @@ sub cancel { my $svc = $self->svc_x; if ($svc) { + my $error = $svc->cancel; if ( $error ) { $dbh->rollback if $oldAutoCommit; return "Error canceling service: $error"; } - $error = $svc->delete; + $error = $svc->delete; #this deletes this cust_svc record as well if ( $error ) { $dbh->rollback if $oldAutoCommit; return "Error deleting service: $error"; } - } - my $error = $self->delete; - if ( $error ) { - $dbh->rollback if $oldAutoCommit; - return "Error deleting cust_svc: $error"; + } else { + + #huh? + warn "WARNING: no svc_ record found for svcnum ". $self->svcnum. + "; deleting cust_svc only\n"; + + my $error = $self->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return "Error deleting cust_svc: $error"; + } + } $dbh->commit or die $dbh->errstr if $oldAutoCommit; @@ -212,7 +221,13 @@ returns the error, otherwise returns false. =cut sub replace { +# my $new = shift; +# +# my $old = ( blessed($_[0]) && $_[0]->isa('FS::Record') ) +# ? shift +# : $new->replace_old; my ( $new, $old ) = ( shift, shift ); + $old = $new->replace_old unless defined($old); local $SIG{HUP} = 'IGNORE'; local $SIG{INT} = 'IGNORE'; @@ -225,8 +240,6 @@ sub replace { local $FS::UID::AutoCommit = 0; my $dbh = dbh; - $old = $new->replace_old unless defined($old); - if ( $new->svcpart != $old->svcpart ) { my $svc_x = $new->svc_x; my $new_svc_x = ref($svc_x)->new({$svc_x->hash, svcpart=>$new->svcpart }); @@ -238,6 +251,7 @@ sub replace { } } + #my $error = $new->SUPER::replace($old, @_); my $error = $new->SUPER::replace($old); if ( $error ) { $dbh->rollback if $oldAutoCommit; @@ -321,6 +335,34 @@ sub cust_pkg { qsearchs( 'cust_pkg', { 'pkgnum' => $self->pkgnum } ); } +=item pkg_svc + +Returns the pkg_svc record for for this service, if applicable. + +=cut + +sub pkg_svc { + my $self = shift; + my $cust_pkg = $self->cust_pkg; + return undef unless $cust_pkg; + + qsearchs( 'pkg_svc', { 'svcpart' => $self->svcpart, + 'pkgpart' => $cust_pkg->pkgpart, + } + ); +} + +=item date_inserted + +Returns the date this service was inserted. + +=cut + +sub date_inserted { + my $self = shift; + $self->h_date('insert'); +} + =item label Returns a list consisting of: @@ -356,6 +398,20 @@ sub _svc_label { } +=item export_links + +Returns a list of html elements associated with this services exports. + +=cut + +sub export_links { + my $self = shift; + my $svc_x = $self->svc_x + or return "can't find ". $self->part_svc->svcdb. '.svcnum '. $self->svcnum; + + $svc_x->export_links; +} + =item svc_x Returns the FS::svc_XXX object for this service (i.e. an FS::svc_acct object or @@ -410,6 +466,8 @@ for records where B is not "svc_acct". sub seconds_since_sqlradacct { my($self, $start, $end) = @_; + my $mes = "$me seconds_since_sqlradacct:"; + my $svc_x = $self->svc_x; my @part_export = $self->part_svc->part_export_usage; @@ -423,18 +481,26 @@ sub seconds_since_sqlradacct { next if $part_export->option('ignore_accounting'); + warn "$mes connecting to sqlradius database\n" + if $DEBUG; + my $dbh = DBI->connect( map { $part_export->option($_) } qw(datasrc username password) ) or die "can't connect to sqlradius database: ". $DBI::errstr; + warn "$mes connected to sqlradius database\n" + if $DEBUG; + #select a unix time conversion function based on database type my $str2time = str2time_sql( $dbh->{Driver}->{Name} ); my $username = $part_export->export_username($svc_x); my $query; + + warn "$mes finding closed sessions completely within the given range\n" + if $DEBUG; - #find closed sessions completely within the given range my $sth = $dbh->prepare("SELECT SUM(acctsessiontime) FROM radacct WHERE UserName = ? @@ -446,7 +512,10 @@ sub seconds_since_sqlradacct { $sth->execute($username, $start, $end) or die $sth->errstr; my $regular = $sth->fetchrow_arrayref->[0]; - #find open sessions which start in the range, count session start->range end + warn "$mes finding open sessions which start in the range\n" + if $DEBUG; + + # count session start->range end $query = "SELECT SUM( ? - $str2time AcctStartTime ) ) FROM radacct WHERE UserName = ? @@ -460,7 +529,9 @@ sub seconds_since_sqlradacct { or die $sth->errstr. " executing query $query"; my $start_during = $sth->fetchrow_arrayref->[0]; - #find closed sessions which start before the range but stop during, + warn "$mes finding closed sessions which start before the range but stop during\n" + if $DEBUG; + #count range start->session end $sth = $dbh->prepare("SELECT SUM( $str2time AcctStopTime ) - ? ) FROM radacct @@ -474,9 +545,11 @@ sub seconds_since_sqlradacct { $sth->execute($start, $username, $start, $start, $end ) or die $sth->errstr; my $end_during = $sth->fetchrow_arrayref->[0]; - #find closed (not anymore - or open) sessions which start before the range - # but stop after, or are still open, count range start->range end - # don't count open sessions (probably missing stop record) + warn "$mes finding closed sessions which start before the range but stop after\n" + if $DEBUG; + + # count range start->range end + # don't count open sessions anymore (probably missing stop record) $sth = $dbh->prepare("SELECT COUNT(*) FROM radacct WHERE UserName = ? @@ -491,6 +564,9 @@ sub seconds_since_sqlradacct { $seconds += $regular + $end_during + $start_during + $entire_range; + warn "$mes done finding sessions\n" + if $DEBUG; + } $seconds; @@ -510,6 +586,8 @@ for records where B is not "svc_acct". sub attribute_since_sqlradacct { my($self, $start, $end, $attrib) = @_; + my $mes = "$me attribute_since_sqlradacct:"; + my $svc_x = $self->svc_x; my @part_export = $self->part_svc->part_export_usage; @@ -524,15 +602,24 @@ sub attribute_since_sqlradacct { next if $part_export->option('ignore_accounting'); + warn "$mes connecting to sqlradius database\n" + if $DEBUG; + my $dbh = DBI->connect( map { $part_export->option($_) } qw(datasrc username password) ) or die "can't connect to sqlradius database: ". $DBI::errstr; + warn "$mes connected to sqlradius database\n" + if $DEBUG; + #select a unix time conversion function based on database type my $str2time = str2time_sql( $dbh->{Driver}->{Name} ); my $username = $part_export->export_username($svc_x); + warn "$mes SUMing $attrib sessions\n" + if $DEBUG; + my $sth = $dbh->prepare("SELECT SUM($attrib) FROM radacct WHERE UserName = ? @@ -544,6 +631,9 @@ sub attribute_since_sqlradacct { $sum += $sth->fetchrow_arrayref->[0]; + warn "$mes done SUMing sessions\n" + if $DEBUG; + } $sum; @@ -592,74 +682,35 @@ CDRs are associated with svc_phone services via svc_phone.phonenum sub get_cdrs_for_update { my($self, %options) = @_; - my $default_prefix = $options{'default_prefix'}; + my @fields = ( 'charged_party' ); + push @fields, 'src' unless $options{'disable_src'}; #CDRs are now associated with svc_phone services via svc_phone.phonenum #return () unless $self->svc_x->isa('FS::svc_phone'); return () unless $self->part_svc->svcdb eq 'svc_phone'; my $number = $self->svc_x->phonenum; - my @cdrs = - qsearch( { - 'table' => 'cdr', - 'hashref' => { 'freesidestatus' => '', - 'charged_party' => $number - }, - 'extra_sql' => 'FOR UPDATE', - } ); + my $prefix = $options{'default_prefix'}; - if ( length($default_prefix) ) { - push @cdrs, - qsearch( { - 'table' => 'cdr', - 'hashref' => { 'freesidestatus' => '', - 'charged_party' => "$default_prefix$number", - }, - 'extra_sql' => 'FOR UPDATE', - } ); + my @where = map " $_ = '$number' ", @fields; + push @where, map " $_ = '$prefix$number' ", @fields + if length($prefix); + if ( $prefix =~ /^\+(\d+)$/ ) { + push @where, map " $_ = '$1$number' ", @fields } - #astricon hack? config option? - push @cdrs, + my $extra_sql = ' AND ( '. join(' OR ', @where ). ' ) '; + + my @cdrs = qsearch( { - 'table' => 'cdr', - 'hashref' => { 'freesidestatus' => '', - 'src' => $number, - }, - 'extra_sql' => 'FOR UPDATE', - } ); - - if ( length($default_prefix) ) { - push @cdrs, - qsearch( { - 'table' => 'cdr', - 'hashref' => { 'freesidestatus' => '', - 'src' => "$default_prefix$number", - }, - 'extra_sql' => 'FOR UPDATE', - } ); - } + 'table' => 'cdr', + 'hashref' => { 'freesidestatus' => '', }, + 'extra_sql' => "$extra_sql FOR UPDATE", + } ); @cdrs; } -=item pkg_svc - -Returns the pkg_svc record for for this service, if applicable. - -=cut - -sub pkg_svc { - my $self = shift; - my $cust_pkg = $self->cust_pkg; - return undef unless $cust_pkg; - - qsearchs( 'pkg_svc', { 'svcpart' => $self->svcpart, - 'pkgpart' => $cust_pkg->pkgpart, - } - ); -} - =back =head1 BUGS