X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fedit%2Fprocess%2Fcust_pkg.cgi;h=82a9e23753800c134388e4a2e2f819a8eae93d15;hp=ecaec9bcbe3d4d76fcb36ba5bd075138e225f7ac;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hpb=3d671921441ba8422650b54435a1959ad1d4c71d

diff --git a/httemplate/edit/process/cust_pkg.cgi b/httemplate/edit/process/cust_pkg.cgi
index ecaec9bcb..82a9e2375 100755
--- a/httemplate/edit/process/cust_pkg.cgi
+++ b/httemplate/edit/process/cust_pkg.cgi
@@ -1,46 +1,65 @@
-<%
-#<!-- $Id: cust_pkg.cgi,v 1.2 2001-08-21 02:31:56 ivan Exp $ -->
-
-use strict;
-use vars qw( $cgi $custnum @remove_pkgnums @pkgparts $pkgpart $error );
-use CGI;
-use CGI::Carp qw(fatalsToBrowser);
-use FS::UID qw(cgisuidsetup);
-use FS::CGI qw(popurl);
-use FS::cust_pkg;
-
-$cgi = new CGI; # create form object
-&cgisuidsetup($cgi);
-$error = '';
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/;
-$custnum = $1;
-
-@remove_pkgnums = map {
-  /^(\d+)$/ or die "Illegal remove_pkg value!";
-  $1;
-} $cgi->param('remove_pkg');
-
-foreach $pkgpart ( map /^pkg(\d+)$/ ? $1 : (), $cgi->param ) {
-  if ( $cgi->param("pkg$pkgpart") =~ /^(\d+)$/ ) {
-    my $num_pkgs = $1;
-    while ( $num_pkgs-- ) {
-      push @pkgparts,$pkgpart;
-    }
-  } else {
-    $error = "Illegal quantity";
+% if ($error) {
+%   $cgi->param('error', $error);
+%   $cgi->redirect(popurl(3). 'edit/cust_pkg.cgi?'. $cgi->query_string );
+% } else {
+<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum") %>
+% }
+<%init>
+use Data::Dumper;
+my $DEBUG = 0;
+my $curuser = $FS::CurrentUser::CurrentUser;
+
+die "access denied"
+  unless $curuser->access_right('Bulk change customer packages');
+
+my $error = '';
+my %param = $cgi->Vars;
+
+my $custnum = $param{custnum};
+$error = "Invalid custnum ($custnum)" if $custnum =~ /\D/;
+
+my $locationnum = $param{locationnum};
+$error = "Invalid locationnum ($locationnum)" if $locationnum =~ /\D/;
+
+my @remove_pkgnum =
+  map { $_ =~ /remove_cust_pkg\[(\d+)\]/ ? $1 : () }
+  keys %param;
+
+my @pkgparts;
+for my $k ( keys %param ) {
+  next unless $k =~ /qty_part_pkg\[(\d+)\]/;
+  my $pkgpart = $1;
+  my $qty     = $param{$k};
+  $qty =~ s/(^\s+|\s+$)//g;
+
+  warn "k($k) param{k}($param{$k}) pkgpart($pkgpart) qty($qty)\n"
+    if $DEBUG;
+
+  if ( $qty =~ /\D/ ) {
+    $error = "Invalid quantity $qty for pkgpart $pkgpart - please use a number";
     last;
   }
-}
 
-$error ||= FS::cust_pkg::order($custnum,\@pkgparts,\@remove_pkgnums);
+  next if $qty == 0;
 
-if ($error) {
-  $cgi->param('error', $error);
-  print $cgi->redirect(popurl(2). "cust_pkg.cgi?". $cgi->query_string );
-} else {
-  print $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum");
+  push ( @pkgparts, $pkgpart ) for ( 1..$qty );
 }
 
-%>
+if ( $DEBUG ) {
+  warn Dumper({
+    custnum       => $custnum,
+    locationnum   => $locationnum,
+    remove_pkgnum => \@remove_pkgnum,
+    pkgparts      => \@pkgparts,
+    param         => \%param,
+  });
+}
+
+$error ||= FS::cust_pkg::order({
+  custnum       => $custnum,
+  pkgparts      => \@pkgparts,
+  remove_pkgnum => \@remove_pkgnum,
+  locationnum   => $locationnum,
+});
+
+</%init>