Bug 14973: Remove double declaration of suggestions_loop

[srvgit] / opac / opac-account.pl

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 2cbbf4e..8ba2ba3 100755 (executable)
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -40,35 +40,48 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 );
 
 my $patron = Koha::Patrons->find( $borrowernumber );
-my $total = $patron->account->balance;
-my $accts = Koha::Account::Lines->search(
-    { borrowernumber => $patron->borrowernumber },
-    { order_by       => { -desc => 'accountlines_id' } }
-);
+my $account = $patron->account;
+my $accountlines = $account->lines->search({ amountoutstanding => { '>=' => 0 }});
+my $total_outstanding = $accountlines->total_outstanding;
+my $outstanding_credits = $account->outstanding_credits;
 
-my @accountlines;
-while ( my $line = $accts->next ) {
-    my $accountline = $line->unblessed;
-    $accountline->{'amount'} = sprintf( "%.2f", $accountline->{'amount'} || '0.00');
-    if ( $accountline->{'amount'} >= 0 ) {
-        $accountline->{'amountcredit'} = 1;
-    }
-    $accountline->{'amountoutstanding'} =
-      sprintf( "%.2f", $accountline->{'amountoutstanding'} || '0.00' );
-    if ( $accountline->{'amountoutstanding'} >= 0 ) {
-        $accountline->{'amountoutstandingcredit'} = 1;
+if ( C4::Context->preference('AllowPatronToSetFinesVisibilityForGuarantor')
+    || C4::Context->preference('AllowStaffToSetFinesVisibilityForGuarantor')
+  )
+{
+    my @relatives;
+
+    # Filter out guarantees that don't want guarantor to see checkouts
+    foreach my $gr ( $patron->guarantee_relationships() ) {
+        my $g = $gr->guarantee;
+        if ( $g->privacy_guarantor_fines ) {
+
+            my $relatives_accountlines = Koha::Account::Lines->search(
+                { borrowernumber => $g->borrowernumber },
+                { order_by       => { -desc => 'accountlines_id' } }
+            );
+            push(
+                @relatives,
+                {
+                    patron       => $g,
+                    accountlines => $relatives_accountlines,
+                }
+            );
+        }
     }
-    push @accountlines, $accountline;
+    $template->param( relatives => \@relatives );
 }
 
+
 $template->param(
-    ACCOUNT_LINES => \@accountlines,
-    total         => sprintf( "%.2f", $total ), # FIXME Use TT plugin Price
-    accountview   => 1,
-    message       => scalar $query->param('message') || q{},
-    message_value => scalar $query->param('message_value') || q{},
-    payment       => scalar $query->param('payment') || q{},
-    payment_error => scalar $query->param('payment-error') || q{},
+    ACCOUNT_LINES       => $accountlines,
+    total               => $total_outstanding,
+    outstanding_credits => $outstanding_credits,
+    accountview         => 1,
+    message             => scalar $query->param('message') || q{},
+    message_value       => scalar $query->param('message_value') || q{},
+    payment             => scalar $query->param('payment') || q{},
+    payment_error       => scalar $query->param('payment-error') || q{},
 );
 
 my $plugins_enabled = C4::Context->preference('UseKohaPlugins') && C4::Context->config("enable_plugins");