X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-account.pl;h=2cbbf4e053c438ad369adc55cc35b5f58ddd1601;hb=9d10d076122c4adb6c14b1b86b3bcca0e33ecc4a;hp=06d9595b9bd4f08b5f7a27e6d4b7349275ac439a;hpb=ef8a07c21b0813b77d1f81f8b12cb4500425f21d;p=koha.git

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 06d9595b9b..2cbbf4e053 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -1,69 +1,84 @@
 #!/usr/bin/perl
 
-# wrriten 15/10/2002 by finlay@katipo.oc.nz
-# script to display borrowers account details in the opac
+# Copyright Katipo Communications 2002
+# Copyright Biblibre 2007,2010
+#
+# This file is part of Koha.
+#
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
-use strict;
-use C4::Output;
-use CGI;
+
+use Modern::Perl;
+use CGI qw ( -utf8 );
 use C4::Members;
-use C4::Circulation::Circ2;
 use C4::Auth;
-use C4::Interface::CGI::Output;
-use HTML::Template;
-use C4::Date;
+use C4::Output;
+use Koha::Account::Lines;
+use Koha::Patrons;
+use Koha::Plugins;
 
 my $query = new CGI;
-my ($template, $borrowernumber, $cookie)
-    = get_template_and_user({template_name => "opac-account.tmpl",
-			     query => $query,
-			     type => "opac",
-			     authnotrequired => 0,
-			     flagsrequired => {borrow => 1},
-			     debug => 1,
-			     });
-
-# get borrower information ....
-my ($borr, $flags) = getpatroninformation(undef, $borrowernumber);
-
-my @bordat;
-$bordat[0] = $borr;
-
-$template->param( BORROWER_INFO => \@bordat );
-
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-account.tt",
+        query           => $query,
+        type            => "opac",
+        authnotrequired => 0,
+        debug           => 1,
+    }
+);
 
-#get account details
-my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);
+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' } }
+);
 
-for (my $i=0;$i<$numaccts;$i++){
-	$accts->[$i]{'date'} = format_date($accts->[$i]{'date'});
-    $accts->[$i]{'amount'} = sprintf("%.2f", $accts->[$i]{'amount'});
-	if($accts->[$i]{'amount'} >= 0){
-		$accts->[$i]{'amountcredit'} = 1;
-	}
-    $accts->[$i]{'amountoutstanding'} =sprintf("%.2f", $accts->[$i]{'amountoutstanding'});
-	if($accts->[$i]{'amountoutstanding'} >= 0){
-		$accts->[$i]{'amountoutstandingcredit'} = 1;
-	}
-    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
-	$accts->[$i]{'print_title'};
+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;
+    }
+    push @accountlines, $accountline;
 }
 
-# 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++;
-}
-
-
-$template->param( ACCOUNT_LINES => $accts,
+$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{},
 );
 
-$template->param( total => sprintf("%.2f",$total) );
-
-#$template->param(loggeninuser => $loggedinuser);
-output_html_with_http_headers $query, $cookie, $template->output;
+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 );
+}
 
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };