Invalid field 'expiry' referenced.

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

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index f9aeb0c..528c2e0 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",
@@ -47,12 +55,12 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 my $patronupdate = $query->param('patronupdate');
 
 # get borrower information ....
-my ( $borr, $flags ) = GetMemberDetails( $borrowernumber );
+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,16 +89,16 @@ $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;
 my $toggle = 0;
 my $overdues_count = 0;
 my @overdues;
 my @issuedat;
-my $imgdir = getitemtypeimagesrc();
 my $itemtypes = GetItemTypes();
-foreach my $issue ( @$issues ) {
+foreach my $issue ( @issue_list ) {
        if($count%2 eq 0){ $issue->{'toggle'} = 1; } else { $issue->{'toggle'} = 0; }
     # check for reserves
     my ( $restype, $res ) = CheckReserves( $issue->{'itemnumber'} );
@@ -119,7 +127,7 @@ foreach my $issue ( @$issues ) {
     my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
        ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
 
-    $issue->{'status'} = $status;
+    $issue->{'status'} = $status || C4::Context->preference("OpacRenewalAllowed");
 
     if ( $issue->{'overdue'} ) {
         push @overdues, $issue;
@@ -132,12 +140,29 @@ foreach my $issue ( @$issues ) {
     # imageurl:
     my $itemtype = $issue->{'itemtype'};
     if ( $itemtype ) {
-        $issue->{'imageurl'}    = $imgdir."/".$itemtypes->{$itemtype}->{'imageurl'};
+        $issue->{'imageurl'}    = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} );
         $issue->{'description'} = $itemtypes->{$itemtype}->{'description'};
     }
     $issue->{date_due} = format_date($issue->{date_due});
     push @issuedat, $issue;
     $count++;
+       
+               # XISBN Stuff
+       my $xisbn=$issue->{'isbn'};
+       $xisbn =~ /(\d*[X]*)/;
+       $issue->{amazonisbn} = $1;              # FIXME: so it is OK if the ISBN = 'XXXXX' ?
+       my ($clean, $amazonisbn);
+       $amazonisbn = $1;
+       # these might be overkill, but they are better than the regexp above.
+       if (
+               $amazonisbn =~ /\b(\d{13})\b/ or
+               $amazonisbn =~ /\b(\d{10})\b/ or 
+               $amazonisbn =~ /\b(\d{9}X)\b/i
+       ) {
+               $clean = $1;
+               $issue->{clean_isbn} = $1;
+       }
+       
 }
 
 $template->param( ISSUES       => \@issuedat );
@@ -204,6 +229,13 @@ foreach my $res (@reserves) {
             }
             # set found to 1 if reserve is waiting for patron pickup
             $res->{'found'} = 1 if $res->{'found'} eq 'W';
+        } else {
+            my ($transfertwhen, $transfertfrom, $transfertto) = GetTransfers( $res->{'itemnumber'} );
+            if ($transfertwhen) {
+                $res->{intransit} = 1;
+                $res->{datesent}   = format_date($transfertwhen);
+                $res->{frombranch} = GetBranchName($transfertfrom);
+            }
         }
         push @waiting, $res;
         $wcount++;
@@ -219,6 +251,21 @@ foreach ( @$alerts ) {
     $_->{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")   ) {
+               $template->param(JacketImages=>1);
+}
+
 $template->param(
     waiting_count      => $wcount,
     textmessaging      => $borr->{textmessaging},