Removing old PO files, removing clutter

[koha_fer] / opac / opac-user.pl

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 0ed2f6d..89fbe4e 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -24,9 +24,9 @@ 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::Letters;
@@ -76,7 +76,7 @@ $template->param( BORROWER_INFO  => \@bordat );
 $template->param( borrowernumber => $borrowernumber );
 
 #get issued items ....
-my $issues = GetBorrowerIssues($borr);
+my ($countissues,$issues) = GetPendingIssues($borrowernumber);
 
 my $count          = 0;
 my $overdues_count = 0;
@@ -92,7 +92,7 @@ foreach my $issue ( @$issues ) {
         $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,7 +110,6 @@ foreach my $issue ( @$issues ) {
     $issue->{$publictype} = 1;
 
     # check if item is renewable
-    my %env;
     my $status = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
 
     $issue->{'status'} = $status;
@@ -139,11 +138,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 ( 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,12 +164,15 @@ 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'} =