Kyle M Hall
8848e72d78
The checkouts table is no longer keeping "today's checkouts" in the order they were scanned. Test Plan: 1) Create 3 records "Test 1", "Test 2" and "Test 3" each with one item 2) Check out the items to a patron in the order "Test 2", "Test 1", "Test 3". 3) Note the order is incorrect. 4) Apply this patch 5) Refresh the page 6) Note the order is now correct Signed-off-by: Owen Leonard <oleonard@myacpl.org> Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com> Note that the bug already exists before bug 12550. I checked on a 3.14.x branch (without the ajax circ stuff), and the order is the same as with this patch. Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
204 lines
6.3 KiB
Perl
Executable file
204 lines
6.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# Copyright 2014 ByWater Solutions
|
|
#
|
|
# 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 strict;
|
|
use warnings;
|
|
|
|
use CGI;
|
|
use JSON qw(to_json);
|
|
|
|
use C4::Auth qw(check_cookie_auth);
|
|
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
|
|
use C4::Circulation
|
|
qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
|
|
use C4::Context;
|
|
|
|
use Koha::DateUtils;
|
|
|
|
my $input = new CGI;
|
|
|
|
my ( $auth_status, $sessionID ) =
|
|
check_cookie_auth( $input->cookie('CGISESSID'),
|
|
{ circulate => 'circulate_remaining_permissions' } );
|
|
|
|
if ( $auth_status ne "ok" ) {
|
|
exit 0;
|
|
}
|
|
|
|
my @sort_columns = qw/date_due title itype issuedate branchcode itemcallnumber/;
|
|
|
|
my @borrowernumber = $input->param('borrowernumber');
|
|
my $offset = $input->param('iDisplayStart');
|
|
my $results_per_page = $input->param('iDisplayLength') || -1;
|
|
my $sorting_column = $sort_columns[ $input->param('iSortCol_0') ]
|
|
|| 'issuedate';
|
|
my $sorting_direction = $input->param('sSortDir_0') eq 'asc' ? 'asc' : 'desc';
|
|
|
|
$results_per_page = undef if ( $results_per_page == -1 );
|
|
|
|
binmode STDOUT, ":encoding(UTF-8)";
|
|
print $input->header( -type => 'text/plain', -charset => 'UTF-8' );
|
|
|
|
my @parameters;
|
|
my $sql = '
|
|
SELECT
|
|
issuedate,
|
|
date_due,
|
|
date_due < now() as date_due_overdue,
|
|
issues.timestamp,
|
|
|
|
biblionumber,
|
|
biblio.title,
|
|
author,
|
|
|
|
itemnumber,
|
|
barcode,
|
|
itemnotes,
|
|
itemcallnumber,
|
|
replacementprice,
|
|
|
|
issues.branchcode,
|
|
branchname,
|
|
|
|
itype,
|
|
itemtype,
|
|
|
|
borrowernumber,
|
|
surname,
|
|
firstname,
|
|
cardnumber,
|
|
|
|
DATEDIFF( issuedate, CURRENT_DATE() ) AS not_issued_today
|
|
FROM issues
|
|
LEFT JOIN items USING ( itemnumber )
|
|
LEFT JOIN biblio USING ( biblionumber )
|
|
LEFT JOIN biblioitems USING ( biblionumber )
|
|
LEFT JOIN borrowers USING ( borrowernumber )
|
|
LEFT JOIN branches ON ( issues.branchcode = branches.branchcode )
|
|
WHERE borrowernumber
|
|
';
|
|
|
|
if ( @borrowernumber == 1 ) {
|
|
$sql .= '= ?';
|
|
}
|
|
else {
|
|
$sql .= ' IN (' . join( ',', ('?') x @borrowernumber ) . ') ';
|
|
}
|
|
push( @parameters, @borrowernumber );
|
|
|
|
$sql .= " ORDER BY $sorting_column $sorting_direction ";
|
|
|
|
my $dbh = C4::Context->dbh();
|
|
my $sth = $dbh->prepare($sql);
|
|
$sth->execute(@parameters);
|
|
|
|
my $item_level_itypes = C4::Context->preference('item-level_itypes');
|
|
|
|
my @checkouts_today;
|
|
my @checkouts_previous;
|
|
while ( my $c = $sth->fetchrow_hashref() ) {
|
|
my ($charge) = GetIssuingCharges( $c->{itemnumber}, $c->{borrowernumber} );
|
|
|
|
my ( $can_renew, $can_renew_error ) =
|
|
CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
|
|
my $can_renew_date =
|
|
$can_renew_error eq 'too_soon'
|
|
? output_pref(
|
|
{
|
|
dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ),
|
|
as_due_date => 1
|
|
}
|
|
)
|
|
: undef;
|
|
|
|
my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
|
|
GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
|
|
|
|
my $checkout = {
|
|
DT_RowId => $c->{itemnumber} . '-' . $c->{borrowernumber},
|
|
title => $c->{title},
|
|
author => $c->{author},
|
|
barcode => $c->{barcode},
|
|
itemtype => $item_level_itypes ? $c->{itype} : $c->{itemtype},
|
|
itemnotes => $c->{itemnotes},
|
|
branchcode => $c->{branchcode},
|
|
branchname => $c->{branchname},
|
|
itemcallnumber => $c->{itemcallnumber} || q{},
|
|
charge => $charge,
|
|
price => $c->{replacementprice} || q{},
|
|
can_renew => $can_renew,
|
|
can_renew_error => $can_renew_error,
|
|
can_renew_date => $can_renew_date,
|
|
itemnumber => $c->{itemnumber},
|
|
borrowernumber => $c->{borrowernumber},
|
|
biblionumber => $c->{biblionumber},
|
|
issuedate => $c->{issuedate},
|
|
date_due => $c->{date_due},
|
|
date_due_overdue => $c->{date_due_overdue} ? JSON::true : JSON::false,
|
|
timestamp => $c->{timestamp},
|
|
renewals_count => $renewals_count,
|
|
renewals_allowed => $renewals_allowed,
|
|
renewals_remaining => $renewals_remaining,
|
|
issuedate_formatted => output_pref(
|
|
{
|
|
dt => dt_from_string( $c->{issuedate} ),
|
|
as_due_date => 1
|
|
}
|
|
),
|
|
date_due_formatted => output_pref(
|
|
{
|
|
dt => dt_from_string( $c->{date_due} ),
|
|
as_due_date => 1
|
|
}
|
|
),
|
|
subtitle => GetRecordValue(
|
|
'subtitle',
|
|
GetMarcBiblio( $c->{biblionumber} ),
|
|
GetFrameworkCode( $c->{biblionumber} )
|
|
),
|
|
borrower => {
|
|
surname => $c->{surname},
|
|
firstname => $c->{firstname},
|
|
cardnumber => $c->{cardnumber},
|
|
},
|
|
issued_today => !$c->{not_issued_today},
|
|
};
|
|
|
|
if ( $c->{not_issued_today} ) {
|
|
push( @checkouts_previous, $checkout );
|
|
}
|
|
else {
|
|
push( @checkouts_today, $checkout );
|
|
}
|
|
}
|
|
|
|
@checkouts_today = reverse(@checkouts_today)
|
|
if ( C4::Context->preference('todaysIssuesDefaultSortOrder') eq 'desc' );
|
|
@checkouts_previous = reverse(@checkouts_previous)
|
|
if ( C4::Context->preference('previousIssuesDefaultSortOrder') eq 'desc' );
|
|
|
|
my @checkouts = ( @checkouts_today, @checkouts_previous );
|
|
|
|
my $data;
|
|
$data->{'iTotalRecords'} = scalar @checkouts;
|
|
$data->{'iTotalDisplayRecords'} = scalar @checkouts;
|
|
$data->{'sEcho'} = $input->param('sEcho') || undef;
|
|
$data->{'aaData'} = \@checkouts;
|
|
|
|
print to_json($data);
|