X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-reserve.pl;h=aeb88ca0360e9c9754523b55f905db33d9e837a4;hb=31c29fd31f557306233e6a2936148a5bb10b89a1;hp=bf50f366a3ab6da097ce7aa7b2d86c7390f4a42d;hpb=2b90ea2cb0e5e976de7ddef0151ae83d8ac578e6;p=koha.git diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl index bf50f366a3..aeb88ca036 100755 --- a/opac/opac-reserve.pl +++ b/opac/opac-reserve.pl @@ -32,8 +32,11 @@ use C4::Context; use C4::Members; use C4::Overdues; use C4::Debug; + use Koha::AuthorisedValues; +use Koha::Biblios; use Koha::DateUtils; +use Koha::IssuingRules; use Koha::Items; use Koha::ItemTypes; use Koha::Checkouts; @@ -98,7 +101,7 @@ if ( $patron->category->effective_BlockExpiredPatronOpacActions ) { # Pass through any reserve charge my $reservefee = $patron->category->reservefee; if ( $reservefee > 0){ - $template->param( RESERVE_CHARGE => sprintf("%.2f",$reservefee)); + $template->param( RESERVE_CHARGE => $reservefee); } my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } }; @@ -137,11 +140,6 @@ if (($#biblionumbers < 0) && (! $query->param('place_reserve'))) { my $branch = $query->param('branch') || $patron->branchcode || C4::Context->userenv->{branch} || '' ; $template->param( branch => $branch ); -# Is the person allowed to choose their branch -my $OPACChooseBranch = (C4::Context->preference("OPACAllowUserToChooseBranch")) ? 1 : 0; - -$template->param( choose_branch => $OPACChooseBranch); - # # # Build hashes of the requested biblio(item)s and items. @@ -157,7 +155,7 @@ foreach my $biblioNumber (@biblionumbers) { my @itemInfos = GetItemsInfo($biblioNumber); - my $marcrecord= GetMarcBiblio($biblioNumber); + my $marcrecord= GetMarcBiblio({ biblionumber => $biblioNumber }); # flag indicating existence of at least one item linked via a host record my $hostitemsflag; @@ -175,6 +173,7 @@ foreach my $biblioNumber (@biblionumbers) { # Compute the priority rank. my $biblio = Koha::Biblios->find( $biblioNumber ); + $biblioData->{object} = $biblio; my $holds = $biblio->holds; my $rank = $holds->count; $biblioData->{reservecount} = 1; # new reserve @@ -237,7 +236,7 @@ if ( $query->param('place_reserve') ) { my $canreserve = 0; my $singleBranchMode = Koha::Libraries->search->count == 1; - if ( $singleBranchMode || !$OPACChooseBranch ) + if ( $singleBranchMode || ! C4::Context->preference("OPACAllowUserToChooseBranch") ) { # single branch mode or disabled user choosing $branch = $patron->branchcode; } @@ -264,20 +263,12 @@ if ( $query->param('place_reserve') ) { my $expiration_date = $query->param("expiration_date_$biblioNum"); - # If a specific item was selected and the pickup branch is the same as the - # holdingbranch, force the value $rank and $found. my $rank = $biblioData->{rank}; if ( $itemNum ne '' ) { - $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum ) eq 'OK'; - $rank = '0' unless C4::Context->preference('ReservesNeedReturns'); - my $item = GetItem($itemNum); - if ( $item->{'holdingbranch'} eq $branch ) { - $found = 'W' - unless C4::Context->preference('ReservesNeedReturns'); - } + $canreserve = 1 if CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK'; } else { - $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum ) eq 'OK'; + $canreserve = 1 if CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK'; # Inserts a null into the 'itemnumber' field of 'reserves' table. $itemNum = undef; @@ -327,7 +318,7 @@ if ( $query->param('place_reserve') ) { my $noreserves = 0; my $maxoutstanding = C4::Context->preference("maxoutstanding"); $template->param( noreserve => 1 ) unless $maxoutstanding; -my ( $amountoutstanding ) = GetMemberAccountRecords($borrowernumber); +my $amountoutstanding = $patron->account->balance; if ( $amountoutstanding && ($amountoutstanding > $maxoutstanding) ) { my $amount = sprintf "%.02f", $amountoutstanding; $template->param( message => 1 ); @@ -392,14 +383,15 @@ unless ($noreserves) { my $biblioLoop = []; my $numBibsAvailable = 0; my $itemdata_enumchron = 0; +my $itemdata_ccode = 0; my $anyholdable = 0; my $itemLevelTypes = C4::Context->preference('item-level_itypes'); +my $pickup_locations = Koha::Libraries->search({ pickup_location => 1 }); $template->param('item_level_itypes' => $itemLevelTypes); foreach my $biblioNum (@biblionumbers) { - my @not_available_at = (); - my $record = GetMarcBiblio($biblioNum); + my $record = GetMarcBiblio({ biblionumber => $biblioNum }); # Init the bib item with the choices for branch pickup my %biblioLoopIter; @@ -410,6 +402,12 @@ foreach my $biblioNum (@biblionumbers) { &get_out($query, $cookie, $template->output); } + my @not_available_at = (); + my $biblio = $biblioData->{object}; + foreach my $library ( $pickup_locations->as_list ) { + push( @not_available_at, $library->branchcode ) unless $biblio->can_be_transferred({ to => $library }); + } + my $frameworkcode = GetFrameworkCode( $biblioData->{biblionumber} ); $biblioLoopIter{biblionumber} = $biblioData->{biblionumber}; $biblioLoopIter{title} = $biblioData->{title}; @@ -444,6 +442,7 @@ foreach my $biblioNum (@biblionumbers) { my $numCopiesOPACAvailable = 0; foreach my $itemInfo (@{$biblioData->{itemInfos}}) { my $itemNum = $itemInfo->{itemnumber}; + my $item = Koha::Items->find( $itemNum ); my $itemLoopIter = {}; $itemLoopIter->{itemnumber} = $itemNum; @@ -451,6 +450,7 @@ foreach my $biblioNum (@biblionumbers) { $itemLoopIter->{homeBranchName} = $itemInfo->{homebranch}; $itemLoopIter->{callNumber} = $itemInfo->{itemcallnumber}; $itemLoopIter->{enumchron} = $itemInfo->{enumchron}; + $itemLoopIter->{ccode} = $itemInfo->{ccode}; $itemLoopIter->{copynumber} = $itemInfo->{copynumber}; if ($itemLevelTypes) { $itemLoopIter->{translated_description} = $itemInfo->{translated_description}; @@ -473,16 +473,11 @@ foreach my $biblioNum (@biblionumbers) { } # checking reserve - my $item = Koha::Items->find( $itemNum ); my $holds = $item->current_holds; if ( my $first_hold = $holds->next ) { - my $patron = Koha::Patrons->find( $first_hold->borrowernumber ); $itemLoopIter->{backgroundcolor} = 'reserved'; $itemLoopIter->{reservedate} = output_pref({ dt => dt_from_string($first_hold->reservedate), dateonly => 1 }); # FIXME Should be formatted in the template - $itemLoopIter->{ReservedForBorrowernumber} = $first_hold->borrowernumber; - $itemLoopIter->{ReservedForSurname} = $patron->surname; - $itemLoopIter->{ReservedForFirstname} = $patron->firstname; $itemLoopIter->{ExpectedAtLibrary} = $first_hold->branchcode; $itemLoopIter->{waitingdate} = $first_hold->waitingdate; } @@ -508,7 +503,7 @@ foreach my $biblioNum (@biblionumbers) { $itemInfo->{backgroundcolor} = 'other'; } - # Check of the transfered documents + # Check of the transferred documents my ( $transfertwhen, $transfertfrom, $transfertto ) = GetTransfers($itemNum); if ( $transfertwhen && ($transfertwhen ne '') ) { @@ -522,7 +517,7 @@ foreach my $biblioNum (@biblionumbers) { if ( $itemInfo->{biblionumber} ne $biblioNum ) { $biblioLoopIter{hostitemsflag} = 1; $itemLoopIter->{hostbiblionumber} = $itemInfo->{biblionumber}; - $itemLoopIter->{hosttitle} = GetBiblioData( $itemInfo->{biblionumber} )->{title}; + $itemLoopIter->{hosttitle} = Koha::Biblios->find( $itemInfo->{biblionumber} )->title; } # If there is no loan, return and transfer, we show a checkbox. @@ -534,13 +529,14 @@ foreach my $biblioNum (@biblionumbers) { my $policy_holdallowed = !$itemLoopIter->{already_reserved}; $policy_holdallowed &&= IsAvailableForItemLevelRequest($itemInfo,$patron_unblessed) && - CanItemBeReserved($borrowernumber,$itemNum) eq 'OK'; + CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK'; if ($policy_holdallowed) { - if ( my $hold_allowed = OPACItemHoldsAllowed( $itemInfo, $patron_unblessed ) ) { + my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } ); + if ( $opac_hold_policy ne 'N' ) { # If Y or F $itemLoopIter->{available} = 1; $numCopiesOPACAvailable++; - $biblioLoopIter{force_hold} = 1 if $hold_allowed eq 'F'; + $biblioLoopIter{force_hold} = 1 if $opac_hold_policy eq 'F'; } $numCopiesAvailable++; @@ -559,10 +555,17 @@ foreach my $biblioNum (@biblionumbers) { if ($itemLoopIter->{enumchron}) { $itemdata_enumchron = 1; } + # Show collection when needed + if ($itemLoopIter->{ccode}) { + $itemdata_ccode = 1; + } push @{$biblioLoopIter{itemLoop}}, $itemLoopIter; } - $template->param( itemdata_enumchron => $itemdata_enumchron ); + $template->param( + itemdata_enumchron => $itemdata_enumchron, + itemdata_ccode => $itemdata_ccode, + ); if ($numCopiesAvailable > 0) { $numBibsAvailable++; @@ -593,7 +596,7 @@ foreach my $biblioNum (@biblionumbers) { } } - $biblioLoopIter{holdable} &&= CanBookBeReserved($borrowernumber,$biblioNum) eq 'OK'; + $biblioLoopIter{holdable} &&= CanBookBeReserved( $borrowernumber, $biblioNum )->{status} eq 'OK'; # For multiple holds per record, if a patron has previously placed a hold, # the patron can only place more holds of the same type. That is, if the @@ -618,11 +621,23 @@ foreach my $biblioNum (@biblionumbers) { $anyholdable = 1 if $biblioLoopIter{holdable}; } +unless ($pickup_locations->count) { + $numBibsAvailable = 0; + $anyholdable = 0; + $template->param( + message => 1, + no_pickup_locations => 1 + ); +} if ( $numBibsAvailable == 0 || $anyholdable == 0) { $template->param( none_available => 1 ); } +if (scalar @biblionumbers > 1) { + $template->param( multi_hold => 1); +} + my $show_notes=C4::Context->preference('OpacHoldNotes'); $template->param(OpacHoldNotes=>$show_notes);