=cut
-use strict;
-use warnings;
+use Modern::Perl;
use URI::Escape;
use C4::Context;
use C4::Stats;
use C4::Koha;
use C4::Overdues;
-use C4::Branch;
use C4::Members::Attributes qw(GetBorrowerAttributes);
-use Koha::Patron::Images;
+use Koha::Patrons;
use Koha::Patron::Categories;
+use URI::Escape;
our $input = CGI->new;
query => $input,
type => 'intranet',
authnotrequired => 0,
- flagsrequired => { borrowers => 1, updatecharges => $updatecharges_permissions },
+ flagsrequired => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
debug => 1,
}
);
}
# get borrower details
-our $borrower = GetMember( borrowernumber => $borrowernumber );
+my $logged_in_user = Koha::Patrons->find( $loggedinuser ) or die "Not logged in";
+our $patron = Koha::Patrons->find($borrowernumber);
+output_and_exit_if_error( $input, $cookie, $template, { module => 'members', logged_in_user => $logged_in_user, current_patron => $patron } );
+
our $user = $input->remote_user;
$user ||= q{};
writeoff_all(@names);
} elsif ($writeoff_item) {
my $accountlines_id = $input->param('accountlines_id');
- my $itemno = $input->param('itemnumber');
- my $account_type = $input->param('accounttype');
- my $amount = $input->param('amountoutstanding');
+ my $amount = $input->param('amountwrittenoff');
my $payment_note = $input->param("payment_note");
- WriteOffFee( $borrowernumber, $accountlines_id, $itemno, $account_type, $amount, $branch, $payment_note );
+
+ Koha::Account->new( { patron_id => $borrowernumber } )->pay(
+ {
+ amount => $amount,
+ lines => [ scalar Koha::Account::Lines->find($accountlines_id) ],
+ type => 'writeoff',
+ note => $payment_note,
+ library_id => $branch,
+ }
+ );
}
for (@names) {
$template->param(
finesview => 1,
- activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
- RoutingSerials => C4::Context->preference('RoutingSerials'),
);
add_accounts_to_template();
sub add_accounts_to_template {
- my ( $total, undef, undef ) = GetMemberAccountRecords($borrowernumber);
- my $accounts = [];
- my @notify = NumberNotifyId($borrowernumber);
-
- my $notify_groups = [];
- for my $notify_id (@notify) {
- my ( $acct_total, $accountlines, undef ) =
- GetBorNotifyAcctRecord( $borrowernumber, $notify_id );
- if ( @{$accountlines} ) {
- my $totalnotify = AmountNotify( $notify_id, $borrowernumber );
- push @{$accounts},
- { accountlines => $accountlines,
- notify => $notify_id,
- total => $totalnotify,
- };
+ 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 @accounts;
+ while ( my $account_line = $account_lines->next ) {
+ $account_line = $account_line->unblessed;
+ if ( $account_line->{itemnumber} ) {
+ my $item = Koha::Items->find( $account_line->{itemnumber} );
+ my $biblio = $item->biblio;
+ $account_line->{biblionumber} = $biblio->biblionumber;
+ $account_line->{title} = $biblio->title;
}
+ push @accounts, $account_line;
}
- borrower_add_additional_fields($borrower);
-
- $template->param(%$borrower);
+ borrower_add_additional_fields($patron->unblessed);
- my $patron_image = Koha::Patron::Images->find($borrower->{borrowernumber});
- $template->param( picture => 1 ) if $patron_image;
$template->param(
- accounts => $accounts,
- borrower => $borrower,
- categoryname => $borrower->{'description'},
+ patron => $patron,
+ accounts => \@accounts,
total => $total,
);
return;
sub get_for_redirect {
my ( $name, $name_in, $money ) = @_;
my $s = q{&} . $name . q{=};
- my $value = $input->param($name_in);
+ my $value;
+ if (defined $input->param($name_in)) {
+ $value = uri_escape_utf8( scalar $input->param($name_in) );
+ }
if ( !defined $value ) {
$value = ( $money == 1 ) ? 0 : q{};
}
$redirect .= get_for_redirect( 'amount', "amount$line_no", 1 );
$redirect .=
get_for_redirect( 'amountoutstanding', "amountoutstanding$line_no", 1 );
- $redirect .= get_for_redirect( 'description', "description$line_no", 0 );
- $redirect .= get_for_redirect( 'title', "title$line_no", 0 );
+ $redirect .= get_for_redirect( 'description', "description$line_no", 0 );
+ $redirect .= get_for_redirect( 'title', "title$line_no", 0 );
$redirect .= get_for_redirect( 'itemnumber', "itemnumber$line_no", 0 );
- $redirect .= get_for_redirect( 'notify_id', "notify_id$line_no", 0 );
- $redirect .= get_for_redirect( 'notify_level', "notify_level$line_no", 0 );
$redirect .= get_for_redirect( 'accountlines_id', "accountlines_id$line_no", 0 );
- $redirect .= q{&} . 'payment_note' . q{=} . uri_escape_utf8( $input->param("payment_note_$line_no") );
+ $redirect .= q{&} . 'payment_note' . q{=} . uri_escape_utf8( scalar $input->param("payment_note_$line_no") );
$redirect .= '&remote_user=';
$redirect .= $user;
return print $input->redirect($redirect);
sub writeoff_all {
my @params = @_;
my @wo_lines = grep { /^accountlines_id\d+$/ } @params;
+
+ my $borrowernumber = $input->param('borrowernumber');
+
for (@wo_lines) {
if (/(\d+)/) {
- my $value = $1;
- my $accounttype = $input->param("accounttype$value");
-
- # my $borrowernum = $input->param("borrowernumber$value");
- my $itemno = $input->param("itemnumber$value");
- my $amount = $input->param("amountoutstanding$value");
+ my $value = $1;
+ my $amount = $input->param("amountoutstanding$value");
my $accountlines_id = $input->param("accountlines_id$value");
- my $payment_note = $input->param("payment_note_$value");
- WriteOffFee( $borrowernumber, $accountlines_id, $itemno, $accounttype, $amount, $branch, $payment_note );
+ my $payment_note = $input->param("payment_note_$value");
+ Koha::Account->new( { patron_id => $borrowernumber } )->pay(
+ {
+ amount => $amount,
+ lines => [ scalar Koha::Account::Lines->find($accountlines_id) ],
+ type => 'writeoff',
+ note => $payment_note,
+ library_id => $branch,
+ }
+ );
}
}
- $borrowernumber = $input->param('borrowernumber');
- print $input->redirect(
- "/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
+ print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
return;
}
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 ) if $patron_categories->count == 1;
- } elsif ( $b_ref->{category_type} eq 'A' ) {
- $b_ref->{adultborrower} = 1;
+ $template->param( 'catcode' => $patron_categories->next->categorycode ) if $patron_categories->count == 1;
}
if (C4::Context->preference('ExtendedPatronAttributes')) {
foreach (@params) {
if (/^incl_par_(\d+)$/) {
my $index = $1;
- push @lines_to_pay, $input->param("accountlines_id$index");
+ push @lines_to_pay, scalar $input->param("accountlines_id$index");
$amt += $input->param("amountoutstanding$index");
}
}
$amt = '&amt=' . $amt;
my $sel = '&selected=' . join ',', @lines_to_pay;
- my $notes = '¬es=' . join("%0A", map { $input->param("payment_note_$_") } @lines_to_pay );
+ my $notes = '¬es=' . join("%0A", map { scalar $input->param("payment_note_$_") } @lines_to_pay );
my $redirect =
"/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber"
. $amt
projects / koha.git / blobdiff