X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=members%2Fpaycollect.pl;h=0c547fe12baba516921e8c08bb1b7429c5104552;hb=5995275b74777432c5ac3b26bf5016e6a27cfcf5;hp=f1f9f16e97a7dd18966f21dc42e8e32d0e223684;hpb=72058d27415a82799d9f6acac693e94dc7bf9309;p=koha.git

diff --git a/members/paycollect.pl b/members/paycollect.pl
index f1f9f16e97..0c547fe12b 100755
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -69,6 +69,7 @@ my $select_lines = $input->param('selected');
 my $select       = $input->param('selected_accts');
 my $payment_note = uri_unescape scalar $input->param('payment_note');
 my $payment_type = scalar $input->param('payment_type');
+my $type         = scalar $input->param('type') || 'payment',
 my $accountlines_id;
 
 if ( $individual || $writeoff ) {
@@ -153,6 +154,7 @@ if ( $total_paid and $total_paid ne '0.00' ) {
                     }
                   )->pay(
                     {
+                        type         => $type,
                         amount       => $total_paid,
                         lines        => \@lines,
                         note         => $note,
@@ -178,7 +180,7 @@ if ( $total_paid and $total_paid ne '0.00' ) {
     $total_paid = '0.00';    #TODO not right with pay_individual
 }
 
-borrower_add_additional_fields($borrower, $template);
+borrower_add_additional_fields($patron, $template);
 
 $template->param(%$borrower);
 
@@ -187,6 +189,7 @@ if ( $input->param('error_over') ) {
 }
 
 $template->param(
+    type           => $type,
     borrowernumber => $borrowernumber,    # some templates require global
     patron        => $patron,
     total         => $total_due,
@@ -198,19 +201,20 @@ $template->param(
 output_html_with_http_headers $input, $cookie, $template->output;
 
 sub borrower_add_additional_fields {
-    my ( $b_ref, $template ) = @_;
+    my ( $patron, $template ) = @_;
 
 # 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->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;
     }
 
     if (C4::Context->preference('ExtendedPatronAttributes')) {
-        $b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});
+        my $extendedattributes = GetBorrowerAttributes($patron->borrowernumber);
+        $template->param( extendedattributes => $extendedattributes );
     }
 
     return;