From 8f109062762a3f79e408534731310deb041fde9c Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Wed, 7 May 2014 11:17:38 -0400 Subject: [PATCH] Bug 11703 [QA Followup] - Restore showing earliest renewal date for 'too early' renewals --- .../intranet-tmpl/prog/en/includes/strings.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js | 2 +- svc/checkouts.pl | 13 ++++++++++++- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc index 536a055..df9ca78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc @@ -13,7 +13,7 @@ var BY = _("by _AUTHOR_"); var ON_HOLD = _("On hold"); var NOT_RENEWABLE = _("Not renewable"); - var NOT_RENEWABLE_TOO_SOON = _("Cannot renew, renewal is premature"); + var NOT_RENEWABLE_TOO_SOON = _("No renewal before %s"); var RENEWALS_REMAINING = _("%s of %s renewals remaining"); var HOLD_IS_SUSPENDED = _("Hold is suspended"); var UNTIL = _("until %s"); diff --git a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js index 4ab7be1..11dcc42 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js +++ b/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js @@ -238,7 +238,7 @@ $(document).ready(function() { span_class = "renewals-allowed"; } else if ( oObj.can_renew_error == "too_soon" ) { content += "" - + NOT_RENEWABLE_TOO_SOON + + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date ) + ""; span_style = "display: none"; diff --git a/svc/checkouts.pl b/svc/checkouts.pl index bcb3444..9de51ac 100755 --- a/svc/checkouts.pl +++ b/svc/checkouts.pl @@ -27,7 +27,8 @@ use JSON qw(to_json); use C4::Auth qw(check_cookie_auth); use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue ); -use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount); +use C4::Circulation + qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate); use C4::Context; use Koha::DateUtils; @@ -116,6 +117,15 @@ while ( my $c = $sth->fetchrow_hashref() ) { my ( $can_renew, $can_renew_error ) = CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} ); + my $can_renew_date = + $can_renew_error eq 'too_soon' + ? output_pref( + { + dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ), + as_due_date => 1 + } + ) + : undef; my ( $renewals_count, $renewals_allowed, $renewals_remaining ) = GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} ); @@ -134,6 +144,7 @@ while ( my $c = $sth->fetchrow_hashref() ) { price => $c->{replacementprice} || q{}, can_renew => $can_renew, can_renew_error => $can_renew_error, + can_renew_date => $can_renew_date, itemnumber => $c->{itemnumber}, borrowernumber => $c->{borrowernumber}, biblionumber => $c->{biblionumber}, -- 1.7.2.5