X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-user.pl;h=78ba325f7b3d0b8d5e6d17bd1e6d7639efa8a048;hb=9ad27b2278e3db96f7fe864a49cbe065a7228933;hp=0ed2f6d9185d607f414839f340dbae28f9547ac5;hpb=c596d553740ebb6299b133fc6b71ca47ed0ff2e7;p=koha.git

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 0ed2f6d918..78ba325f7b 100755
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -15,7 +15,6 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 use strict;
 require Exporter;
@@ -24,11 +23,11 @@ use CGI;
 use C4::Auth;
 use C4::Koha;
 use C4::Circulation;
-use C4::Reserves2;
+use C4::Reserves;
 use C4::Members;
-use C4::Interface::CGI::Output;
+use C4::Output;
 use C4::Biblio;
-use C4::Date;
+use C4::Dates qw/format_date/;
 use C4::Letters;
 use C4::Branch; # GetBranches
 
@@ -55,7 +54,8 @@ $borr->{'ethnicity'}    = fixEthnicity( $borr->{'ethnicity'} );
 if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) {
     $borr->{'flagged'} = 1;
 }
-
+# $make flagged available everywhere in the template
+my $patron_flagged = $borr->{'flagged'};
 if ( $borr->{'amountoutstanding'} > 5 ) {
     $borr->{'amountoverfive'} = 1;
 }
@@ -72,27 +72,30 @@ $borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
 my @bordat;
 $bordat[0] = $borr;
 
-$template->param( BORROWER_INFO  => \@bordat );
-$template->param( borrowernumber => $borrowernumber );
+$template->param(   BORROWER_INFO  => \@bordat,
+                    borrowernumber => $borrowernumber,
+                    patron_flagged => $patron_flagged,
+                );
 
 #get issued items ....
-my $issues = GetBorrowerIssues($borr);
+my ($countissues,$issues) = GetPendingIssues($borrowernumber);
 
 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; }
     # check for reserves
     my ( $restype, $res ) = CheckReserves( $issue->{'itemnumber'} );
     if ( $restype ) {
         $issue->{'reserved'} = 1;
     }
     
-    my ( $numaccts, $accts, $total ) = getboracctrecord( undef, $borr );
+    my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
     my $charges = 0;
     foreach my $ac (@$accts) {
         if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {
@@ -110,8 +113,8 @@ foreach my $issue ( @$issues ) {
     $issue->{$publictype} = 1;
 
     # check if item is renewable
-    my %env;
     my $status = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
+	($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
 
     $issue->{'status'} = $status;
 
@@ -139,11 +142,23 @@ $template->param( issues_count => $count );
 $template->param( OVERDUES       => \@overdues );
 $template->param( overdues_count => $overdues_count );
 
+# load the branches
 my $branches = GetBranches();
+my @branch_loop;
+for my $branch_hash (sort keys %$branches ) {
+    my $selected=(C4::Context->userenv && ($branch_hash eq C4::Context->userenv->{branch})) if (C4::Context->preference('SearchMyLibraryFirst'));
+    push @branch_loop,
+      {
+        value      => "branch: $branch_hash",
+        branchname => $branches->{$branch_hash}->{'branchname'},
+        selected => $selected
+      };
+}
+$template->param( branchloop => \@branch_loop, "mylibraryfirst"=>C4::Context->preference("SearchMyLibraryFirst"));
 
 # now the reserved items....
-my ( $rcount, $reserves ) = FindReserves( undef, $borrowernumber );
-foreach my $res (@$reserves) {
+my @reserves  = GetReservesFromBorrowernumber( $borrowernumber );
+foreach my $res (@reserves) {
     $res->{'reservedate'} = format_date( $res->{'reservedate'} );
     my $publictype = $res->{'publictype'};
     $res->{$publictype} = 1;
@@ -153,22 +168,39 @@ foreach my $res (@$reserves) {
     $res->{'reserves_title'} = $biblioData->{'title'};
 }
 
-$template->param( RESERVES       => $reserves );
-$template->param( reserves_count => $rcount );
+# use Data::Dumper;
+# warn Dumper(@reserves);
+
+$template->param( RESERVES       => \@reserves );
+$template->param( reserves_count => $#reserves+1 );
 
 my @waiting;
 my $wcount = 0;
-foreach my $res (@$reserves) {
+foreach my $res (@reserves) {
     if ( $res->{'itemnumber'} ) {
         my $item = GetItem( $res->{'itemnumber'});
         $res->{'holdingbranch'} =
           $branches->{ $item->{'holdingbranch'} }->{'branchname'};
         $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
-        if ( $res->{'holdingbranch'} eq $res->{'branch'} ) {
-            $res->{'atdestination'} = 1;
-        }
+        # get document reserve status
         my $biblioData = GetBiblioData($res->{'biblionumber'});
         $res->{'waiting_title'} = $biblioData->{'title'};
+        if ( ( $res->{'found'} eq 'W' ) or ( $res->{'priority'} eq '0' ) ) {
+            my $item = $res->{'itemnumber'};
+            $item = GetBiblioFromItemNumber($item,undef);
+            $res->{'wait'}= 1; 
+            $res->{'holdingbranch'}=$item->{'holdingbranch'};
+            $res->{'biblionumber'}=$item->{'biblionumber'};
+            $res->{'barcodenumber'}	= $item->{'barcode'};
+            $res->{'wbrcode'} = $res->{'branchcode'};
+            $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';
+        }
         push @waiting, $res;
         $wcount++;
     }