gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 11703 [QA Followup] - Restore showing earliest renewal date for 'too early' renewals 

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>

Signed-off-by: Christopher Brannon <cbrannon@cdalibrary.org>
This commit is contained in:
Kyle M Hall 2014-05-07 11:17:38 -04:00 committed by Tomas Cohen Arazi
parent b572115fb7
commit a31cac1693
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc
View File

@ -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 <strong>suspended</strong>");
var UNTIL = _("until %s");

2
koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js
View File

@ -238,7 +238,7 @@ $(document).ready(function() {
span_class = "renewals-allowed";
} else if ( oObj.can_renew_error == "too_soon" ) {
content += "<span class='renewals-disabled'>"
+ NOT_RENEWABLE_TOO_SOON
+ NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
+ "</span>";
span_style = "display: none";

13
svc/checkouts.pl
View File

@ -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},