Bug 21008: Use patron object to get category_type

[koha.git] / members / pay.pl

diff --git a/members/pay.pl b/members/pay.pl
index 3ef1200..e01fbda 100755 (executable)
--- a/members/pay.pl
+++ b/members/pay.pl
@@ -74,31 +74,30 @@ $user ||= q{};
 
 our $branch = C4::Context->userenv->{'branch'};
 
-my $writeoff_item = $input->param('confirm_writeoff');
-my $paycollect    = $input->param('paycollect');
-if ($paycollect) {
+if ( $input->param('paycollect') ) {
     print $input->redirect(
         "/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber");
 }
-my $payselected = $input->param('payselected');
-if ($payselected) {
-    payselected(@names);
+elsif ( $input->param('payselected') ) {
+    payselected({ params => \@names });
 }
-
-my $writeoff_all = $input->param('woall');    # writeoff all fines
-if ($writeoff_all) {
+elsif ( $input->param('writeoff_selected') ) {
+    payselected({ params => \@names, type => 'writeoff' });
+}
+elsif ( $input->param('woall') ) {
     writeoff_all(@names);
-} elsif ($writeoff_item) {
+}
+elsif ( $input->param('confirm_writeoff') ) {
     my $accountlines_id = $input->param('accountlines_id');
-    my $amount       = $input->param('amountwrittenoff');
-    my $payment_note = $input->param("payment_note");
+    my $amount          = $input->param('amountwrittenoff');
+    my $payment_note    = $input->param("payment_note");
 
     my $accountline = Koha::Account::Lines->find( $accountlines_id );
 
     if ( $amount > $accountline->amountoutstanding ) {
         print $input->redirect( "/cgi-bin/koha/members/paycollect.pl?"
               . "borrowernumber=$borrowernumber"
-              . "&amount=$amount"
+              . "&amount=" . $accountline->amount
               . "&amountoutstanding=" . $accountline->amountoutstanding
               . "&accounttype=" . $accountline->accounttype
               . "&accountlines_id=" . $accountlines_id
@@ -139,8 +138,8 @@ output_html_with_http_headers $input, $cookie, $template->output;
 sub add_accounts_to_template {
 
     my $patron = Koha::Patrons->find( $borrowernumber );
-    my $total = $patron->account->balance;
-    my $account_lines = Koha::Account::Lines->search({ borrowernumber => $borrowernumber, amountoutstanding => { '!=' => 0 } }, { order_by => ['accounttype'] });
+    my $account_lines = $patron->account->outstanding_debits;
+    my $total = $account_lines->total_outstanding;
     my @accounts;
     while ( my $account_line = $account_lines->next ) {
         $account_line = $account_line->unblessed;
@@ -152,7 +151,7 @@ sub add_accounts_to_template {
         }
         push @accounts, $account_line;
     }
-    borrower_add_additional_fields($patron->unblessed);
+    borrower_add_additional_fields($patron);
 
     $template->param(
         patron   => $patron,
@@ -230,20 +229,21 @@ sub writeoff_all {
 }
 
 sub borrower_add_additional_fields {
-    my $b_ref = shift;
+    my $patron = shift;
 
 # some borrower info is not returned in the standard call despite being assumed
 # in a number of templates. It should not be the business of this script but in lieu of
 # a revised api here it is ...
-    if ( $b_ref->{category_type} eq 'C' ) {
+    if ( $patron->category->category_type eq 'C' ) {
         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;
     }
 
     if (C4::Context->preference('ExtendedPatronAttributes')) {
-        $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
+        my $extendedattributes = GetBorrowerAttributes($patron->borrowernumber);
         $template->param(
+            extendedattributes       => $extendedattributes,
             ExtendedPatronAttributes => 1,
         );
     }
@@ -252,7 +252,11 @@ sub borrower_add_additional_fields {
 }
 
 sub payselected {
-    my @params = @_;
+    my $parameters = shift;
+
+    my @params = @{ $parameters->{params} };
+    my $type = $parameters->{type} || 'payment';
+
     my $amt    = 0;
     my @lines_to_pay;
     foreach (@params) {
@@ -267,6 +271,7 @@ sub payselected {
     my $notes = '&notes=' . join("%0A", map { scalar $input->param("payment_note_$_") } @lines_to_pay );
     my $redirect =
         "/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber"
+      . "&type=$type"
       . $amt
       . $sel
       . $notes;