X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=opac%2Fopac-user.pl;h=731caf8d467de4cf3aea5f45a24c80adb53d9ae6;hb=e191bb02bfda7f17ae8b4f681314c51d2e7e6b92;hp=a88bffbae788fef205ad6eb5977bbf1cf312d7b7;hpb=0ef6b0d5c618c2bd4d0ec942e870a6f989632ca0;p=koha.git diff --git a/opac/opac-user.pl b/opac/opac-user.pl index a88bffbae7..731caf8d46 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -12,9 +12,9 @@ # 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., 59 Temple Place, -# Suite 330, Boston, MA 02111-1307 USA +# 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; @@ -33,9 +33,9 @@ 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 Koha::DateUtils; use constant ATTRIBUTE_SHOW_BARCODE => 'SHOW_BCODE'; @@ -65,7 +65,10 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user( } ); -my $OPACDisplayRequestPriority = (C4::Context->preference("OPACDisplayRequestPriority")) ? 1 : 0; +my $show_priority; +for ( C4::Context->preference("OPACShowHoldQueueDetails") ) { + m/priority/ and $show_priority = 1; +} my $patronupdate = $query->param('patronupdate'); my $canrenew = 1; @@ -75,9 +78,6 @@ 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'} ); my $debar = CheckBorrowerDebarred($borrowernumber); @@ -87,7 +87,7 @@ if ($debar) { $userdebarred = 1; $template->param( 'userdebarred' => $userdebarred ); if ( $debar ne "9999-12-31" ) { - $borr->{'userdebarreddate'} = C4::Dates::format_date($debar); + $borr->{'userdebarreddate'} = $debar; } } @@ -105,11 +105,12 @@ if ( 5 >= $borr->{'amountoutstanding'} && $borr->{'amountoutstanding'} > 0 ) { 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( renewal_blocked_fines => sprintf( '%.02f', $no_renewal_amt ), + renewal_blocked_fines_amountoutstanding => sprintf( '%.02f', $borr->{amountoutstanding} ), ); } @@ -124,16 +125,19 @@ 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} && Date_to_Days( $today_year, $today_month, $today_day ) > Date_to_Days( $warning_year, $warning_month, $warning_day ) ) { + $borr->{'warnexpired'} = 1; } +elsif ( $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; + } +} + $template->param( BORROWER_INFO => \@bordat, borrowernumber => $borrowernumber, @@ -141,7 +145,6 @@ $template->param( BORROWER_INFO => \@bordat, OPACMySummaryHTML => (C4::Context->preference("OPACMySummaryHTML")) ? 1 : 0, surname => $borr->{surname}, showname => $borr->{showname}, - ); #get issued items .... @@ -151,61 +154,57 @@ my $overdues_count = 0; my @overdues; my @issuedat; my $itemtypes = GetItemTypes(); -my ($issues) = GetPendingIssues($borrowernumber); +my $issues = GetPendingIssues($borrowernumber); if ($issues){ - foreach my $issue ( sort { $b->{'date_due'} cmp $a->{'date_due'} } @$issues ) { - # check for reserves - my ( $restype, $res, undef ) = CheckReserves( $issue->{'itemnumber'} ); - if ( $restype ) { - $issue->{'reserved'} = 1; - } - - my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); - my $charges = 0; - foreach my $ac (@$accts) { - if ( $ac->{'itemnumber'} == $issue->{'itemnumber'} ) { - $charges += $ac->{'amountoutstanding'} - if $ac->{'accounttype'} eq 'F'; - $charges += $ac->{'amountoutstanding'} - if $ac->{'accounttype'} eq 'L'; - } - } - $issue->{'charges'} = $charges; - - # get publictype for icon - - my $publictype = $issue->{'publictype'}; - $issue->{$publictype} = 1; - - # check if item is renewable - my ($status,$renewerror) = CanBookBeRenewed( $borrowernumber, $issue->{'itemnumber'} ); - ($issue->{'renewcount'},$issue->{'renewsallowed'},$issue->{'renewsleft'}) = GetRenewCount($borrowernumber, $issue->{'itemnumber'}); + foreach my $issue ( sort { $b->{date_due}->datetime() cmp $a->{date_due}->datetime() } @{$issues} ) { + # check for reserves + my $restype = GetReserveStatus( $issue->{'itemnumber'} ); + if ( $restype ) { + $issue->{'reserved'} = 1; + } + + my ( $total , $accts, $numaccts) = GetMemberAccountRecords( $borrowernumber ); + my $charges = 0; + foreach my $ac (@$accts) { + 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; + $issue->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($issue->{'biblionumber'}), 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'; - - if ( $issue->{'overdue'} ) { - push @overdues, $issue; - $overdues_count++; - $issue->{'overdue'} = 1; - } - else { - $issue->{'issued'} = 1; - } - # imageurl: - my $itemtype = $issue->{'itemtype'}; - if ( $itemtype ) { - $issue->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} ); - $issue->{'description'} = $itemtypes->{$itemtype}->{'description'}; - } - $issue->{date_due} = format_date($issue->{date_due}); - push @issuedat, $issue; - $count++; - - my $isbn = GetNormalizedISBN($issue->{'isbn'}); - $issue->{normalized_isbn} = $isbn; + $issue->{'too_many'} = 1 if $renewerror and $renewerror eq 'too_many'; + $issue->{'on_reserve'} = 1 if $renewerror and $renewerror eq 'on_reserve'; + + if ( $issue->{'overdue'} ) { + push @overdues, $issue; + $overdues_count++; + $issue->{'overdue'} = 1; + } + else { + $issue->{'issued'} = 1; + } + # imageurl: + my $itemtype = $issue->{'itemtype'}; + if ( $itemtype ) { + $issue->{'imageurl'} = getitemtypeimagelocation( 'opac', $itemtypes->{$itemtype}->{'imageurl'} ); + $issue->{'description'} = $itemtypes->{$itemtype}->{'description'}; + } + push @issuedat, $issue; + $count++; + + my $isbn = GetNormalizedISBN($issue->{'isbn'}); + $issue->{normalized_isbn} = $isbn; # My Summary HTML if (my $my_summary_html = C4::Context->preference('OPACMySummaryHTML')){ @@ -217,7 +216,7 @@ if ($issues){ $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 ); @@ -253,24 +252,19 @@ $template->param( branchloop => \@branch_loop ); # now the reserved items.... my @reserves = GetReservesFromBorrowernumber( $borrowernumber ); foreach my $res (@reserves) { - $res->{'reservedate'} = format_date( $res->{'reservedate'} ); - if ( $res->{'expirationdate'} ne '0000-00-00' ) { - $res->{'expirationdate'} = format_date( $res->{'expirationdate'} ) - } else { + if ( $res->{'expirationdate'} eq '0000-00-00' ) { $res->{'expirationdate'} = ''; } - - my $publictype = $res->{'publictype'}; - $res->{$publictype} = 1; + $res->{'subtitle'} = GetRecordValue('subtitle', GetMarcBiblio($res->{'biblionumber'}), GetFrameworkCode($res->{'biblionumber'})); $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'}; - if ($OPACDisplayRequestPriority) { - $res->{'priority'} = '' if $res->{'priority'} eq '0'; + if ($show_priority) { + $res->{'priority'} ||= ''; } + $res->{'suspend_until'} = C4::Dates->new( $res->{'suspend_until'}, "iso")->output("syspref") if ( $res->{'suspend_until'} ); } # use Data::Dumper; @@ -278,7 +272,7 @@ foreach my $res (@reserves) { $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; @@ -294,7 +288,7 @@ foreach my $res (@reserves) { if ( ( $res->{'found'} eq 'W' ) ) { my $item = $res->{'itemnumber'}; $item = GetBiblioFromItemNumber($item,undef); - $res->{'wait'}= 1; + $res->{'wait'}= 1; $res->{'holdingbranch'}=$item->{'holdingbranch'}; $res->{'biblionumber'}=$item->{'biblionumber'}; $res->{'barcode'} = $item->{'barcode'}; @@ -310,7 +304,7 @@ foreach my $res (@reserves) { my ($transfertwhen, $transfertfrom, $transfertto) = GetTransfers( $res->{'itemnumber'} ); if ($transfertwhen) { $res->{intransit} = 1; - $res->{datesent} = format_date($transfertwhen); + $res->{datesent} = $transfertwhen; $res->{frombranch} = GetBranchName($transfertfrom); } } @@ -320,7 +314,7 @@ foreach my $res (@reserves) { # can be cancelled #$res->{'cancelable'} = 1 if ($res->{'wait'} && $res->{'atdestination'} && $res->{'found'} ne "1"); $res->{'cancelable'} = 1 if ($res->{wait} and not $res->{found}) or (not $res->{wait} and not $res->{intransit}); - + } $template->param( WAITING => \@waiting ); @@ -344,12 +338,12 @@ if (C4::Context->preference('BakerTaylorEnabled')) { if (C4::Context->preference("OPACAmazonCoverImages") or C4::Context->preference("GoogleJackets") or C4::Context->preference("BakerTaylorEnabled") or - C4::Context->preference("SyndeticsCoverImages")) { + C4::Context->preference("SyndeticsCoverImages")) { $template->param(JacketImages=>1); } if ( GetMessagesCount( $borrowernumber, 'B' ) ) { - $template->param( bor_messages => 1 ); + $template->param( bor_messages => 1 ); } if ( $borr->{'opacnote'} ) { @@ -360,13 +354,17 @@ if ( $borr->{'opacnote'} ) { } $template->param( - bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ), + bor_messages_loop => GetMessages( $borrowernumber, 'B', 'NONE' ), waiting_count => $wcount, - textmessaging => $borr->{textmessaging}, patronupdate => $patronupdate, OpacRenewalAllowed => C4::Context->preference("OpacRenewalAllowed"), userview => 1, - dateformat => C4::Context->preference("dateformat"), +); + +$template->param( + SuspendHoldsOpac => C4::Context->preference('SuspendHoldsOpac'), + AutoResumeSuspendedHolds => C4::Context->preference('AutoResumeSuspendedHolds'), + OpacHoldNotes => C4::Context->preference('OpacHoldNotes'), ); output_html_with_http_headers $query, $cookie, $template->output;