From 054a155183c4970d700ab66d41733d5469284aae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20V=C3=A9ron?= Date: Tue, 21 Jun 2016 18:28:47 +0200 Subject: [PATCH] Bug 13796: OPAC: Display rental charge for renewing This patch displays the rental fee that will be applied for renewing (near "Renew" link on patron's summary page) To test: - Apply patch - Verify that you have item types with and without rental fee for testing - Issue items with an without rental fee to a patron - In OPAC, display patron's summary page - Verify in table 'Checked out', items with rental charge display an information as appropriate (near the link 'Renew') Signed-off-by: Sally Healey --- koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt | 4 ++++ opac/opac-user.pl | 1 + 2 files changed, 5 insertions(+) diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index f31f47e..d81c07a 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -2,6 +2,7 @@ [% USE KohaDates %] [% USE Branches %] [% USE ItemTypes %] +[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] [% IF ( LibraryNameTitle ) %][% LibraryNameTitle %][% ELSE %]Koha online[% END %] catalog › Your library home @@ -235,6 +236,9 @@ [% IF ( ISSUE.status ) %] [% IF ( canrenew ) %] Renew + [% IF ISSUE.renewalfee > 0 %] + Fee for [% ItemTypes.GetDescription( ISSUE.renewalitemtype) %] [% ISSUE.renewalfee | $Price %] + [% END %] [% END %] ([% ISSUE.renewsleft %] of [% ISSUE.renewsallowed %] renewals remaining) [% ELSIF ( ISSUE.too_many ) %] diff --git a/opac/opac-user.pl b/opac/opac-user.pl index 413c26d..64afe08 100755 --- a/opac/opac-user.pl +++ b/opac/opac-user.pl @@ -192,6 +192,7 @@ 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->{'renewalfee'}, $issue->{'renewalitemtype'} ) = GetIssuingCharges( $issue->{'itemnumber'}, $borrowernumber ); if($status && C4::Context->preference("OpacRenewalAllowed")){ $issue->{'status'} = $status; } -- 1.7.10.4