projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Default svcpart support for part_pkg. Fixes 'bug' with new customer and online signup.
[freeside.git]
/
httemplate
/
misc
/
cancel-unaudited.cgi
diff --git
a/httemplate/misc/cancel-unaudited.cgi
b/httemplate/misc/cancel-unaudited.cgi
index
5d3c873
..
f1fb153
100755
(executable)
--- a/
httemplate/misc/cancel-unaudited.cgi
+++ b/
httemplate/misc/cancel-unaudited.cgi
@@
-7,15
+7,18
@@
my($query) = $cgi->keywords;
$query =~ /^(\d+)$/;
my $svcnum = $1;
$query =~ /^(\d+)$/;
my $svcnum = $1;
-my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $svc_acct;
+
#
my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
+
#
die "Unknown svcnum!" unless $svc_acct;
my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
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';
&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{HUP} = 'IGNORE';
local $SIG{INT} = 'IGNORE';
local $SIG{QUIT} = 'IGNORE';
@@
-24,19
+27,16
@@
local $SIG{TSTP} = 'IGNORE';
local $FS::UID::AutoCommit = 0;
local $FS::UID::AutoCommit = 0;
-my $error = $svc_acct->cancel;
-&myeidiot($error) if $error;
-$error = $svc_acct->delete;
-&myeidiot($error) if $error;
-
-$error = $cust_svc->delete;
+my $error = $svc_x->cancel;
+$error ||= $svc_x->delete;
+$error ||= $cust_svc->delete;
if ( $error ) {
$dbh->rollback;
%>
<!-- mason kludge -->
<%
if ( $error ) {
$dbh->rollback;
%>
<!-- mason kludge -->
<%
- &eidiot(
@_
);
+ &eidiot(
$error
);
} else {
$dbh->commit or die $dbh->errstr;
} else {
$dbh->commit or die $dbh->errstr;