X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=FS%2FFS%2Fcust_svc.pm;h=381b97f14dd584cc3d3a8274727b6a185d4f79d7;hb=c545a57d21341c49674defed65a4243f07b5ebaf;hp=81d7b178e0069338e4b68f2915c22086a1d334ca;hpb=5a322e9cf2be599b4c6bcf3959178506dd5992be;p=freeside.git diff --git a/FS/FS/cust_svc.pm b/FS/FS/cust_svc.pm index 81d7b178e..381b97f14 100644 --- a/FS/FS/cust_svc.pm +++ b/FS/FS/cust_svc.pm @@ -4,7 +4,7 @@ use strict; use vars qw( @ISA $DEBUG $me $ignore_quantity ); use Carp; use FS::Conf; -use FS::Record qw( qsearch qsearchs dbh ); +use FS::Record qw( qsearch qsearchs dbh str2time_sql ); use FS::cust_pkg; use FS::part_pkg; use FS::part_svc; @@ -132,22 +132,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; @@ -321,6 +329,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 +392,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 @@ -428,17 +478,8 @@ sub seconds_since_sqlradacct { 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 $str2time = str2time_sql( $dbh->{Driver}->{Name} ); + my $username = $part_export->export_username($svc_x); my $query; @@ -538,16 +579,7 @@ sub attribute_since_sqlradacct { 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 $str2time = str2time_sql( $dbh->{Driver}->{Name} ); my $username = $part_export->export_username($svc_x); @@ -603,59 +635,40 @@ sub get_session_history { Returns (and SELECTs "FOR UPDATE") all unprocessed (freesidestatus NULL) CDR objects (see L) associated with this service. -Currently CDRs are associated with svc_acct services via a DID in the -username. This part is rather tenative and still subject to change... +CDRs are associated with svc_phone services via svc_phone.phonenum =cut 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 } - @cdrs; -} + my $extra_sql = ' AND ( '. join(' OR ', @where ). ' ) '; -=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; + my @cdrs = + qsearch( { + 'table' => 'cdr', + 'hashref' => { 'freesidestatus' => '', }, + 'extra_sql' => "$extra_sql FOR UPDATE", + } ); - qsearchs( 'pkg_svc', { 'svcpart' => $self->svcpart, - 'pkgpart' => $cust_pkg->pkgpart, - } - ); + @cdrs; } =back