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>
149 lines
4.9 KiB
Perl
Executable file
149 lines
4.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2012 Prosentient Systems
|
|
#
|
|
# 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 CGI;
|
|
use C4::Output;
|
|
use C4::Auth qw/:DEFAULT get_session/;
|
|
use C4::Branch; # GetBranches
|
|
use C4::Members;
|
|
use C4::Members::Attributes qw(GetBorrowerAttributes);
|
|
use C4::Context;
|
|
use C4::Serials;
|
|
use CGI::Session;
|
|
|
|
my $query = new CGI;
|
|
|
|
my $sessionID = $query->cookie("CGISESSID") ;
|
|
my $session = get_session($sessionID);
|
|
|
|
# branch are now defined by the userenv
|
|
# but first we have to check if someone has tried to change them
|
|
|
|
my $branch = $query->param('branch');
|
|
if ($branch){
|
|
# update our session so the userenv is updated
|
|
$session->param('branch', $branch);
|
|
$session->param('branchname', GetBranchName($branch));
|
|
}
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user (
|
|
{
|
|
template_name => 'members/routing-lists.tt',
|
|
query => $query,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { circulate => 'circulate_remaining_permissions' },
|
|
}
|
|
);
|
|
|
|
my $branches = GetBranches();
|
|
|
|
my $findborrower = $query->param('findborrower');
|
|
$findborrower =~ s|,| |g;
|
|
|
|
my $borrowernumber = $query->param('borrowernumber');
|
|
|
|
$branch = C4::Context->userenv->{'branch'};
|
|
|
|
# get the borrower information.....
|
|
my $borrower;
|
|
if ($borrowernumber) {
|
|
$borrower = GetMemberDetails( $borrowernumber, 0 );
|
|
}
|
|
|
|
|
|
##################################################################################
|
|
# BUILD HTML
|
|
# I'm trying to show the title of subscriptions where the borrowernumber is attached via a routing list
|
|
|
|
if ($borrowernumber) {
|
|
# new op dev
|
|
my $count;
|
|
my @borrowerSubscriptions;
|
|
($count, @borrowerSubscriptions) = GetSubscriptionsFromBorrower($borrowernumber );
|
|
my @subscripLoop;
|
|
|
|
foreach my $num_res (@borrowerSubscriptions) {
|
|
my %getSubscrip;
|
|
$getSubscrip{subscriptionid} = $num_res->{'subscriptionid'};
|
|
$getSubscrip{title} = $num_res->{'title'};
|
|
$getSubscrip{borrowernumber} = $num_res->{'borrowernumber'};
|
|
push( @subscripLoop, \%getSubscrip );
|
|
}
|
|
|
|
$template->param(
|
|
countSubscrip => scalar @subscripLoop,
|
|
subscripLoop => \@subscripLoop,
|
|
routinglistview => 1
|
|
);
|
|
|
|
$template->param( adultborrower => 1 ) if ( $borrower->{'category_type'} eq 'A' );
|
|
}
|
|
|
|
##################################################################################
|
|
|
|
|
|
# Computes full borrower address
|
|
my $roadtype = C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $borrower->{streettype} );
|
|
my $address = $borrower->{'streetnumber'} . " $roadtype " . $borrower->{'address'};
|
|
|
|
$template->param(
|
|
|
|
findborrower => $findborrower,
|
|
borrower => $borrower,
|
|
borrowernumber => $borrowernumber,
|
|
branch => $branch,
|
|
branchname => GetBranchName($borrower->{'branchcode'}),
|
|
title => $borrower->{'title'},
|
|
initials => $borrower->{'initials'},
|
|
firstname => $borrower->{'firstname'},
|
|
surname => $borrower->{'surname'},
|
|
othernames => $borrower->{'othernames'},
|
|
categorycode => $borrower->{'categorycode'},
|
|
categoryname => $borrower->{description},
|
|
address => $address,
|
|
address2 => $borrower->{'address2'},
|
|
phone => $borrower->{'phone'},
|
|
phonepro => $borrower->{'phonepro'},
|
|
mobile => $borrower->{'mobile'},
|
|
email => $borrower->{'email'},
|
|
emailpro => $borrower->{'emailpro'},
|
|
borrowernotes => $borrower->{'borrowernotes'},
|
|
city => $borrower->{'city'},
|
|
state => $borrower->{'state'},
|
|
zipcode => $borrower->{'zipcode'},
|
|
country => $borrower->{'country'},
|
|
cardnumber => $borrower->{'cardnumber'},
|
|
RoutingSerials => C4::Context->preference('RoutingSerials'),
|
|
);
|
|
|
|
if (C4::Context->preference('ExtendedPatronAttributes')) {
|
|
my $attributes = GetBorrowerAttributes($borrowernumber);
|
|
$template->param(
|
|
ExtendedPatronAttributes => 1,
|
|
extendedattributes => $attributes
|
|
);
|
|
}
|
|
|
|
my ($picture, $dberror) = GetPatronImage($borrower->{'borrowernumber'});
|
|
$template->param( picture => 1 ) if $picture;
|
|
|
|
output_html_with_http_headers $query, $cookie, $template->output;
|