# 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::Members::AttributeTypes;
use C4::Members::Attributes qw/GetBorrowerAttributeValue/;
use C4::Output;
-use C4::Overdues qw/CheckBorrowerDebarred/;
use C4::Biblio;
use C4::Items;
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,
- flagsrequired => { borrow => 1 },
debug => 1,
}
);
+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 );
my ( $today_year, $today_month, $today_day) = Today();
my ($warning_year, $warning_month, $warning_day) = split /-/, $borr->{'dateexpiry'};
-$borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} );
-
-my $debar = CheckBorrowerDebarred($borrowernumber);
+my $debar = IsDebarred($borrowernumber);
my $userdebarred;
if ($debar) {
my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' );
$no_renewal_amt ||= 0;
-if ( $borr->{amountoutstanding} > $no_renewal_amt ) {
+if ( C4::Context->preference( 'OpacRenewalAllowed' ) && $borr->{amountoutstanding} > $no_renewal_amt ) {
$borr->{'flagged'} = 1;
$canrenew = 0;
$template->param(
$borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'};
-my @bordat;
-$bordat[0] = $borr;
-
# Warningdate is the date that the warning starts appearing
-if ( $borr->{dateexpiry} && C4::Context->preference('NotifyBorrowerDeparture') &&
- Date_to_Days(Add_Delta_Days($warning_year,$warning_month,$warning_day,- C4::Context->preference('NotifyBorrowerDeparture'))) <
- Date_to_Days( $today_year, $today_month, $today_day ) )
-{
- # borrower card soon to expire, warn the borrower
- $borr->{'warndeparture'} = $borr->{dateexpiry};
- if (C4::Context->preference('ReturnBeforeExpiry')){
- $borr->{'returnbeforeexpiry'} = 1;
+if ( $borr->{'dateexpiry'} && C4::Context->preference('NotifyBorrowerDeparture') ) {
+ my $days_to_expiry = Date_to_Days( $warning_year, $warning_month, $warning_day ) - Date_to_Days( $today_year, $today_month, $today_day );
+ if ( $days_to_expiry < 0 ) {
+ #borrower card has expired, warn the borrower
+ $borr->{'warnexpired'} = $borr->{'dateexpiry'};
+ } elsif ( $days_to_expiry < C4::Context->preference('NotifyBorrowerDeparture') ) {
+ # borrower card soon to expire, warn the borrower
+ $borr->{'warndeparture'} = $borr->{dateexpiry};
+ if (C4::Context->preference('ReturnBeforeExpiry')){
+ $borr->{'returnbeforeexpiry'} = 1;
+ }
}
}
-$template->param( BORROWER_INFO => \@bordat,
+# pass on any renew errors to the template for displaying
+my $renew_error = $query->param('renew_error');
+
+$template->param( BORROWER_INFO => $borr,
borrowernumber => $borrowernumber,
patron_flagged => $borr->{flagged},
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;
}
if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) {
$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->{'charges'} = $charges;
-
+ my $marcrecord = GetMarcBiblio( $issue->{'biblionumber'} );
+ $issue->{'subtitle'} = GetRecordValue('subtitle', $marcrecord, GetFrameworkCode($issue->{'biblionumber'}));
# check if item is renewable
my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} );
($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'});
if($status && C4::Context->preference("OpacRenewalAllowed")){
$issue->{'status'} = $status;
}
- $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many';
- $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve';
+
+ $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->{'norenew_overdue'} = 1 if $renewerror eq 'overdue';
+ $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;
+ $issue->{'soonestrenewdate'} = output_pref(
+ C4::Circulation::GetSoonestRenewDate(
+ $issue->{borrowernumber},
+ $issue->{itemnumber}
+ )
+ );
+ }
+ }
if ( $issue->{'overdue'} ) {
push @overdues, $issue;
my $isbn = GetNormalizedISBN($issue->{'isbn'});
$issue->{normalized_isbn} = $isbn;
+ $issue->{normalized_upc} = GetNormalizedUPC( $marcrecord, C4::Context->preference('marcflavour') );
# My Summary HTML
if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){
}
}
}
+my $overduesblockrenewing = C4::Context->preference('OverduesBlockRenewing');
+$canrenew = 0 if ($overduesblockrenewing ne 'allow' and $overdues_count == $count);
$template->param( ISSUES => \@issuedat );
$template->param( issues_count => $count );
$template->param( canrenew => $canrenew );
if ( $res->{'expirationdate'} eq '0000-00-00' ) {
$res->{'expirationdate'} = '';
}
-
+ $res->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($res->{'biblionumber'}), GetFrameworkCode($res->{'biblionumber'}));
$res->{'waiting'} = 1 if $res->{'found'} eq 'W';
$res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'};
my $biblioData = GetBiblioData($res->{'biblionumber'});
$res->{'reserves_title'} = $biblioData->{'title'};
+ $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'} );
+ if ( $res->{'suspend_until'} ) {
+ $res->{'suspend_until'} = output_pref({ dt => dt_from_string( $res->{'suspend_until'} , 'iso' ), dateonly => 1 });
+ }
}
# use Data::Dumper;
$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'};
}
$template->param(
- bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),
- waiting_count => $wcount,
- patronupdate => $patronupdate,
- OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
- userview => 1,
- dateformat => C4::Context->preference("dateformat"),
-);
-
-$template->param( DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar() );
-$template->param(
- SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
+ bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ),
+ waiting_count => $wcount,
+ patronupdate => $patronupdate,
+ OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"),
+ userview => 1,
+ SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'),
AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'),
+ OpacHoldNotes => C4::Context->preference('OpacHoldNotes'),
+ failed_holds => $query->param('failed_holds'),
);
-output_html_with_http_headers $query, $cookie, $template->output;
-
+output_html_with_http_headers $query, $cookie, $template->output, undef, { force_no_caching => 1 };
projects / koha.git / blobdiff