Bug 23115: Tweak display of totals on 'Fines and charges' page

[koha-equinox.git] / opac / opac-account.pl

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index d220fed..d5677fc 100755 (executable)
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -19,13 +19,14 @@
 # along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 
-use strict;
+use Modern::Perl;
 use CGI qw ( -utf8 );
 use C4::Members;
-use C4::Circulation;
 use C4::Auth;
 use C4::Output;
-use warnings;
+use Koha::Account::Lines;
+use Koha::Patrons;
+use Koha::Plugins;
 
 my $query = new CGI;
 my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
@@ -38,36 +39,31 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
     }
 );
 
-my $borrower = C4::Members::GetMember( borrowernumber => $borrowernumber );
-$template->param( BORROWER_INFO => $borrower );
+my $patron = Koha::Patrons->find( $borrowernumber );
+my $account = $patron->account;
+my $accountlines = $account->lines->search({ amountoutstanding => { '>=' => 0 }});
+my $total_outstanding = $accountlines->total_outstanding;
+my $outstanding_credits = $account->outstanding_credits;
 
-#get account details
-my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber );
-
-for ( my $i = 0 ; $i < $numaccts ; $i++ ) {
-    $accts->[$i]{'amount'} = sprintf( "%.2f", $accts->[$i]{'amount'} || '0.00');
-    if ( $accts->[$i]{'amount'} >= 0 ) {
-        $accts->[$i]{'amountcredit'} = 1;
-    }
-    $accts->[$i]{'amountoutstanding'} =
-      sprintf( "%.2f", $accts->[$i]{'amountoutstanding'} || '0.00' );
-    if ( $accts->[$i]{'amountoutstanding'} >= 0 ) {
-        $accts->[$i]{'amountoutstandingcredit'} = 1;
-    }
-}
+$template->param(
+    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{},
+);
 
-# add the row parity
-my $num = 0;
-foreach my $row (@$accts) {
-    $row->{'even'} = 1 if $num % 2 == 0;
-    $row->{'odd'}  = 1 if $num % 2 == 1;
-    $num++;
+my $plugins_enabled = C4::Context->preference('UseKohaPlugins') && C4::Context->config("enable_plugins");
+if ( $plugins_enabled ) {
+    my @plugins = Koha::Plugins->new()->GetPlugins({
+        method => 'opac_online_payment',
+    });
+    # Only pass in plugins where opac online payment is enabled
+    @plugins = grep { $_->opac_online_payment } @plugins;
+    $template->param( plugins => \@plugins );
 }
 
-$template->param (
-    ACCOUNT_LINES => $accts,
-    total => sprintf( "%.2f", $total ),
-       accountview => 1
-);
-
 output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };