Bug 20568: API keys management in interface

[koha.git] / members / boraccount.pl

diff --git a/members/boraccount.pl b/members/boraccount.pl
index f4bf63f..b3d1431 100755 (executable)
--- a/members/boraccount.pl
+++ b/members/boraccount.pl
@@ -48,7 +48,7 @@ my ($template, $loggedinuser, $cookie) = get_template_and_user(
     }
 );
 
-my $borrowernumber=$input->param('borrowernumber');
+my $borrowernumber = $input->param('borrowernumber');
 my $action = $input->param('action') || '';
 
 my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
@@ -63,22 +63,36 @@ output_and_exit_if_error( $input, $cookie, $template, { module => 'members', log
 if ( $action eq 'reverse' ) {
   ReversePayment( scalar $input->param('accountlines_id') );
 }
+elsif ( $action eq 'void' ) {
+    my $payment_id = scalar $input->param('accountlines_id');
+    my $payment    = Koha::Account::Lines->find( $payment_id );
+    $payment->void();
+}
 
-if ( $patron->category->category_type eq 'C') {
+if ( $patron->is_child ) {
     my $patron_categories = Koha::Patron::Categories->search_limited({ category_type => 'A' }, {order_by => ['categorycode']});
     $template->param( 'CATCODE_MULTI' => 1) if $patron_categories->count > 1;
     $template->param( 'catcode' => $patron_categories->next->categorycode )  if $patron_categories->count == 1;
 }
 
 #get account details
-my ($total,$accts,undef)=GetMemberAccountRecords($borrowernumber);
+my $total = $patron->account->balance;
+
+my $accts = Koha::Account::Lines->search(
+    { borrowernumber => $patron->borrowernumber },
+    { order_by       => { -desc => 'accountlines_id' } }
+);
+
 my $totalcredit;
 if($total <= 0){
         $totalcredit = 1;
 }
 
 my $reverse_col = 0; # Flag whether we need to show the reverse column
-foreach my $accountline ( @{$accts}) {
+my @accountlines;
+while ( my $line = $accts->next ) {
+    # FIXME We should pass the $accts iterator to the template and do this formatting part there
+    my $accountline = $line->unblessed;
     $accountline->{amount} += 0.00;
     if ($accountline->{amount} <= 0 ) {
         $accountline->{amountcredit} = 1;
@@ -94,9 +108,13 @@ foreach my $accountline ( @{$accts}) {
         $accountline->{payment} = 1;
         $reverse_col = 1;
     }
-}
 
-$template->param( adultborrower => 1 ) if ( $patron->category->category_type =~ /^(A|I)$/ );
+    if ( $accountline->{itemnumber} ) {
+        # Because we will not have access to the object from the template
+        $accountline->{item} = $line->item;
+    }
+    push @accountlines, $accountline;
+}
 
 if (C4::Context->preference('ExtendedPatronAttributes')) {
     my $attributes = GetBorrowerAttributes($borrowernumber);
@@ -111,9 +129,8 @@ $template->param(
     finesview           => 1,
     total               => sprintf("%.2f",$total),
     totalcredit         => $totalcredit,
-    is_child            => ($patron->category->category_type eq 'C'),
     reverse_col         => $reverse_col,
-    accounts            => $accts,
+    accounts            => \@accountlines,
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;