Owen Leonard
526af4ea07
Differences between circ-menu.tt and circ-menu.inc always crop up when a new menu item is added--usually only to circ-menu.inc as happened with Bug 9261. Other sidebar differences are present due to differences in the patron data passed by various patron-related script to their templates. This patch also irons out some of these inconsistencies. To test, apply the patch and check out to a patron whose record has more than just basic data: othername, country, patron attributes, street number, road types, etc. View the following pages and compare the patron data and visible tabs to confirm that they match: circ/circulation.pl?borrowernumber=X members/boraccount.pl?borrowernumber=X members/files.pl?borrowernumber=X members/mancredit.pl?borrowernumber=X members/maninvoice.pl?borrowernumber=X members/member-flags.pl?member=X members/member-password.pl?member=X members/moremember.pl?borrowernumber=X members/notices.pl?borrowernumber=X members/pay.pl?borrowernumber=X members/paycollect.pl?borrowernumber=X members/purchase-suggestions.pl?borrowernumber=X members/readingrec.pl?borrowernumber=X members/routing-lists.pl?borrowernumber=X members/statistics.pl?borrowernumber=X tools/viewlog.pl?do_it=1&modules=MEMBERS&modules=circulation&src=circ&object=X The only difference I've found which is not fixed by this patch is the display of extended patron attributes in the sidebar of moremember.pl. This is a piecemeal fix for a problem which really deserves a centralized solution, but at least it gets us back to consistency for the moment. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com> Going through all tabs shows consistency is back. A mid term solution should implement this in a centralized way. Great job Owen! No koha-qa errors btw. Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
126 lines
4.5 KiB
Perl
Executable file
126 lines
4.5 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
#written 11/1/2000 by chris@katipo.oc.nz
|
|
#script to display borrowers account details
|
|
|
|
|
|
# Copyright 2000-2002 Katipo Communications
|
|
# Copyright 2010 BibLibre
|
|
#
|
|
# 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::Auth;
|
|
use C4::Output;
|
|
use CGI;
|
|
|
|
use C4::Members;
|
|
use C4::Branch;
|
|
use C4::Accounts;
|
|
use C4::Items;
|
|
use C4::Members::Attributes qw(GetBorrowerAttributes);
|
|
|
|
my $input=new CGI;
|
|
my $flagsrequired = { borrowers => 1, updatecharges => 1 };
|
|
|
|
my $borrowernumber=$input->param('borrowernumber');
|
|
|
|
#get borrower details
|
|
my $data=GetMember('borrowernumber' => $borrowernumber);
|
|
my $add=$input->param('add');
|
|
|
|
if ($add){
|
|
if ( checkauth( $input, 0, $flagsrequired, 'intranet' ) ) {
|
|
my $barcode = $input->param('barcode');
|
|
my $itemnum;
|
|
if ($barcode) {
|
|
$itemnum = GetItemnumberFromBarcode($barcode);
|
|
}
|
|
my $desc = $input->param('desc');
|
|
my $note = $input->param('note');
|
|
my $amount = $input->param('amount') || 0;
|
|
$amount = -$amount;
|
|
my $type = $input->param('type');
|
|
manualinvoice( $borrowernumber, $itemnum, $desc, $type, $amount, $note );
|
|
print $input->redirect("/cgi-bin/koha/members/boraccount.pl?borrowernumber=$borrowernumber");
|
|
}
|
|
} else {
|
|
my ($template, $loggedinuser, $cookie) = get_template_and_user(
|
|
{
|
|
template_name => "members/mancredit.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { borrowers => 1,
|
|
updatecharges => 'remaining_permissions' },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
if ( $data->{'category_type'} eq 'C') {
|
|
my ( $catcodes, $labels ) = GetborCatFromCatType( 'A', 'WHERE category_type = ?' );
|
|
my $cnt = scalar(@$catcodes);
|
|
$template->param( 'CATCODE_MULTI' => 1) if $cnt > 1;
|
|
$template->param( 'catcode' => $catcodes->[0]) if $cnt == 1;
|
|
}
|
|
|
|
$template->param( adultborrower => 1 ) if ( $data->{category_type} eq 'A' );
|
|
my ($picture, $dberror) = GetPatronImage($data->{'borrowernumber'});
|
|
$template->param( picture => 1 ) if $picture;
|
|
|
|
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
|
my $attributes = GetBorrowerAttributes($borrowernumber);
|
|
$template->param(
|
|
ExtendedPatronAttributes => 1,
|
|
extendedattributes => $attributes
|
|
);
|
|
}
|
|
|
|
# Computes full borrower address
|
|
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
|
|
my $address = $data->{'streetnumber'} . " $roadtype " . $data->{'address'};
|
|
|
|
$template->param(
|
|
finesview => 1,
|
|
borrowernumber => $borrowernumber,
|
|
firstname => $data->{'firstname'},
|
|
surname => $data->{'surname'},
|
|
othernames => $data->{'othernames'},
|
|
cardnumber => $data->{'cardnumber'},
|
|
categorycode => $data->{'categorycode'},
|
|
category_type => $data->{'category_type'},
|
|
categoryname => $data->{'description'},
|
|
address => $address,
|
|
address2 => $data->{'address2'},
|
|
city => $data->{'city'},
|
|
state => $data->{'state'},
|
|
zipcode => $data->{'zipcode'},
|
|
country => $data->{'country'},
|
|
phone => $data->{'phone'},
|
|
phonepro => $data->{'phonepro'},
|
|
mobile => $data->{'mobile'},
|
|
email => $data->{'email'},
|
|
emailpro => $data->{'emailpro'},
|
|
branchcode => $data->{'branchcode'},
|
|
branchname => GetBranchName($data->{'branchcode'}),
|
|
is_child => ($data->{'category_type'} eq 'C'),
|
|
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
|
|
RoutingSerials => C4::Context->preference('RoutingSerials'),
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
}
|