Bug 21915: Call reconcile_balance on manual invoice creation

[koha.git] / members / paycollect.pl

diff --git a/members/paycollect.pl b/members/paycollect.pl
index 1676177..a15267f 100755 (executable)
--- a/members/paycollect.pl
+++ b/members/paycollect.pl
@@ -58,8 +58,9 @@ my $borrower       = $patron->unblessed;
 my $category       = $patron->category;
 my $user           = $input->remote_user;
 
-my $branch         = C4::Context->userenv->{'branch'};
-my ( $total_due ) = Koha::Account->new( { patron_id => $borrowernumber } )->outstanding_debits;
+my $branch    = C4::Context->userenv->{'branch'};
+my $total_due = $patron->account->outstanding_debits->total_outstanding;
+
 my $total_paid = $input->param('paid');
 
 my $individual   = $input->param('pay_individual');
@@ -68,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 ) {
@@ -152,6 +154,7 @@ if ( $total_paid and $total_paid ne '0.00' ) {
                     }
                   )->pay(
                     {
+                        type         => $type,
                         amount       => $total_paid,
                         lines        => \@lines,
                         note         => $note,
@@ -177,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);
 
@@ -186,6 +189,7 @@ if ( $input->param('error_over') ) {
 }
 
 $template->param(
+    type           => $type,
     borrowernumber => $borrowernumber,    # some templates require global
     patron        => $patron,
     total         => $total_due,
@@ -197,19 +201,15 @@ $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' ) {
-        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;