#
# 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>.
=head1 pay.pl
=cut
-use strict;
-use warnings;
+use Modern::Perl;
+use URI::Escape;
use C4::Context;
use C4::Auth;
use C4::Output;
-use CGI;
+use CGI qw ( -utf8 );
use C4::Members;
use C4::Accounts;
use C4::Stats;
use C4::Koha;
use C4::Overdues;
-use C4::Branch;
use C4::Members::Attributes qw(GetBorrowerAttributes);
+use Koha::Patrons;
-my $input = CGI->new;
+use Koha::Patron::Categories;
+use URI::Escape;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
- { template_name => 'members/pay.tmpl',
+our $input = CGI->new;
+
+my $updatecharges_permissions = $input->param('woall') ? 'writeoff' : 'remaining_permissions';
+our ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+ { template_name => 'members/pay.tt',
query => $input,
type => 'intranet',
authnotrequired => 0,
- flagsrequired => { borrowers => 1, updatecharges => 1 },
+ flagsrequired => { borrowers => 'edit_borrowers', updatecharges => $updatecharges_permissions },
debug => 1,
}
);
-my $writeoff_sth;
-my $add_writeoff_sth;
-
my @names = $input->param;
-my $borrowernumber = $input->param('borrowernumber');
+our $borrowernumber = $input->param('borrowernumber');
if ( !$borrowernumber ) {
$borrowernumber = $input->param('borrowernumber0');
}
# get borrower details
-my $borrower = GetMember( borrowernumber => $borrowernumber );
-my $user = $input->remote_user;
+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{};
-my $branches = GetBranches();
-my $branch = GetBranch( $input, $branches );
+our $branch = C4::Context->userenv->{'branch'};
my $writeoff_item = $input->param('confirm_writeoff');
my $paycollect = $input->param('paycollect');
if ($writeoff_all) {
writeoff_all(@names);
} elsif ($writeoff_item) {
- my $accountno = $input->param('accountno');
- my $itemno = $input->param('itemnumber');
- my $account_type = $input->param('accounttype');
- my $amount = $input->param('amount');
- writeoff( $accountno, $itemno, $account_type, $amount );
+ my $accountlines_id = $input->param('accountlines_id');
+ my $amount = $input->param('amountwrittenoff');
+ my $payment_note = $input->param("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( activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne '') );
+$template->param(
+ finesview => 1,
+);
add_accounts_to_template();
output_html_with_http_headers $input, $cookie, $template->output;
-sub writeoff {
- my ( $accountnum, $itemnum, $accounttype, $amount ) = @_;
- my $manager_id = 0;
- $manager_id = C4::Context->userenv->{'number'} if C4::Context->userenv;
-
- # if no item is attached to fine, make sure to store it as a NULL
- $itemnum ||= undef;
- get_writeoff_sth();
- $writeoff_sth->execute( $accountnum, $borrowernumber );
-
- my $acct = getnextacctno($borrowernumber);
- $add_writeoff_sth->execute( $borrowernumber, $acct, $itemnum, $amount, $manager_id );
-
- UpdateStats( $branch, 'writeoff', $amount, q{}, q{}, q{}, $borrowernumber );
-
- return;
-}
-
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);
+ borrower_add_additional_fields($patron->unblessed);
+
$template->param(
- accounts => $accounts,
- borrower => $borrower,
+ 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( 'accountno', "accountno$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( '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( 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 { /^accountno\d+$/ } @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("amount$value");
- my $accountno = $input->param("accountno$value");
- writeoff( $accountno, $itemno, $accounttype, $amount );
+ 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");
+ 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;
}
# 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];
- }
- }
- } elsif ( $b_ref->{category_type} eq 'A' ) {
- $b_ref->{adultborrower} = 1;
- }
- my ( $picture, $dberror ) = GetPatronImage( $b_ref->{cardnumber} );
- if ($picture) {
- $b_ref->{has_picture} = 1;
+ 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->{branchname} = GetBranchName( $b_ref->{branchcode} );
return;
}
foreach (@params) {
if (/^incl_par_(\d+)$/) {
my $index = $1;
- push @lines_to_pay, $input->param("accountno$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 { scalar $input->param("payment_note_$_") } @lines_to_pay );
my $redirect =
"/cgi-bin/koha/members/paycollect.pl?borrowernumber=$borrowernumber"
. $amt
- . $sel;
+ . $sel
+ . $notes;
print $input->redirect($redirect);
return;
}
-
-sub get_writeoff_sth {
-
- # lets prepare these statement handles only once
- if ($writeoff_sth) {
- return;
- } else {
- my $dbh = C4::Context->dbh;
-
- # Do we need to validate accounttype
- my $sql = 'Update accountlines set amountoutstanding=0 '
- . 'WHERE accountno=? and borrowernumber=?';
- $writeoff_sth = $dbh->prepare($sql);
- my $insert =
-q{insert into accountlines (borrowernumber,accountno,itemnumber,date,amount,description,accounttype,manager_id)}
- . q{values (?,?,?,now(),?,'Writeoff','W',?)};
- $add_writeoff_sth = $dbh->prepare($insert);
- }
- return;
-}
projects / koha.git / blobdiff