Owen Leonard
a4e804fceb
The routing list tab displays on patron pages even if the RoutingSerials preference is OFF. Display of the tab should be conditional on that pref being turned on. This patch adds a check for the RoutingSerials preference to the menu include files and amends the affected scripts to make the variable available on the pages where those includes are used. To test, view the following pages with RoutingSerials both on and off. The routing list tab should be shown and hidden accordingly: - Circulation - Patron details - Patron fines - Pay fines - Pay amount/selected (click from the Pay fines page) - Create manual invoice - Create manual credit - Patron circulation history - Patron modification log - Patron notices - Patron routing lists - Patron statistics - Patron files - Patron permissions - Set patron password - "Can't delete patron" page (try to delete a patron with checkouts). Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz> Touches a lot of files, but only a tiny change in each, works well. Could perhaps be set in C4/Auth instead, but that's no reason not to sign off Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de> All tests and QA script pass. Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
175 lines
6 KiB
Perl
Executable file
175 lines
6 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
# Copyright 2009,2010 PTFS Inc.
|
|
# Copyright 2011 PTFS-Europe Ltd
|
|
#
|
|
# 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 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.
|
|
|
|
use strict;
|
|
use warnings;
|
|
use C4::Context;
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use CGI;
|
|
use C4::Members;
|
|
use C4::Accounts;
|
|
use C4::Koha;
|
|
use C4::Branch;
|
|
|
|
my $input = CGI->new();
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{ template_name => 'members/paycollect.tmpl',
|
|
query => $input,
|
|
type => 'intranet',
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrowers => 1, updatecharges => 1 },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
# get borrower details
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
my $borrower = GetMember( borrowernumber => $borrowernumber );
|
|
my $user = $input->remote_user;
|
|
|
|
# get account details
|
|
my $branch = GetBranch( $input, GetBranches() );
|
|
|
|
my ( $total_due, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
|
|
my $total_paid = $input->param('paid');
|
|
|
|
my $individual = $input->param('pay_individual');
|
|
my $writeoff = $input->param('writeoff_individual');
|
|
my $select_lines = $input->param('selected');
|
|
my $select = $input->param('selected_accts');
|
|
my $accountno;
|
|
my $accountlines_id;
|
|
if ( $individual || $writeoff ) {
|
|
if ($individual) {
|
|
$template->param( pay_individual => 1 );
|
|
} elsif ($writeoff) {
|
|
$template->param( writeoff_individual => 1 );
|
|
}
|
|
my $accounttype = $input->param('accounttype');
|
|
$accountlines_id = $input->param('accountlines_id');
|
|
my $amount = $input->param('amount');
|
|
my $amountoutstanding = $input->param('amountoutstanding');
|
|
$accountno = $input->param('accountno');
|
|
my $itemnumber = $input->param('itemnumber');
|
|
my $description = $input->param('description');
|
|
my $title = $input->param('title');
|
|
my $notify_id = $input->param('notify_id');
|
|
my $notify_level = $input->param('notify_level');
|
|
$total_due = $amountoutstanding;
|
|
$template->param(
|
|
accounttype => $accounttype,
|
|
accountlines_id => $accountlines_id,
|
|
accountno => $accountno,
|
|
amount => $amount,
|
|
amountoutstanding => $amountoutstanding,
|
|
title => $title,
|
|
itemnumber => $itemnumber,
|
|
description => $description,
|
|
notify_id => $notify_id,
|
|
notify_level => $notify_level,
|
|
);
|
|
} elsif ($select_lines) {
|
|
$total_due = $input->param('amt');
|
|
$template->param(
|
|
selected_accts => $select_lines,
|
|
amt => $total_due
|
|
);
|
|
}
|
|
|
|
if ( $total_paid and $total_paid ne '0.00' ) {
|
|
if ( $total_paid < 0 or $total_paid > $total_due ) {
|
|
$template->param(
|
|
error_over => 1,
|
|
total_due => $total_due
|
|
);
|
|
} else {
|
|
if ($individual) {
|
|
if ( $total_paid == $total_due ) {
|
|
makepayment( $accountlines_id, $borrowernumber, $accountno, $total_paid, $user,
|
|
$branch );
|
|
} else {
|
|
makepartialpayment( $accountlines_id, $borrowernumber, $accountno, $total_paid,
|
|
$user, $branch );
|
|
}
|
|
print $input->redirect(
|
|
"/cgi-bin/koha/members/pay.pl?borrowernumber=$borrowernumber");
|
|
} else {
|
|
if ($select) {
|
|
if ( $select =~ /^([\d,]*).*/ ) {
|
|
$select = $1; # ensure passing no junk
|
|
}
|
|
my @acc = split /,/, $select;
|
|
recordpayment_selectaccts( $borrowernumber, $total_paid,
|
|
\@acc );
|
|
} else {
|
|
recordpayment( $borrowernumber, $total_paid );
|
|
}
|
|
|
|
# recordpayment does not return success or failure so lets redisplay the boraccount
|
|
|
|
print $input->redirect(
|
|
"/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber"
|
|
);
|
|
}
|
|
}
|
|
} else {
|
|
$total_paid = '0.00'; #TODO not right with pay_individual
|
|
}
|
|
|
|
borrower_add_additional_fields($borrower);
|
|
|
|
$template->param(
|
|
borrowernumber => $borrowernumber, # some templates require global
|
|
borrower => $borrower,
|
|
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;
|
|
|
|
# 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];
|
|
}
|
|
}
|
|
} 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;
|
|
}
|
|
|
|
$b_ref->{branchname} = GetBranchName( $b_ref->{branchcode} );
|
|
return;
|
|
}
|