#
# 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 2 of the License, or (at your option) any later
-# version.
+# 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.
+# 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, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
use warnings;
use C4::Context;
use C4::Auth;
use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Members;
use C4::Members::Attributes qw(GetBorrowerAttributes);
use C4::Accounts;
use C4::Koha;
-use C4::Branch;
+use Koha::Patron::Images;
+use Koha::Account;
+
+use Koha::Patron::Categories;
my $input = CGI->new();
my $borrower = GetMember( borrowernumber => $borrowernumber );
my $user = $input->remote_user;
-# get account details
-my $branch = GetBranch( $input, GetBranches() );
+my $branch = C4::Context->userenv->{'branch'};
my ( $total_due, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
my $total_paid = $input->param('paid');
my $payment_note = uri_unescape $input->param('payment_note');
my $accountno;
my $accountlines_id;
+
if ( $individual || $writeoff ) {
if ($individual) {
$template->param( pay_individual => 1 );
amountoutstanding => $amountoutstanding,
title => $title,
itemnumber => $itemnumber,
- description => $description,
+ individual_description => $description,
notify_id => $notify_id,
notify_level => $notify_level,
payment_note => $payment_note,
$template->param(
selected_accts => $select_lines,
amt => $total_due,
- selected_accts_notes => $input->param('notes'),
+ selected_accts_notes => scalar $input->param('notes'),
);
}
);
} else {
if ($individual) {
- if ( $total_paid == $total_due ) {
- makepayment( $accountlines_id, $borrowernumber, $accountno, $total_paid, $user,
- $branch, $payment_note );
- } else {
- makepartialpayment( $accountlines_id, $borrowernumber, $accountno, $total_paid,
- $user, $branch, $payment_note );
- }
+ my $line = Koha::Account::Lines->find($accountlines_id);
+ Koha::Account->new( { patron_id => $borrowernumber } )->pay(
+ {
+ lines => [$line],
+ amount => $total_paid,
+ library_id => $branch,
+ note => $payment_note
+ }
+ );
print $input->redirect(
"/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber");
} else {
}
my @acc = split /,/, $select;
my $note = $input->param('selected_accts_notes');
- recordpayment_selectaccts( $borrowernumber, $total_paid, \@acc, $note );
- } else {
+
+ my @lines = Koha::Account::Lines->search(
+ {
+ borrowernumber => $borrowernumber,
+ amountoutstanding => { '<>' => 0 },
+ accountno => { 'IN' => \@acc },
+ },
+ { order_by => 'date' }
+ );
+
+ return Koha::Account->new(
+ {
+ patron_id => $borrowernumber,
+ }
+ )->pay(
+ {
+ amount => $total_paid,
+ lines => \@lines,
+ note => $note,
+ }
+ );
+ }
+ else {
my $note = $input->param('selected_accts_notes');
- recordpayment( $borrowernumber, $total_paid, '', $note );
+ Koha::Account->new( { patron_id => $borrowernumber } )
+ ->pay( { amount => $total_paid, note => $note } );
}
-# recordpayment does not return success or failure so lets redisplay the boraccount
-
print $input->redirect(
"/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber"
);
$total_paid = '0.00'; #TODO not right with pay_individual
}
-borrower_add_additional_fields($borrower);
+borrower_add_additional_fields($borrower, $template);
+
+$template->param(%$borrower);
$template->param(
borrowernumber => $borrowernumber, # some templates require global
borrower => $borrower,
+ categoryname => $borrower->{description},
total => $total_due,
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
RoutingSerials => C4::Context->preference('RoutingSerials'),
output_html_with_http_headers $input, $cookie, $template->output;
sub borrower_add_additional_fields {
- my $b_ref = shift;
+ my ( $b_ref, $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 ( $catcodes, $labels ) =
- GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
- if ( @{$catcodes} ) {
- if ( @{$catcodes} > 1 ) {
- $b_ref->{CATCODE_MULTI} = 1;
- } elsif ( @{$catcodes} == 1 ) {
- $b_ref->{catcode} = $catcodes->[0];
- }
- }
+ 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 ) if $patron_categories->count == 1;
} elsif ( $b_ref->{category_type} eq 'A' ) {
$b_ref->{adultborrower} = 1;
}
- my ( $picture, $dberror ) = GetPatronImage( $b_ref->{borrowernumber} );
- if ($picture) {
- $b_ref->{has_picture} = 1;
- }
+
+ my $patron_image = Koha::Patron::Images->find($b_ref->{borrowernumber});
+ $template->param( picture => 1 ) if $patron_image;
if (C4::Context->preference('ExtendedPatronAttributes')) {
- $b_ref->{extendedattributes} = GetBorrowerAttributes($borrowernumber);
+ $b_ref->{extendedattributes} = GetBorrowerAttributes($b_ref->{borrowernumber});
}
- # Computes full borrower address
- my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
- $b_ref->{address} = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
-
- $b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
return;
}
projects / koha_ffzg / blobdiff