Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / opac / opac-readingrecord.pl

diff --git a/opac/opac-readingrecord.pl b/opac/opac-readingrecord.pl
index 745e77c..5598148 100755 (executable)
--- a/opac/opac-readingrecord.pl
+++ b/opac/opac-readingrecord.pl
@@ -20,24 +20,25 @@ use Modern::Perl;
 
 use CGI qw ( -utf8 );
 
-use C4::Auth;
-use C4::Koha;
+use C4::Auth qw( get_template_and_user );
+use C4::Koha qw(
+    getitemtypeimagelocation
+    GetNormalizedISBN
+    GetNormalizedUPC
+);
 use C4::Biblio;
-use C4::Circulation;
-use C4::Members;
-use C4::External::BakerTaylor;
-use C4::External::BakerTaylor qw(&image_url &link_url);
-use Koha::DateUtils;
+use C4::Members qw( GetAllIssues );
+use C4::External::BakerTaylor qw( image_url link_url );
 use MARC::Record;
 
-use C4::Output;
-use C4::Charset qw(StripNonXmlChars);
+use C4::Output qw( output_html_with_http_headers );
+use C4::Charset qw( StripNonXmlChars );
 use Koha::Patrons;
 
 use Koha::ItemTypes;
 use Koha::Ratings;
 
-my $query = new CGI;
+my $query = CGI->new;
 
 # if opacreadinghistory is disabled, leave immediately
 if ( ! C4::Context->preference('opacreadinghistory') ) {
@@ -50,15 +51,9 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
         template_name   => "opac-readingrecord.tt",
         query           => $query,
         type            => "opac",
-        authnotrequired => 0,
-        debug           => 1,
     }
 );
 
-my $borr = Koha::Patrons->find( $borrowernumber )->unblessed;
-
-$template->param(%{$borr});
-
 my $itemtypes = { map { $_->{itemtype} => $_ } @{ Koha::ItemTypes->search_with_localization->unblessed } };
 
 # get the record
@@ -98,7 +93,7 @@ foreach my $issue ( @{$issues} ) {
     if ( $marcxml ) {
         $marcxml = StripNonXmlChars( $marcxml );
         my $marc_rec =
-          MARC::Record::new_from_xml( $marcxml, 'utf8',
+          MARC::Record::new_from_xml( $marcxml, 'UTF-8',
             C4::Context->preference('marcflavour') );
         $issue->{normalized_upc} = GetNormalizedUPC( $marc_rec, C4::Context->preference('marcflavour') );
     }
@@ -146,6 +141,12 @@ for(qw(AmazonCoverImages GoogleJackets)) { # BakerTaylorEnabled handled above
        $template->param(JacketImages=>1);
 }
 
+my $saving_display = C4::Context->preference('OPACShowSavings');
+if ( $saving_display =~ /checkouthistory/ ) {
+    my $patron = Koha::Patrons->find( $borrowernumber );
+    $template->param( savings => $patron->get_savings );
+}
+
 $template->param(
     READING_RECORD => $issues,
     limit          => $limit,