add a domain pulldown to svc_acct linking, closes: Bug#277 / prevent "stealing" servi...

[freeside.git] / httemplate / misc / cancel-unaudited.cgi

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index f1fb153..43e439b 100755 (executable)
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -12,35 +12,22 @@ my $svcnum = $1;
 
 my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
 die "Unknown svcnum!" unless $cust_svc;
-&eidiot(qq!This account has already been audited.  Cancel the 
-    <A HREF="!. popurl(2). qq!view/cust_pkg.cgi?! . $cust_svc->getfield('pkgnum') .
-    qq!pkgnum"> package</A> instead.!) 
-  if $cust_svc->pkgnum ne '' && $cust_svc->pkgnum ne '0';
-
-my $svc_x = $cust_svc->svc_x;
-
-local $SIG{HUP} = 'IGNORE';
-local $SIG{INT} = 'IGNORE';
-local $SIG{QUIT} = 'IGNORE';
-local $SIG{TERM} = 'IGNORE';
-local $SIG{TSTP} = 'IGNORE';
-
-local $FS::UID::AutoCommit = 0;
+my $cust_pkg = $cust_svc->cust_pkg;
+if ( $cust_pkg ) {
+  &eidiot( 'This account has already been audited.  Cancel the '.
+           qq!<A HREF="${p}view/cust_main.cgi?!. $cust_pkg->custnum.
+           '#cust_pkg'. $cust_pkg->pkgnum. '">'.
+           'package</A> instead.');
+}
 
-my $error = $svc_x->cancel;
-$error ||= $svc_x->delete;
-$error ||= $cust_svc->delete;
+my $error = $cust_svc->cancel;
 
 if ( $error ) {
-  $dbh->rollback;
   %>
 <!-- mason kludge -->
 <%
   &eidiot($error);
 } else {
-
-  $dbh->commit or die $dbh->errstr;
-
   print $cgi->redirect(popurl(2));
 }