# This file is part of Koha.
# parts copyright 2010 BibLibre
#
-# 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 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.
+# 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.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
use strict;
#use warnings; FIXME - Bug 2505
-use CGI;
+use CGI qw ( -utf8 );
use C4::Auth;
use C4::Koha;
use C4::Letters;
use C4::Branch; # GetBranches
use Koha::DateUtils;
+use Koha::Borrower::Debarments qw(IsDebarred);
use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE';
my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
{
- template_name => "opac-user.tmpl",
+ template_name => "opac-user.tt",
query => $query,
type => "opac",
authnotrequired => 0,
}
);
-my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0;
+my %renewed = map { $_ => 1 } split( ':', $query->param('renewed') );
+
+my $show_priority;
+for ( C4::Context->preference("OPACShowHoldQueueDetails") ) {
+ m/priority/ and $show_priority = 1;
+}
+
my $patronupdate = $query->param('patronupdate');
my $canrenew = 1;
+$template->param( shibbolethAuthentication => C4::Context->config('useshibboleth') );
+
# get borrower information ....
my ( $borr ) = GetMemberDetails( $borrowernumber );
$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
-my $debar = $borr->{'debarred'};
+my $debar = IsDebarred($borrowernumber);
my $userdebarred;
if ($debar) {
$canrenew = 0;
$template->param(
renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ),
+ renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ),
);
}
}
# pass on any renew errors to the template for displaying
-$template->param( RENEW_ERROR => $query->param('renew_error') ) if $query->param('renew_error');
+my $renew_error = $query->param('renew_error');
$template->param( BORROWER_INFO => \@bordat,
borrowernumber => $borrowernumber,
OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0,
surname => $borr->{surname},
showname => $borr->{showname},
+ RENEW_ERROR => $renew_error,
+ borrower => $borr,
);
#get issued items ....
if ($issues){
foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) {
# check for reserves
- my ( $restype, $res, undef ) = CheckReserves( $issue->{'itemnumber'} );
+ my $restype = GetReserveStatus( $issue->{'itemnumber'} );
if ( $restype ) {
$issue->{'reserved'} = 1;
}
$charges += $ac->{'amountoutstanding'}
if $ac->{'accounttype'} eq 'F';
$charges += $ac->{'amountoutstanding'}
+ if $ac->{'accounttype'} eq 'FU';
+ $charges += $ac->{'amountoutstanding'}
if $ac->{'accounttype'} eq 'L';
}
}
$issue->{'status'} = $status;
}
+ $issue->{'renewed'} = $renewed{ $issue->{'itemnumber'} };
+
if ($renewerror) {
- $issue->{'too_many'} = 1 if $renewerror eq 'too_many';
- $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
+ $issue->{'too_many'} = 1 if $renewerror eq 'too_many';
+ $issue->{'on_reserve'} = 1 if $renewerror eq 'on_reserve';
+ $issue->{'auto_renew'} = 1 if $renewerror eq 'auto_renew';
+ $issue->{'auto_too_soon'} = 1 if $renewerror eq 'auto_too_soon';
if ( $renewerror eq 'too_soon' ) {
$issue->{'too_soon'} = 1;
$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
my $biblioData = GetBiblioData($res->{'biblionumber'});
$res->{'reserves_title'} = $biblioData->{'title'};
- if ($OPACDisplayRequestPriority) {
- $res->{'priority'} = '' if $res->{'priority'} eq '0';
+ $res->{'author'} = $biblioData->{'author'};
+
+ if ($show_priority) {
+ $res->{'priority'} ||= '';
}
$res->{'suspend_until'} = C4::Dates->new( $res->{'suspend_until'}, "iso")->output("syspref") if ( $res->{'suspend_until'} );
}
$template->param( RESERVES => \@reserves );
$template->param( reserves_count => $#reserves+1 );
-$template->param( showpriority=>1 ) if $OPACDisplayRequestPriority;
+$template->param( showpriority=>$show_priority );
my @waiting;
my $wcount = 0;
$res->{'holdingbranch'} =
$branches->{ $item->{'holdingbranch'} }->{'branchname'};
$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
+ $res->{'enumchron'} = $item->{'enumchron'} if $item->{'enumchron'};
# get document reserve status
my $biblioData = GetBiblioData($res->{'biblionumber'});
$res->{'waiting_title'} = $biblioData->{'title'};
patronupdate => $patronupdate,
OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
userview => 1,
- dateformat => C4::Context->preference("dateformat"),
);
$template->param(