Bug 15548: Move new patron related code to Patron*

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

diff --git a/opac/opac-user.pl b/opac/opac-user.pl
index 9d0e97f..0828739 100755 (executable)
--- a/opac/opac-user.pl
+++ b/opac/opac-user.pl
@@ -35,10 +35,14 @@ use C4::Items;
 use C4::Letters;
 use C4::Branch; # GetBranches
 use Koha::DateUtils;
-use Koha::Borrower::Debarments qw(IsDebarred);
+use Koha::Patron::Debarments qw(IsDebarred);
+use Koha::Holds;
+use Koha::Database;
+use Koha::Patron::Messages;
 
 use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
 
+use Scalar::Util qw(looks_like_number);
 use Date::Calc qw(
   Today
   Add_Delta_Days
@@ -105,14 +109,18 @@ if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) {
     $borr->{'amountoverzero'} = 1;
 }
 my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' );
-$no_renewal_amt ||= 0;
+$no_renewal_amt = undef unless looks_like_number( $no_renewal_amt );
 
-if (  C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstanding} > $no_renewal_amt ) {
+if (   C4::Context->preference('OpacRenewalAllowed')
+    && defined($no_renewal_amt)
+    && $borr->{amountoutstanding} > $no_renewal_amt )
+{
     $borr->{'flagged'} = 1;
     $canrenew = 0;
     $template->param(
         renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
-        renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ),
+        renewal_blocked_fines_amountoutstanding =>
+          sprintf( '%.02f', $borr->{amountoutstanding} ),
     );
 }
 
@@ -275,79 +283,12 @@ for my $branch_hash ( sort keys %{$branches} ) {
 $template->param( branchloop => \@branch_loop );
 
 # now the reserved items....
-my @reserves  = GetReservesFromBorrowernumber( $borrowernumber );
-foreach my $res (@reserves) {
+my $reserves = Koha::Holds->search( { borrowernumber => $borrowernumber } );
 
-    if ( $res->{'expirationdate'} eq '0000-00-00' ) {
-      $res->{'expirationdate'} = '';
-    }
-    $res->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($res->{'biblionumber'}), GetFrameworkCode($res->{'biblionumber'}));
-    $res->{'waiting'} = 1 if $res->{'found'} eq 'W';
-    $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
-    my $biblioData = GetBiblioData($res->{'biblionumber'});
-    $res->{'reserves_title'} = $biblioData->{'title'};
-    $res->{'author'} = $biblioData->{'author'};
-
-    if ($show_priority) {
-        $res->{'priority'} ||= '';
-    }
-    if ( $res->{'suspend_until'} ) {
-        $res->{'suspend_until'} = output_pref({ dt => dt_from_string( $res->{'suspend_until'} , 'iso' ), dateonly => 1 });
-    }
-}
-
-# use Data::Dumper;
-# warn Dumper(@reserves);
-
-$template->param( RESERVES       => \@reserves );
-$template->param( reserves_count => $#reserves+1 );
-$template->param( showpriority=>$show_priority );
-
-my @waiting;
-my $wcount = 0;
-foreach my $res (@reserves) {
-    if ( $res->{'itemnumber'} ) {
-        my $item = GetItem( $res->{'itemnumber'});
-        $res->{'holdingbranch'} =
-          $branches->{ $item->{'holdingbranch'} }->{'branchname'};
-        $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
-        $res->{'enumchron'} = $item->{'enumchron'} if $item->{'enumchron'};
-        # get document reserve status
-        my $biblioData = GetBiblioData($res->{'biblionumber'});
-        $res->{'waiting_title'} = $biblioData->{'title'};
-        if ( ( $res->{'found'} eq 'W' ) ) {
-            my $item = $res->{'itemnumber'};
-            $item = GetBiblioFromItemNumber($item,undef);
-            $res->{'wait'}= 1;
-            $res->{'holdingbranch'}=$item->{'holdingbranch'};
-            $res->{'biblionumber'}=$item->{'biblionumber'};
-            $res->{'barcode'} = $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';
-        } else {
-            my ($transfertwhen, $transfertfrom, $transfertto) = GetTransfers( $res->{'itemnumber'} );
-            if ($transfertwhen) {
-                $res->{intransit} = 1;
-                $res->{datesent}   = $transfertwhen;
-                $res->{frombranch} = GetBranchName($transfertfrom);
-            }
-        }
-        push @waiting, $res;
-        $wcount++;
-    }
-    # can be cancelled
-    #$res->{'cancelable'} = 1 if ($res->{'wait'} && $res->{'atdestination'} && $res->{'found'} ne "1");
-    $res->{'cancelable'} = 1 if    ($res->{wait} and not $res->{found}) or (not $res->{wait} and not $res->{intransit});
-
-}
-
-$template->param( WAITING => \@waiting );
+$template->param(
+    RESERVES       => $reserves,
+    showpriority   => $show_priority,
+);
 
 # current alert subscriptions
 my $alerts = getalert($borrowernumber);
@@ -372,7 +313,13 @@ if (C4::Context->preference("OPACAmazonCoverImages") or
         $template->param(JacketImages=>1);
 }
 
-if ( GetMessagesCount( $borrowernumber, 'B' ) ) {
+my $patron_messages = Koha::Patron::Messages->search(
+    {
+        borrowernumber => $borrowernumber,
+        message_type => 'B',
+    }
+);
+if ( $patron_messages->count ) {
     $template->param( bor_messages => 1 );
 }
 
@@ -383,9 +330,23 @@ if ( $borr->{'opacnote'} ) {
   );
 }
 
+if (   C4::Context->preference('AllowPatronToSetCheckoutsVisibilityForGuarantor')
+    || C4::Context->preference('AllowStaffToSetCheckoutsVisibilityForGuarantor') )
+{
+    my @relatives =
+      Koha::Database->new()->schema()->resultset("Borrower")->search(
+        {
+            privacy_guarantor_checkouts => 1,
+            'me.guarantorid'           => $borrowernumber
+        },
+        { prefetch => [ { 'issues' => { 'item' => 'biblio' } } ] }
+      );
+    $template->param( relatives => \@relatives );
+}
+
 $template->param(
-    bor_messages_loop        => GetMessages( $borrowernumber, 'B', 'NONE' ),
-    waiting_count            => $wcount,
+    borrower                 => $borr,
+    patron_messages          => $patron_messages,
     patronupdate             => $patronupdate,
     OpacRenewalAllowed       => C4::Context->preference("OpacRenewalAllowed"),
     userview                 => 1,