X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=circ%2Fwaitingreserves.pl;h=1ec6b2d3fa707c34e310d7383179f1465ba03cfd;hb=dbaefb626ce5c2022b647fc15e6d0a0d68fa0784;hp=128d1eb2a4ea9cc0dc79b0ae1db7f82084711eaf;hpb=b2138a7ec64dead316286df4a822bf89d051f4cb;p=koha_fer

diff --git a/circ/waitingreserves.pl b/circ/waitingreserves.pl
index 128d1eb2a4..1ec6b2d3fa 100755
--- a/circ/waitingreserves.pl
+++ b/circ/waitingreserves.pl
@@ -46,6 +46,7 @@ my $borrowernumber = $input->param('borrowernumber');
 my $fbr            = $input->param('fbr') || '';
 my $tbr            = $input->param('tbr') || '';
 my $all_branches   = $input->param('allbranches') || '';
+my $cancelall      = $input->param('cancelall');
 
 my $cancel;
 
@@ -62,42 +63,23 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 
 my $default = C4::Context->userenv->{'branch'};
 
+my $transfer_when_cancel_all = C4::Context->preference('TransferWhenCancelAllWaitingHolds');
+$template->param( TransferWhenCancelAllWaitingHolds => 1 ) if $transfer_when_cancel_all;
+
+my @cancel_result;
 # if we have a return from the form we launch the subroutine CancelReserve
 if ($item) {
-    my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber );
-    # if we have a result
-    if ($nextreservinfo) {
-        my $borrowerinfo = GetMemberDetails( $nextreservinfo );
-        my $iteminfo = GetBiblioFromItemNumber($item);
-        if ( $messages->{'transfert'} ) {
-            $template->param(
-                messagetransfert => $messages->{'transfert'},
-                branchname       => GetBranchName($messages->{'transfert'}),
-            );
-        }
-
-        $template->param(
-            message             => 1,
-            nextreservnumber    => $nextreservinfo,
-            nextreservsurname   => $borrowerinfo->{'surname'},
-            nextreservfirstname => $borrowerinfo->{'firstname'},
-            nextreservitem      => $item,
-            nextreservtitle     => $iteminfo->{'title'},
-            waiting             => ($messages->{'waiting'}) ? 1 : 0,
-        );
-    }
-
-# 	if the document is not in his homebranch location and there is not reservation after, we transfer it
-    if ($fbr ne $tbr  and not $nextreservinfo) {
-        ModItemTransfer( $item, $fbr, $tbr );
-    }
+    my $res = cancel( $item, $borrowernumber, $fbr, $tbr );
+    push @cancel_result, $res if $res;
 }
-if ( C4::Context->preference('IndependantBranches') ) {
+
+if ( C4::Context->preference('IndependentBranches') ) {
     undef $all_branches;
 } else {
-    $template->param( all_branches_link => $input->url . '?allbranches=1&' . $input->query_string )
+    $template->param( all_branches_link => $input->url . '?allbranches=1' )
       unless $all_branches;
 }
+$template->param( all_branches => 1 ) if $all_branches;
 
 my (@reservloop, @overloop);
 my ($reservcount, $overcount);
@@ -107,8 +89,18 @@ my @getreserves = $all_branches ? GetReservesForBranch() : GetReservesForBranch(
 my $today = Date_to_Days(&Today);
 foreach my $num (@getreserves) {
     next unless ($num->{'waitingdate'} && $num->{'waitingdate'} ne '0000-00-00');
-    my %getreserv;
-    my $gettitle     = GetBiblioFromItemNumber( $num->{'itemnumber'} );
+
+    my $itemnumber = $num->{'itemnumber'};
+    my $gettitle     = GetBiblioFromItemNumber( $itemnumber );
+    my $borrowernum = $num->{'borrowernumber'};
+    my $holdingbranch = $gettitle->{'holdingbranch'};
+    my $homebranch = $gettitle->{'homebranch'};
+
+    my %getreserv = (
+        itemnumber => $itemnumber,
+        borrowernum => $borrowernum,
+    );
+
     # fix up item type for display
     $gettitle->{'itemtype'} = C4::Context->preference('item-level_itypes') ? $gettitle->{'itype'} : $gettitle->{'itemtype'};
     my $getborrower = GetMember(borrowernumber => $num->{'borrowernumber'});
@@ -122,17 +114,17 @@ foreach my $num (@getreserves) {
 
     $getreserv{'itemtype'}       = $itemtypeinfo->{'description'};
     $getreserv{'title'}          = $gettitle->{'title'};
-    $getreserv{'itemnumber'}     = $gettitle->{'itemnumber'};
     $getreserv{'biblionumber'}   = $gettitle->{'biblionumber'};
     $getreserv{'barcode'}        = $gettitle->{'barcode'};
     $getreserv{'branchname'}     = GetBranchName($gettitle->{'homebranch'});
     $getreserv{'homebranch'}     = $gettitle->{'homebranch'};
     $getreserv{'holdingbranch'}  = $gettitle->{'holdingbranch'};
     $getreserv{'itemcallnumber'} = $gettitle->{'itemcallnumber'};
-    if ( $gettitle->{'homebranch'} ne $gettitle->{'holdingbranch'} ) {
+    $getreserv{'enumchron'}      = $gettitle->{'enumchron'};
+    $getreserv{'copynumber'}     = $gettitle->{'copynumber'};
+    if ( $homebranch ne $holdingbranch ) {
         $getreserv{'dotransfer'} = 1;
     }
-    $getreserv{'borrowernum'}       = $getborrower->{'borrowernumber'};
     $getreserv{'borrowername'}      = $getborrower->{'surname'};
     $getreserv{'borrowerfirstname'} = $getborrower->{'firstname'};
     $getreserv{'borrowerphone'}     = $getborrower->{'phone'};
@@ -141,8 +133,14 @@ foreach my $num (@getreserves) {
     }
  
     if ($today > $calcDate) {
-        push @overloop,   \%getreserv;
-        $overcount++;
+        if ($cancelall) {
+            my $res = cancel( $itemnumber, $borrowernum, $holdingbranch, $homebranch, !$transfer_when_cancel_all );
+            push @cancel_result, $res if $res;
+            next;
+        } else {
+            push @overloop,   \%getreserv;
+            $overcount++;
+        }
     }else{
         push @reservloop, \%getreserv;
         $reservcount++;
@@ -150,14 +148,57 @@ foreach my $num (@getreserves) {
     
 }
 
+$template->param(cancel_result => \@cancel_result) if @cancel_result;
 $template->param(
     reserveloop => \@reservloop,
     reservecount => $reservcount,
     overloop    => \@overloop,
     overcount   => $overcount,
     show_date   => format_date(C4::Dates->today('iso')),
-    dateformat  => C4::Context->preference("dateformat"),
     ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
 );
 
-output_html_with_http_headers $input, $cookie, $template->output;
+if ($cancelall) {
+    print $input->redirect("/cgi-bin/koha/circ/waitingreserves.pl");
+} else {
+    output_html_with_http_headers $input, $cookie, $template->output;
+}
+
+exit;
+
+sub cancel {
+    my ($item, $borrowernumber, $fbr, $tbr, $skip_transfers ) = @_;
+
+    my $transfer = $fbr ne $tbr; # XXX && !$nextreservinfo;
+
+    return if $transfer && $skip_transfers;
+
+    my ( $messages, $nextreservinfo ) = ModReserveCancelAll( $item, $borrowernumber );
+
+# 	if the document is not in his homebranch location and there is not reservation after, we transfer it
+    if ($transfer && !$nextreservinfo) {
+        ModItemTransfer( $item, $fbr, $tbr );
+    }
+    # if we have a result
+    if ($nextreservinfo) {
+        my %res;
+        my $borrowerinfo = GetMemberDetails( $nextreservinfo );
+        my $iteminfo = GetBiblioFromItemNumber($item);
+        if ( $messages->{'transfert'} ) {
+            $res{messagetransfert} = $messages->{'transfert'};
+            $res{branchname}       = GetBranchName($messages->{'transfert'});
+        }
+
+        $res{message}             = 1;
+        $res{nextreservnumber}    = $nextreservinfo;
+        $res{nextreservsurname}   = $borrowerinfo->{'surname'};
+        $res{nextreservfirstname} = $borrowerinfo->{'firstname'};
+        $res{nextreservitem}      = $item;
+        $res{nextreservtitle}     = $iteminfo->{'title'};
+        $res{waiting}             = $messages->{'waiting'} ? 1 : 0;
+
+        return \%res;
+    }
+
+    return;
+}