View | Details | Raw Unified | Return to bug 11703
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/strings.inc (-1 / +1 lines)
Lines 13-19 Link Here
13
    var BY = _("by _AUTHOR_");
13
    var BY = _("by _AUTHOR_");
14
    var ON_HOLD = _("On hold");
14
    var ON_HOLD = _("On hold");
15
    var NOT_RENEWABLE = _("Not renewable");
15
    var NOT_RENEWABLE = _("Not renewable");
16
    var NOT_RENEWABLE_TOO_SOON = _("Cannot renew, renewal is premature");
16
    var NOT_RENEWABLE_TOO_SOON = _("No renewal before %s");
17
    var RENEWALS_REMAINING = _("%s of %s renewals remaining");
17
    var RENEWALS_REMAINING = _("%s of %s renewals remaining");
18
    var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
18
    var HOLD_IS_SUSPENDED = _("Hold is <strong>suspended</strong>");
19
    var UNTIL = _("until %s");
19
    var UNTIL = _("until %s");
(-)a/koha-tmpl/intranet-tmpl/prog/en/js/checkouts.js (-1 / +1 lines)
Lines 238-244 $(document).ready(function() { Link Here
238
                        span_class = "renewals-allowed";
238
                        span_class = "renewals-allowed";
239
                    } else if ( oObj.can_renew_error == "too_soon" ) {
239
                    } else if ( oObj.can_renew_error == "too_soon" ) {
240
                        content += "<span class='renewals-disabled'>"
240
                        content += "<span class='renewals-disabled'>"
241
                                + NOT_RENEWABLE_TOO_SOON
241
                                + NOT_RENEWABLE_TOO_SOON.format( oObj.can_renew_date )
242
                                + "</span>";
242
                                + "</span>";
243
243
244
                        span_style = "display: none";
244
                        span_style = "display: none";
(-)a/svc/checkouts.pl (-2 / +12 lines)
Lines 27-33 use JSON qw(to_json); Link Here
27
27
28
use C4::Auth qw(check_cookie_auth);
28
use C4::Auth qw(check_cookie_auth);
29
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
29
use C4::Biblio qw(GetMarcBiblio GetFrameworkCode GetRecordValue );
30
use C4::Circulation qw(GetIssuingCharges CanBookBeRenewed GetRenewCount);
30
use C4::Circulation
31
  qw(GetIssuingCharges CanBookBeRenewed GetRenewCount GetSoonestRenewDate);
31
use C4::Context;
32
use C4::Context;
32
33
33
use Koha::DateUtils;
34
use Koha::DateUtils;
Lines 116-121 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
116
117
117
    my ( $can_renew, $can_renew_error ) =
118
    my ( $can_renew, $can_renew_error ) =
118
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
119
      CanBookBeRenewed( $c->{borrowernumber}, $c->{itemnumber} );
120
    my $can_renew_date =
121
      $can_renew_error eq 'too_soon'
122
      ? output_pref(
123
        {
124
            dt => GetSoonestRenewDate( $c->{borrowernumber}, $c->{itemnumber} ),
125
            as_due_date => 1
126
        }
127
      )
128
      : undef;
119
129
120
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
130
    my ( $renewals_count, $renewals_allowed, $renewals_remaining ) =
121
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
131
      GetRenewCount( $c->{borrowernumber}, $c->{itemnumber} );
Lines 134-139 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
134
        price          => $c->{replacementprice} || q{},
144
        price          => $c->{replacementprice} || q{},
135
        can_renew      => $can_renew,
145
        can_renew      => $can_renew,
136
        can_renew_error     => $can_renew_error,
146
        can_renew_error     => $can_renew_error,
147
        can_renew_date      => $can_renew_date,
137
        itemnumber          => $c->{itemnumber},
148
        itemnumber          => $c->{itemnumber},
138
        borrowernumber      => $c->{borrowernumber},
149
        borrowernumber      => $c->{borrowernumber},
139
        biblionumber        => $c->{biblionumber},
150
        biblionumber        => $c->{biblionumber},
140
- 

Return to bug 11703