c0b51eafdd
On printing the summary from the patron account, the hours are not displayed if needed. The as_date_due flag should be set to display it correctly. Problem, GetPendingIssues modify the value retrieved from the database. In order to not add regression and check all calls to GetPendingIssues, this patch backup the value before the change. Test plan: Check some items out, specify a hourly loan for some. Click on print > print summary and confirm the date due are correctly formatted. Followed test plan. Date + time display as expected. Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de> Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
106 lines
3 KiB
Perl
Executable file
106 lines
3 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 );
|
|
|
|
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};
|
|
$accountline->{amountoutstanding} = sprintf '%.2f',
|
|
$accountline->{amountoutstanding};
|
|
|
|
if ( $accountline->{accounttype} ne 'F'
|
|
&& $accountline->{accounttype} ne 'FU' )
|
|
{
|
|
$accountline->{printtitle} = 1;
|
|
}
|
|
}
|
|
|
|
my $roadtype =
|
|
C4::Koha::GetAuthorisedValueByCode( 'ROADTYPE', $data->{streettype} );
|
|
|
|
our $totalprice = 0;
|
|
$template->param(
|
|
%$data,
|
|
|
|
borrowernumber => $borrowernumber,
|
|
address => $data->{'streetnumber'} . " $roadtype " . $data->{'address'},
|
|
|
|
accounts => $accts,
|
|
totaldue => sprintf( "%.2f", $total ),
|
|
|
|
issues => build_issue_data( GetPendingIssues($borrowernumber) ),
|
|
totalprice => $totalprice,
|
|
);
|
|
|
|
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};
|
|
|
|
#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} <=> $b->{date_due} } @{$return};
|
|
|
|
return $return;
|
|
}
|