Bug 19991: Remove warning from opac-user

[koha.git] / opac / opac-ISBDdetail.pl

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index d77f473..40e9b71 100755 (executable)
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -50,11 +50,14 @@ use C4::Biblio;
 use C4::Items;
 use C4::Reserves;
 use C4::Acquisition;
-use C4::Review;
 use C4::Serials;    # uses getsubscriptionfrom biblionumber
 use C4::Koha;
-use C4::Members;    # GetMember
+use Koha::IssuingRules;
+use Koha::Items;
+use Koha::ItemTypes;
+use Koha::Patrons;
 use Koha::RecordProcessor;
+use Koha::Biblios;
 
 my $query = CGI->new();
 my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
@@ -78,8 +81,6 @@ if(my $cart_list = $query->cookie("bib_list")){
     }
 }
 
-$template->param( 'ItemsIssued' => CountItemsIssued( $biblionumber ) );
-
 my $marcflavour      = C4::Context->preference("marcflavour");
 
 my @items = GetItemsInfo($biblionumber);
@@ -92,14 +93,25 @@ if (scalar @items >= 1) {
     }
 }
 
-my $record_unfiltered = GetMarcBiblio($biblionumber,1);
-if ( ! $record_unfiltered ) {
+my $record = GetMarcBiblio({
+    biblionumber => $biblionumber,
+    embed_items  => 1 });
+if ( ! $record ) {
     print $query->redirect("/cgi-bin/koha/errors/404.pl");
     exit;
 }
-my $record_processor = Koha::RecordProcessor->new({ filters => 'ViewPolicy' });
-my $record_filtered  = $record_unfiltered->clone();
-my $record           = $record_processor->process($record_filtered);
+
+my $biblio = Koha::Biblios->find( $biblionumber );
+
+my $framework = GetFrameworkCode( $biblionumber );
+my $record_processor = Koha::RecordProcessor->new({
+    filters => 'ViewPolicy',
+    options => {
+        interface => 'opac',
+        frameworkcode => $framework
+    }
+});
+$record_processor->process($record);
 
 # some useful variables for enhanced content;
 # in each case, we're grabbing the first value we find in
@@ -150,16 +162,16 @@ $template->param(
 
 my $norequests = 1;
 my $allow_onshelf_holds;
-my $framework = GetFrameworkCode( $biblionumber );
 my $res = GetISBDView({
     'record'    => $record,
     'template'  => 'opac',
     'framework' => $framework
 });
 
-my $itemtypes = GetItemTypes();
-my $borrower = GetMember( 'borrowernumber' => $loggedinuser );
+my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
+my $patron = Koha::Patrons->find( $loggedinuser );
 for my $itm (@items) {
+    my $item = Koha::Items->find( $itm->{itemnumber} );
     $norequests = 0
       if $norequests
         && !$itm->{'withdrawn'}
@@ -168,28 +180,19 @@ for my $itm (@items) {
         && !$itemtypes->{$itm->{'itype'}}->{notforloan}
         && $itm->{'itemnumber'};
 
-    $allow_onshelf_holds = C4::Reserves::OnShelfHoldsAllowed($itm, $borrower)
+    $allow_onshelf_holds = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } )
       unless $allow_onshelf_holds;
 }
 
-my $reviews = getreviews( $biblionumber, 1 );
-foreach ( @$reviews ) {
-    my $borrower_number_review = $_->{borrowernumber};
-    my $borrowerData           = GetMember('borrowernumber' =>$borrower_number_review);
-    # setting some borrower info into this hash
-    $_->{title}     = $borrowerData->{'title'};
-    $_->{surname}   = $borrowerData->{'surname'};
-    $_->{firstname} = $borrowerData->{'firstname'};
+if( $allow_onshelf_holds || CountItemsIssued($biblionumber) || $biblio->has_items_waiting_or_intransit ) {
+    $template->param( ReservableItems => 1 );
 }
 
-
 $template->param(
     RequestOnOpac       => C4::Context->preference("RequestOnOpac"),
-    AllowOnShelfHolds   => $allow_onshelf_holds,
     norequests   => $norequests,
     ISBD         => $res,
-    biblionumber => $biblionumber,
-    reviews             => $reviews,
+    biblio       => $biblio,
 );
 
 #Search for title in links