Jonathan Druart
bde685fa92
The patron's information displayed in the member module (includes/circ-menu.inc and includes/member-display-address-style-*.inc) are not always displayed the same way. Sometimes the streetnumber is missing, sometimes it's the streettype. Sometimes the streettype is after the address, sometimes before... Test plan: Go on a patron detail page, and open all the tabs on the left (Check out, Fines, Notices, etc.) Without this patch, the patron's info displayed will differ from one page to another. With this patch, they will be displayed the same everywhere. Followed test plan, works as expected. (Tested both patches together.) Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com> Signed-off-by: Brendan Gallagher brendan@bywatersolutions.com
143 lines
3.9 KiB
Perl
Executable file
143 lines
3.9 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# 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 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.
|
|
#
|
|
# 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 Modern::Perl;
|
|
|
|
use CGI;
|
|
|
|
use C4::Auth;
|
|
use C4::Output;
|
|
use C4::Members;
|
|
use C4::Koha qw( getitemtypeinfo );
|
|
use C4::Circulation qw( GetIssuingCharges );
|
|
use C4::Reserves;
|
|
use C4::Items;
|
|
use Koha::Holds;
|
|
|
|
my $input = CGI->new;
|
|
my $borrowernumber = $input->param('borrowernumber');
|
|
|
|
my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
|
|
{
|
|
template_name => "members/moremember-print.tt",
|
|
query => $input,
|
|
type => "intranet",
|
|
authnotrequired => 0,
|
|
flagsrequired => { circulate => "circulate_remaining_permissions" },
|
|
debug => 1,
|
|
}
|
|
);
|
|
|
|
my $data = GetMember( 'borrowernumber' => $borrowernumber );
|
|
|
|
my ( $total, $accts, $numaccts ) = GetMemberAccountRecords($borrowernumber);
|
|
foreach my $accountline (@$accts) {
|
|
$accountline->{amount} = sprintf( '%.2f', $accountline->{amount} )
|
|
if ( $accountline->{amount} ) ;
|
|
$accountline->{amountoutstanding} = sprintf( '%.2f', $accountline->{amountoutstanding} )
|
|
if ( $accountline->{amountoutstanding} );
|
|
|
|
if ( $accountline->{accounttype} ne 'F'
|
|
&& $accountline->{accounttype} ne 'FU' )
|
|
{
|
|
$accountline->{printtitle} = 1;
|
|
}
|
|
}
|
|
|
|
our $totalprice = 0;
|
|
my $total_format = '';
|
|
$total_format = sprintf( "%.2f", $total ) if ($total);
|
|
|
|
my $holds_rs = Koha::Holds->search(
|
|
{ borrowernumber => $borrowernumber },
|
|
);
|
|
|
|
$template->param(
|
|
%$data,
|
|
|
|
borrowernumber => $borrowernumber,
|
|
|
|
accounts => $accts,
|
|
totaldue => $total_format,
|
|
|
|
issues => build_issue_data( GetPendingIssues($borrowernumber) ),
|
|
totalprice => $totalprice,
|
|
|
|
reserves => build_reserve_data( $holds_rs ),
|
|
);
|
|
|
|
output_html_with_http_headers $input, $cookie, $template->output;
|
|
|
|
sub build_issue_data {
|
|
my $issues = shift;
|
|
|
|
my $return = [];
|
|
|
|
my $today = DateTime->now( time_zone => C4::Context->tz );
|
|
$today->truncate( to => 'day' );
|
|
|
|
foreach my $issue ( @{$issues} ) {
|
|
|
|
my %row = %{$issue};
|
|
$totalprice += $issue->{replacementprice}
|
|
if ( $issue->{replacementprice} );
|
|
|
|
#find the charge for an item
|
|
my ( $charge, $itemtype ) =
|
|
GetIssuingCharges( $issue->{itemnumber}, $borrowernumber );
|
|
|
|
my $itemtypeinfo = getitemtypeinfo($itemtype);
|
|
$row{'itemtype_description'} = $itemtypeinfo->{description};
|
|
|
|
$row{'charge'} = sprintf( "%.2f", $charge );
|
|
|
|
$row{date_due} = $row{date_due_sql};
|
|
|
|
push( @{$return}, \%row );
|
|
}
|
|
|
|
@{$return} = sort { $a->{date_due} eq $b->{date_due} } @{$return};
|
|
|
|
return $return;
|
|
|
|
}
|
|
|
|
sub build_reserve_data {
|
|
my $reserves = shift;
|
|
|
|
my $return = [];
|
|
|
|
my $today = DateTime->now( time_zone => C4::Context->tz );
|
|
$today->truncate( to => 'day' );
|
|
|
|
while ( my $reserve = $reserves->next() ) {
|
|
|
|
my $row = {
|
|
title => $reserve->biblio()->title(),
|
|
author => $reserve->biblio()->author(),
|
|
reservedate => $reserve->reservedate(),
|
|
expirationdate => $reserve->expirationdate(),
|
|
waiting_at => $reserve->branch()->branchname(),
|
|
};
|
|
|
|
push( @{$return}, $row );
|
|
}
|
|
|
|
@{$return} = sort { $a->{reservedate} <=> $b->{reservedate} } @{$return};
|
|
|
|
return $return;
|
|
}
|