bug 2545: fix XSLTDetailsDisplay

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

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 04d0c9e..5b997c7 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -17,7 +17,7 @@
 
 
 use strict;
-require Exporter;
+
 use CGI;
 
 use C4::Auth;
@@ -33,6 +33,14 @@ use C4::Letters;
 use C4::Branch; # GetBranches
 
 my $query = new CGI;
+
+BEGIN {
+       if (C4::Context->preference('BakerTaylorEnabled')) {
+               require C4::External::BakerTaylor;
+               import C4::External::BakerTaylor qw(&image_url &link_url);
+       }
+}
+
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     {
         template_name   => "opac-user.tmpl",
@@ -49,10 +57,10 @@ my $patronupdate = $query->param('patronupdate');
 # get borrower information ....
 my ( $borr ) = GetMemberDetails( $borrowernumber );
 
-$borr->{'dateenrolled'} = format_date( $borr->{'dateenrolled'} );
-$borr->{'expiry'}       = format_date( $borr->{'expiry'} );
-$borr->{'dateofbirth'}  = format_date( $borr->{'dateofbirth'} );
-$borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
+for (qw(dateenrolled dateexpiry dateofbirth)) {
+    ($borr->{$_}) and $borr->{$_} = format_date($borr->{$_});
+}
+$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
 
 if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
     $borr->{'flagged'} = 1;
@@ -81,7 +89,7 @@ $template->param(   BORROWER_INFO  => \@bordat,
                 );
 
 #get issued items ....
-my ($countissues,$issues) = GetPendingIssues($borrowernumber);
+my ($issues) = GetPendingIssues($borrowernumber);
 my @issue_list = sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues;
 
 my $count          = 0;
@@ -117,9 +125,10 @@ foreach my $issue ( @issue_list ) {
 
     # check if item is renewable
     my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
-       ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
-
-    $issue->{'status'} = $status;
+    ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
+    $issue->{'status'} = $status && C4::Context->preference("OpacRenewalAllowed");
+    $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
+    $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
 
     if ( $issue->{'overdue'} ) {
         push @overdues, $issue;
@@ -242,6 +251,16 @@ foreach ( @$alerts ) {
     $_->{ $_->{type} } = 1;
     $_->{relatedto} = findrelatedto( $_->{type}, $_->{externalid} );
 }
+
+if (C4::Context->preference('BakerTaylorEnabled')) {
+       $template->param(
+               BakerTaylorEnabled  => 1,
+               BakerTaylorImageURL => &image_url(),
+               BakerTaylorLinkURL  => &link_url(),
+               BakerTaylorBookstoreURL => C4::Context->preference('BakerTaylorBookstoreURL'),
+       );
+}
+
 if (C4::Context->preference("AmazonContent"     ) or 
        C4::Context->preference("GoogleJackets"     ) or
        C4::Context->preference("BakerTaylorEnabled")   ) {