summary display of bulk packages with many services, RT#9821

1 files changed, 22 insertions, 10 deletions

diff --git a/httemplate/misc/unprovision.cgi b/httemplate/misc/unprovision.cgi
index 4ab15fdc0..6f2c23815 100755
--- a/httemplate/misc/unprovision.cgi
+++ b/httemplate/misc/unprovision.cgi
@@ -1,6 +1,8 @@
 %if ( $error ) {
 %  errorpage($error);
-%} else {
+%} elsif ( $pkgnum ) {
+<% $cgi->redirect(popurl(2)."search/cust_pkg_svc.html?svcpart=$svcpart;pkgnum=$pkgnum") %>
+%} else { # $custnum should always exist
 <% $cgi->redirect(popurl(2)."view/cust_main.cgi?$custnum") %>
 %}
 <%init>
@@ -9,18 +11,28 @@ die "access denied"
   unless $FS::CurrentUser::CurrentUser->access_right('Unprovision customer service');
 
 #untaint svcnum
-my($query) = $cgi->keywords;
-$query =~ /^(\d+)$/;
-my $svcnum = $1;
+my @svcnums;
+my ($pkgnum, $svcpart, $custnum);
+if( $cgi->param('svcnum') ) {
+  @svcnums = grep { $_ } map { /^(\d+)$/ && $1 } $cgi->param('svcnum');
+  $pkgnum = $cgi->param('pkgnum');
+  $svcpart = $cgi->param('svcpart');
+  $custnum = $cgi->param('custnum');
+}
+else {
+  @svcnums = map { /^(\d+)$/ && $1 } $cgi->keywords;
+}
 
-#my $svc_acct = qsearchs('svc_acct',{'svcnum'=>$svcnum});
-#die "Unknown svcnum!" unless $svc_acct;
+my $error = '';
+foreach my $svcnum (@svcnums) {
 
-my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
-die "Unknown svcnum!" unless $cust_svc;
+  my $cust_svc = qsearchs('cust_svc',{'svcnum'=>$svcnum});
+  die "Unknown svcnum!" unless $cust_svc;
 
-my $custnum = $cust_svc->cust_pkg->custnum;
+  $custnum ||= $cust_svc->cust_pkg->custnum;
 
-my $error = $cust_svc->cancel;
+  $error .= $cust_svc->cancel;
+
+}
 
 </%init>