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>
80 lines
2.7 KiB
Perl
Executable file
80 lines
2.7 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Displays sent notices for a given borrower
|
|
|
|
# Copyright (c) 2009 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; FIXME - Bug 2505
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use CGI;
|
|
use C4::Members;
|
|
use C4::Branch;
|
|
use C4::Letters;
|
|
use C4::Members::Attributes qw(GetBorrowerAttributes);
|
|
|
|
use C4::Dates qw/format_date/;
|
|
my $input=new CGI;
|
|
|
|
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
#get borrower details
|
|
my $borrower = GetMember(borrowernumber => $borrowernumber);
|
|
|
|
my ($template, $loggedinuser, $cookie)
|
|
= get_template_and_user({template_name => "members/notices.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => {borrowers => 1},
|
|
debug => 1,
|
|
});
|
|
|
|
$template->param( $borrower );
|
|
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
|
|
$template->param( picture => 1 ) if $picture;
|
|
|
|
# Getting the messages
|
|
my $queued_messages = C4::Letters::GetQueuedMessages({borrowernumber => $borrowernumber});
|
|
$template->param( %{$borrower} );
|
|
|
|
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', $borrower->{'streettype'} );
|
|
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
|
|
|
|
$template->param(
|
|
QUEUED_MESSAGES => $queued_messages,
|
|
borrowernumber => $borrowernumber,
|
|
sentnotices => 1,
|
|
branchname => GetBranchName($borrower->{'branchcode'}),
|
|
categoryname => $borrower->{'description'},
|
|
address => $address,
|
|
activeBorrowerRelationship => (C4::Context->preference('borrowerRelationship') ne ''),
|
|
RoutingSerials => C4::Context->preference('RoutingSerials'),
|
|
);
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|