% if ($error) {
% $cgi->param('error', $error);
-% $cgi->redirect(popurl(3). $error_redirect. '?'. $cgi->query_string );
-% } elsif ( $action eq 'change' ) {
-
- <% header("Package changed") %>
- <SCRIPT TYPE="text/javascript">
- window.top.location.reload();
- </SCRIPT>
- </BODY>
- </HTML>
-
-% } elsif ( $action eq 'bulk' ) {
-<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum") %>
+% $cgi->redirect(popurl(3). 'edit/cust_pkg.cgi?'. $cgi->query_string );
% } else {
-% die "guru exception #5: action is neither change nor bulk!";
+<% $cgi->redirect(popurl(3). "view/cust_main.cgi?$custnum") %>
% }
<%init>
+use Data::Dumper;
+my $DEBUG = 0;
+my $curuser = $FS::CurrentUser::CurrentUser;
-my $error = '';
-
-#untaint custnum
-$cgi->param('custnum') =~ /^(\d+)$/;
-my $custnum = $1;
+die "access denied"
+ unless $curuser->access_right('Bulk change customer packages');
-my @remove_pkgnums = map {
- /^(\d+)$/ or die "Illegal remove_pkg value!";
- $1;
-} $cgi->param('remove_pkg');
+my $error = '';
+my %param = $cgi->Vars;
-my $curuser = $FS::CurrentUser::CurrentUser;
+my $custnum = $param{custnum};
+$error = "Invalid custnum ($custnum)" if $custnum =~ /\D/;
-my( $action, $error_redirect );
-my @pkgparts = ();
-if ( $cgi->param('new_pkgpart') =~ /^(\d+)$/ ) { #came from misc/change_pkg.cgi
+my $locationnum = $param{locationnum};
+$error = "Invalid locationnum ($locationnum)" if $locationnum =~ /\D/;
- $action = 'change';
- $error_redirect = "misc/change_pkg.cgi";
- @pkgparts = ($1);
+my @remove_pkgnum =
+ map { $_ =~ /remove_cust_pkg\[(\d+)\]/ ? $1 : () }
+ keys %param;
- die "access denied"
- unless $curuser->access_right('Change customer package');
+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;
-} else { #came from edit/cust_pkg.cgi
+ warn "k($k) param{k}($param{$k}) pkgpart($pkgpart) qty($qty)\n"
+ if $DEBUG;
- $action = 'bulk';
- $error_redirect = "edit/cust_pkg.cgi";
+ if ( $qty =~ /\D/ ) {
+ $error = "Invalid quantity $qty for pkgpart $pkgpart - please use a number";
+ last;
+ }
- die "access denied"
- unless $curuser->access_right('Bulk change customer packages');
+ next if $qty == 0;
- foreach my $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";
- last;
- }
- }
+ 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,\@pkgparts,\@remove_pkgnums);
+$error ||= FS::cust_pkg::order({
+ custnum => $custnum,
+ pkgparts => \@pkgparts,
+ remove_pkgnum => \@remove_pkgnum,
+ locationnum => $locationnum,
+});
</%init>