Bug Fixing : Bullet Proofing

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

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 8626fda..2985ae3 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",
@@ -44,15 +52,16 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
+my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
 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,17 +90,17 @@ $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 if ($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 ) {
-       if($count%2 eq 0){ $issue->{'toggle'} = 1; } else { $issue->{'toggle'} = 0; }
+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'} );
     if ( $restype ) {
@@ -117,9 +126,10 @@ foreach my $issue ( @$issues ) {
 
     # 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;
@@ -132,11 +142,15 @@ 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++;
+    
+    my $isbn = GetNormalizedISBN($issue->{'isbn'});
+    $issue->{normalized_isbn} = $isbn;
 }
 
 $template->param( ISSUES       => \@issuedat );
@@ -169,6 +183,9 @@ foreach my $res (@reserves) {
     $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
     my $biblioData = GetBiblioData($res->{'biblionumber'});
     $res->{'reserves_title'} = $biblioData->{'title'};
+    if ($OPACDisplayRequestPriority) {
+        $res->{'priority'} = '' if $res->{'priority'} eq '0';
+    }
 }
 
 # use Data::Dumper;
@@ -176,6 +193,7 @@ foreach my $res (@reserves) {
 
 $template->param( RESERVES       => \@reserves );
 $template->param( reserves_count => $#reserves+1 );
+$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
 
 my @waiting;
 my $wcount = 0;
@@ -194,15 +212,22 @@ foreach my $res (@reserves) {
             $res->{'wait'}= 1; 
             $res->{'holdingbranch'}=$item->{'holdingbranch'};
             $res->{'biblionumber'}=$item->{'biblionumber'};
-            $res->{'barcodenumber'}    = $item->{'barcode'};
+            $res->{'barcodenumber'} = $item->{'barcode'};
             $res->{'wbrcode'} = $res->{'branchcode'};
-            $res->{'itemnumber'}       = $res->{'itemnumber'};
+            $res->{'itemnumber'}    = $res->{'itemnumber'};
             $res->{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};
             if($res->{'holdingbranch'} eq $res->{'wbrcode'}){
                 $res->{'atdestination'} = 1;
             }
             # 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++;
@@ -218,11 +243,29 @@ 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("OPACAmazonCoverImages") or 
+    C4::Context->preference("GoogleJackets") or
+    C4::Context->preference("BakerTaylorEnabled") or
+       C4::Context->preference("SyndeticsCoverImages")) {
+        $template->param(JacketImages=>1);
+}
+
 $template->param(
     waiting_count      => $wcount,
     textmessaging      => $borr->{textmessaging},
-       patronupdate => $patronupdate,
-       OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
+    patronupdate => $patronupdate,
+    OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
+    userview => 1,
+    dateformat    => C4::Context->preference("dateformat"),
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;