X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=opac%2Fopac-account.pl;h=1de5617fd612dd4dac77b0e7bea7bf3029a6d30b;hb=9d6d641d1f8b77271800f43bc027b651f9aea52b;hp=9a658c2e857405ecf9d44a5bda70eae901787b49;hpb=2b8ef909457e3ac081831552787d300dd5154d19;p=srvgit

diff --git a/opac/opac-account.pl b/opac/opac-account.pl
index 9a658c2e85..1de5617fd6 100755
--- a/opac/opac-account.pl
+++ b/opac/opac-account.pl
@@ -1,56 +1,97 @@
 #!/usr/bin/perl
 
-# wrriten 15/10/2002 by finlay@katipo.oc.nz
-# script to display borrowers account details in the opac
-
-use strict;
-use C4::Output;
-use CGI;
-use C4::Search;
-use C4::Circulation::Circ2;
-use C4::Auth;
-
-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 );
-
-
-#get account details
-my ($numaccts,$accts,$total) = getboracctrecord(undef,$borr);   
-
-for (my $i=0;$i<$numaccts;$i++){
-    $accts->[$i]{'amount'}+=0.00;
-    $accts->[$i]{'amountoutstanding'}+=0.00;
-    if ($accts->[$i]{'accounttype'} ne 'F' && $accts->[$i]{'accounttype'} ne 'FU'){
-	$accts->[$i]{'print_title'};
+# 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 Modern::Perl;
+use CGI qw ( -utf8 );
+use C4::Members;
+use C4::Auth qw( get_template_and_user );
+use C4::Output qw( output_html_with_http_headers );
+use Koha::Account::Lines;
+use Koha::Patrons;
+use Koha::Plugins;
+
+my $query = CGI->new;
+my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
+    {
+        template_name   => "opac-account.tt",
+        query           => $query,
+        type            => "opac",
     }
-}
+);
+
+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;
 
-# 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++;
+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,
+                }
+            );
+        }
+    }
+    $template->param( relatives => \@relatives );
 }
 
 
-$template->param( ACCOUNT_LINES => $accts );
+$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{},
+);
 
-$template->param( total => $total );
+if ( C4::Context->config("enable_plugins") ) {
+    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,
+        payment_methods => scalar @plugins > 0
+    );
+}
 
-print $query->header(-cookie => $cookie), $template->output; 
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };