projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
skip RT sessions table
[freeside.git]
/
httemplate
/
misc
/
cust_main-unsuspend.cgi
diff --git
a/httemplate/misc/cust_main-unsuspend.cgi
b/httemplate/misc/cust_main-unsuspend.cgi
index
eb4a2c8
..
5826027
100755
(executable)
--- a/
httemplate/misc/cust_main-unsuspend.cgi
+++ b/
httemplate/misc/cust_main-unsuspend.cgi
@@
-1,9
+1,4
@@
-<& /elements/header-popup.html, mt("Customer unsuspended") &>
- <SCRIPT TYPE="text/javascript">
- window.top.location.reload();
- </SCRIPT>
- </BODY>
-</HTML>
+<& /elements/popup-topreload.html, mt("Customer unsuspended") &>
<%init>
#false laziness w/cust_main-cancel.cgi
<%init>
#false laziness w/cust_main-cancel.cgi
@@
-34,6
+29,10
@@
if($cgi->param('now_or_later')) {
if($resume) {
#warn "setting resume dates on custnum#$custnum\n";
my @pkgs = $cust_main->suspended_pkgs;
if($resume) {
#warn "setting resume dates on custnum#$custnum\n";
my @pkgs = $cust_main->suspended_pkgs;
+ if (!$cgi->param('release_hold')) {
+ # then avoid packages that are on hold
+ @pkgs = grep { $_->get('setup') } @pkgs;
+ }
@errors = grep {$_} map { $_->unsuspend(
'date' => $resume,
) } @pkgs;
@errors = grep {$_} map { $_->unsuspend(
'date' => $resume,
) } @pkgs;
@@
-42,9
+41,13
@@
if($cgi->param('now_or_later')) {
@errors = ("error parsing adjourn date: ".$cgi->param('adjourn'));
}
}
@errors = ("error parsing adjourn date: ".$cgi->param('adjourn'));
}
}
-else {
+else {
# unsuspending now
warn "unsuspending $cust_main";
@errors = $cust_main->unsuspend;
warn "unsuspending $cust_main";
@errors = $cust_main->unsuspend;
+
+ if ( $cgi->param('release_hold') ) {
+ push @errors, $cust_main->release_hold;
+ }
}
my $error = join(' / ', @errors) if scalar(@errors);
}
my $error = join(' / ', @errors) if scalar(@errors);