$findborrower =~ s|,| |g;
my $borrowernumber_hold = $input->param('borrowernumber') || '';
my $messageborrower;
-my $warnings;
-my $messages;
+my $maxreserves;
my $date = C4::Dates->today('iso');
my $action = $input->param('action');
if ( $action eq 'move' ) {
my $where = $input->param('where');
- my $borrowernumber = $input->param('borrowernumber');
- my $biblionumber = $input->param('biblionumber');
- AlterPriority( $where, $borrowernumber, $biblionumber );
+ my $reserve_id = $input->param('reserve_id');
+ AlterPriority( $where, $reserve_id );
} elsif ( $action eq 'cancel' ) {
- my $borrowernumber = $input->param('borrowernumber');
- my $biblionumber = $input->param('biblionumber');
- CancelReserve( $biblionumber, '', $borrowernumber );
+ my $reserve_id = $input->param('reserve_id');
+ CancelReserve({ reserve_id => $reserve_id });
} elsif ( $action eq 'setLowestPriority' ) {
- my $borrowernumber = $input->param('borrowernumber');
- my $biblionumber = $input->param('biblionumber');
- ToggleLowestPriority( $borrowernumber, $biblionumber );
+ my $reserve_id = $input->param('reserve_id');
+ ToggleLowestPriority( $reserve_id );
} elsif ( $action eq 'toggleSuspend' ) {
- my $borrowernumber = $input->param('borrowernumber');
- my $biblionumber = $input->param('biblionumber');
+ my $reserve_id = $input->param('reserve_id');
my $suspend_until = $input->param('suspend_until');
- ToggleSuspend( $borrowernumber, $biblionumber, $suspend_until );
+ ToggleSuspend( $reserve_id, $suspend_until );
}
if ($findborrower) {
my $diffbranch;
my @getreservloop;
my $count_reserv = 0;
- my $maxreserves;
# we check the reserves of the borrower, and if he can reserv a document
# FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ...
GetReserveCount( $borrowerinfo->{'borrowernumber'} );
if ( C4::Context->preference('maxreserves') && ($number_reserves >= C4::Context->preference('maxreserves')) ) {
- $warnings = 1;
$maxreserves = 1;
}
my $expiry = 0; # flag set if patron account has expired
if ($expiry_date and $expiry_date ne '0000-00-00' and
Date_to_Days(split /-/,$date) > Date_to_Days(split /-/,$expiry_date)) {
- $messages = $expiry = 1;
+ $expiry = 1;
}
# check if the borrower make the reserv in a different branch
if ( $borrowerinfo->{'branchcode'} ne C4::Context->userenv->{'branch'} ) {
- $messages = 1;
$diffbranch = 1;
}
borrowercategory => $borrowerinfo->{'category'},
borrowerreservs => $count_reserv,
cardnumber => $borrowerinfo->{'cardnumber'},
- maxreserves => $maxreserves,
expiry => $expiry,
diffbranch => $diffbranch,
- messages => $messages,
- warnings => $warnings
);
}
foreach my $biblionumber (@biblionumbers) {
my %biblioloopiter = ();
- my $maxreserves;
- my $dat = GetBiblioData($biblionumber);
+ my $dat = GetBiblioData($biblionumber);
unless ( CanBookBeReserved($borrowerinfo->{borrowernumber}, $biblionumber) ) {
- $warnings = 1;
$maxreserves = 1;
}
my $alreadypossession;
if (not C4::Context->preference('AllowHoldsOnPatronsPossessions') and CheckIfIssuedToPatron($borrowerinfo->{borrowernumber},$biblionumber)) {
- $warnings = 1;
$alreadypossession = 1;
}
# get existing reserves .....
my ( $count, $reserves ) = GetReservesFromBiblionumber($biblionumber,1);
my $totalcount = $count;
- my $alreadyreserved;
+ my $holds_count = 0;
+ my $alreadyreserved = 0;
foreach my $res (@$reserves) {
if ( defined $res->{found} && $res->{found} eq 'W' ) {
$count--;
}
- if ( defined $borrowerinfo && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {
- $warnings = 1;
+ if ( defined $borrowerinfo && defined($borrowerinfo->{borrowernumber}) && ($borrowerinfo->{borrowernumber} eq $res->{borrowernumber}) ) {
+ $holds_count++;
+ }
+ }
+
+ if ( $holds_count ) {
$alreadyreserved = 1;
$biblioloopiter{warn} = 1;
$biblioloopiter{alreadyres} = 1;
- }
}
- $template->param( alreadyreserved => $alreadyreserved,
- messages => $messages,
- warnings => $warnings,
- maxreserves=>$maxreserves,
- alreadypossession => $alreadypossession,
- );
-
+ $template->param(
+ alreadyreserved => $alreadyreserved,
+ alreadypossession => $alreadypossession,
+ );
# FIXME think @optionloop, is maybe obsolete, or must be switchable by a systeme preference fixed rank or not
# make priorities options
if (my $items = get_itemnumbers_of($biblionumber)->{$biblionumber}){
@itemnumbers = @$items;
}
- my @hostitems = get_hostitemnumbers_of($biblionumber);
- if (@hostitems){
- $template->param('hostitemsflag' => 1);
- push(@itemnumbers, @hostitems);
- }
+ my @hostitems = get_hostitemnumbers_of($biblionumber);
+ if (@hostitems){
+ $template->param('hostitemsflag' => 1);
+ push(@itemnumbers, @hostitems);
+ }
if (!@itemnumbers) {
$template->param('noitems' => 1);
}
# checking reserve
- my ($reservedate,$reservedfor,$expectedAt) = GetReservesFromItemnumber($itemnumber);
+ my ($reservedate,$reservedfor,$expectedAt,$reserve_id) = GetReservesFromItemnumber($itemnumber);
my $ItemBorrowerReserveInfo = GetMember( borrowernumber => $reservedfor );
if ( defined $reservedate ) {
$template->param( override_required => 1 );
} elsif ( $num_available == 0 ) {
$template->param( none_available => 1 );
- $template->param( warnings => 1 );
$biblioloopiter{warn} = 1;
$biblioloopiter{none_avail} = 1;
}
);
}
- if ( defined $res->{'found'} && $res->{'found'} eq 'W' || $res->{'found'} eq 'T' ) {
+ if ( defined $res->{'found'} && ($res->{'found'} eq 'W' || $res->{'found'} eq 'T' )) {
my $item = $res->{'itemnumber'};
$item = GetBiblioFromItemNumber($item,undef);
$reserve{'wait'}= 1;
$reserve{'optionloop'} = \@optionloop;
$reserve{'suspend'} = $res->{'suspend'};
$reserve{'suspend_until'} = $res->{'suspend_until'};
+ $reserve{'reserve_id'} = $res->{'reserve_id'};
if ( C4::Context->preference('IndependentBranches') && $flags->{'superlibrarian'} != 1 ) {
$reserve{'branchloop'} = [ GetBranchDetail($res->{'branchcode'}) ];
$template->param( biblioloop => \@biblioloop );
$template->param( biblionumbers => $biblionumbers );
+$template->param( maxreserves => $maxreserves );
if ($multihold) {
$template->param( multi_hold => 1 );