X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-user.pl;h=ff1fecf2d1a785ce5a95846a76e578622469fd69;hb=e93126834cddfb5e0f33f0f8df77e67ee2a68b48;hp=634b77a9db3a7c7a438a0d58e4548f71b522cf2f;hpb=a5e769253b9b75d3b418ac263b62b5573f0b6547;p=koha.git diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 634b77a9db..ff1fecf2d1 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -1,6 +1,7 @@ #!/usr/bin/perl # 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 @@ -26,13 +27,24 @@ use C4::Koha; use C4::Circulation; use C4::Reserves; use C4::Members; +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::Dates qw/format_date/; use C4::Letters; use C4::Branch; # GetBranches +use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE'; + +use Date::Calc qw( + Today + Add_Delta_Days + Date_to_Days +); + my $query = new CGI; BEGIN { @@ -55,17 +67,33 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0; my $patronupdate = $query->param('patronupdate'); +my $canrenew = 1; # 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'}; + for (qw(dateenrolled dateexpiry dateofbirth)) { ($borr->{$_}) and $borr->{$_} = format_date($borr->{$_}); } $borr->{'ethnicity'} = fixEthnicity( $borr->{'ethnicity'} ); -if ( $borr->{'debarred'} || $borr->{'gonenoaddress'} || $borr->{'lost'} ) { +my $debar = CheckBorrowerDebarred($borrowernumber); +my $userdebarred; + +if ($debar) { + $userdebarred = 1; + $template->param( 'userdebarred' => $userdebarred ); + if ( $debar ne "9999-12-31" ) { + $borr->{'userdebarreddate'} = C4::Dates::format_date($debar); + } +} + +if ( $userdebarred || $borr->{'gonenoaddress'} || $borr->{'lost'} ) { $borr->{'flagged'} = 1; + $canrenew = 0; } if ( $borr->{'amountoutstanding'} > 5 ) { @@ -74,11 +102,14 @@ if ( $borr->{'amountoutstanding'} > 5 ) { if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) { $borr->{'amountoverzero'} = 1; } +my $no_renewal_amt = C4::Context->preference( 'OPACFineNoRenewals' ); +$no_renewal_amt ||= 0; -if ( $borr->{'amountoutstanding'} > C4::Context->preference( 'OPACFineNoRenewals' ) ) { +if ( $borr->{amountoutstanding} > $no_renewal_amt ) { $borr->{'flagged'} = 1; + $canrenew = 0; $template->param( - renewal_blocked_fines => sprintf( "%.02f", C4::Context->preference( 'OPACFineNoRenewals' ) ), + renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ), ); } @@ -92,24 +123,39 @@ $borr->{'amountoutstanding'} = sprintf "%.02f", $borr->{'amountoutstanding'}; my @bordat; $bordat[0] = $borr; -$template->param( BORROWER_INFO => \@bordat, - borrowernumber => $borrowernumber, - patron_flagged => $borr->{flagged}, +# Warningdate is the date that the warning starts appearing +if ( 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; + } +} + +$template->param( BORROWER_INFO => \@bordat, + borrowernumber => $borrowernumber, + patron_flagged => $borr->{flagged}, + OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0, + surname => $borr->{surname}, + showname => $borr->{showname}, + ); #get issued items .... my $count = 0; -my $toggle = 0; my $overdues_count = 0; my @overdues; my @issuedat; my $itemtypes = GetItemTypes(); my ($issues) = GetPendingIssues($borrowernumber); if ($issues){ - foreach my $issue ( sort sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) { + foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) { # check for reserves - my ( $restype, $res ) = CheckReserves( $issue->{'itemnumber'} ); + my ( $restype, $res, undef ) = CheckReserves( $issue->{'itemnumber'} ); if ( $restype ) { $issue->{'reserved'} = 1; } @@ -134,7 +180,9 @@ if ($issues){ # check if item is renewable my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} ); ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'}); - $issue->{'status'} = $status && C4::Context->preference("OpacRenewalAllowed"); + 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'; @@ -158,24 +206,46 @@ if ($issues){ my $isbn = GetNormalizedISBN($issue->{'isbn'}); $issue->{normalized_isbn} = $isbn; + + # My Summary HTML + if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){ + $issue->{author} ? $my_summary_html =~ s/{AUTHOR}/$issue->{author}/g : $my_summary_html =~ s/{AUTHOR}//g; + $issue->{title} =~ s/\/+$//; # remove trailing slash + $issue->{title} =~ s/\s+$//; # remove trailing space + $issue->{title} ? $my_summary_html =~ s/{TITLE}/$issue->{title}/g : $my_summary_html =~ s/{TITLE}//g; + $issue->{isbn} ? $my_summary_html =~ s/{ISBN}/$isbn/g : $my_summary_html =~ s/{ISBN}//g; + $issue->{biblionumber} ? $my_summary_html =~ s/{BIBLIONUMBER}/$issue->{biblionumber}/g : $my_summary_html =~ s/{BIBLIONUMBER}//g; + $issue->{MySummaryHTML} = $my_summary_html; + } } } $template->param( ISSUES => \@issuedat ); $template->param( issues_count => $count ); - +$template->param( canrenew => $canrenew ); $template->param( OVERDUES => \@overdues ); $template->param( overdues_count => $overdues_count ); +my $show_barcode = C4::Members::AttributeTypes::AttributeTypeExists( ATTRIBUTE_SHOW_BARCODE ); +if ($show_barcode) { + my $patron_show_barcode = GetBorrowerAttributeValue($borrowernumber, ATTRIBUTE_SHOW_BARCODE); + undef $show_barcode if defined($patron_show_barcode) && !$patron_show_barcode; +} +$template->param( show_barcode => 1 ) if $show_barcode; + # load the branches my $branches = GetBranches(); my @branch_loop; -for my $branch_hash (sort keys %$branches ) { - my $selected=(C4::Context->userenv && ($branch_hash eq C4::Context->userenv->{branch})) if (C4::Context->preference('SearchMyLibraryFirst')); +for my $branch_hash ( sort keys %{$branches} ) { + my $selected; + if ( C4::Context->preference('SearchMyLibraryFirst') ) { + $selected = + ( C4::Context->userenv + && ( $branch_hash eq C4::Context->userenv->{branch} ) ); + } push @branch_loop, - { - value => "branch: $branch_hash", + { value => "branch: $branch_hash", branchname => $branches->{$branch_hash}->{'branchname'}, - selected => $selected + selected => $selected, }; } $template->param( branchloop => \@branch_loop ); @@ -194,6 +264,7 @@ foreach my $res (@reserves) { my $publictype = $res->{'publictype'}; $res->{$publictype} = 1; $res->{'waiting'} = 1 if $res->{'found'} eq 'W'; + $res->{'formattedwaitingdate'} = format_date($res->{'waitingdate'}); $res->{'branch'} = $branches->{ $res->{'branchcode'} }->{'branchname'}; my $biblioData = GetBiblioData($res->{'biblionumber'}); $res->{'reserves_title'} = $biblioData->{'title'}; @@ -226,7 +297,7 @@ foreach my $res (@reserves) { $res->{'wait'}= 1; $res->{'holdingbranch'}=$item->{'holdingbranch'}; $res->{'biblionumber'}=$item->{'biblionumber'}; - $res->{'barcodenumber'} = $item->{'barcode'}; + $res->{'barcode'} = $item->{'barcode'}; $res->{'wbrcode'} = $res->{'branchcode'}; $res->{'itemnumber'} = $res->{'itemnumber'}; $res->{'wbrname'} = $branches->{$res->{'branchcode'}}->{'branchname'};