print error message for failed cancels!

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

diff --git a/httemplate/misc/cancel-unaudited.cgi b/httemplate/misc/cancel-unaudited.cgi
index a73b2ce..ecfaef2 100755 (executable)
--- a/httemplate/misc/cancel-unaudited.cgi
+++ b/httemplate/misc/cancel-unaudited.cgi
@@ -25,20 +25,20 @@ local $SIG{TSTP} = 'IGNORE';
 local $FS::UID::AutoCommit = 0;
 
 my $error = $svc_acct->cancel;
-&myeidiot($error) if $error;
-$error = $svc_acct->delete;
-&myeidiot($error) if $error;
+$error ||= $svc_acct->delete;
+$error ||= $cust_svc->delete;
 
-$error = $cust_svc->delete;
-&myeidiot($error) if $error;
-
-$dbh->commit or die $dbh->errstr;
+if ( $error ) {
+  $dbh->rollback;
+  %>
+<!-- mason kludge -->
+<%
+  &eidiot($error);
+} else {
 
-print $cgi->redirect(popurl(2));
+  $dbh->commit or die $dbh->errstr;
 
-sub myeidiot {
-  $dbh->rollback;
-  &eidiot(@_);
+  print $cgi->redirect(popurl(2));
 }
 
 %>