From 1956c88fd50741fce96fb50e6c12dd62191afd20 Mon Sep 17 00:00:00 2001 From: ivan Date: Tue, 26 Jan 2010 10:40:32 +0000 Subject: [PATCH] deleting an svc_pbx unlinks svc_phones and deletes svc_accts, RT#7051 --- FS/FS/svc_pbx.pm | 41 +++++++++++++++++++++++++++++++++++++---- 1 file changed, 37 insertions(+), 4 deletions(-) diff --git a/FS/FS/svc_pbx.pm b/FS/FS/svc_pbx.pm index 37c7bb719..6ae04189c 100644 --- a/FS/FS/svc_pbx.pm +++ b/FS/FS/svc_pbx.pm @@ -2,8 +2,10 @@ package FS::svc_pbx; use strict; use base qw( FS::svc_External_Common ); -use FS::Record qw( qsearchs ); # qsearch ); +use FS::Record qw( qsearch qsearchs dbh ); use FS::cust_svc; +use FS::svc_phone; +use FS::svc_acct; =head1 NAME @@ -157,11 +159,42 @@ Delete this record from the database. sub delete { my $self = shift; - my $error; - $error = $self->SUPER::delete; - return $error if $error; + local $SIG{HUP} = 'IGNORE'; + local $SIG{INT} = 'IGNORE'; + local $SIG{QUIT} = 'IGNORE'; + local $SIG{TERM} = 'IGNORE'; + local $SIG{TSTP} = 'IGNORE'; + local $SIG{PIPE} = 'IGNORE'; + + my $oldAutoCommit = $FS::UID::AutoCommit; + local $FS::UID::AutoCommit = 0; + my $dbh = dbh; + + foreach my $svc_phone (qsearch('svc_phone', { 'pbxsvc' => $self->svcnum } )) { + $svc_phone->pbxsvc(''); + my $error = $svc_phone->replace; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + foreach my $svc_acct (qsearch('svc_acct', { 'pbxsvc' => $self->svcnum } )) { + my $error = $svc_acct->delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + } + + my $error = $self->SUPER::delete; + if ( $error ) { + $dbh->rollback if $oldAutoCommit; + return $error; + } + $dbh->commit or die $dbh->errstr if $oldAutoCommit; ''; } -- 2.11.0