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

(-)a/koha-tmpl/intranet-tmpl/prog/js/checkouts.js (-14 / +5 lines)
Lines 522-534 $(document).ready(function() { Link Here
522
                                    + __("No renewal before %s").format(oObj.can_renew_date)
522
                                    + __("No renewal before %s").format(oObj.can_renew_date)
523
                                    + "</span>";
523
                                    + "</span>";
524
524
525
                            span_style = "display: none";
526
                            span_class = "renewals-allowed";
527
                        } else if ( oObj.can_renew_error == "auto_too_soon" ) {
528
                            msg += "<span class='renewals-disabled'>"
529
                                    + __("Scheduled for automatic renewal")
530
                                    + "</span>";
531
532
                            span_style = "display: none";
525
                            span_style = "display: none";
533
                            span_class = "renewals-allowed";
526
                            span_class = "renewals-allowed";
534
                        } else if ( oObj.can_renew_error == "auto_too_late" ) {
527
                        } else if ( oObj.can_renew_error == "auto_too_late" ) {
Lines 550-562 $(document).ready(function() { Link Here
550
                                    + __("Automatic renewal failed, account expired")
543
                                    + __("Automatic renewal failed, account expired")
551
                                    + "</span>";
544
                                    + "</span>";
552
545
553
                            span_style = "display: none";
554
                            span_class = "renewals-allowed";
555
                        } else if ( oObj.can_renew_error == "auto_renew" ) {
556
                            msg += "<span class='renewals-disabled'>"
557
                                    + __("Scheduled for automatic renewal")
558
                                    + "</span>";
559
560
                            span_style = "display: none";
546
                            span_style = "display: none";
561
                            span_class = "renewals-allowed";
547
                            span_class = "renewals-allowed";
562
                        } else if ( oObj.can_renew_error == "onsite_checkout" ) {
548
                        } else if ( oObj.can_renew_error == "onsite_checkout" ) {
Lines 604-609 $(document).ready(function() { Link Here
604
                            }
590
                            }
605
                            content += ")</span>";
591
                            content += ")</span>";
606
                        }
592
                        }
593
                        if(oObj.auto_renew){
594
                            content += "<span class='renewals-info'>(";
595
                            content += __("Scheduled for automatic renewal");
596
                            content += ")</span>";
597
                        }
607
598
608
                        return content;
599
                        return content;
609
                    }
600
                    }
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-8 / +3 lines)
Lines 500-516 Link Here
500
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
500
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
501
                                                                [% END %]
501
                                                                [% END %]
502
                                                            )</span>
502
                                                            )</span>
503
                                                        [% ELSIF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
504
                                                            <span class="usr-msg automatic-renewal">Automatic renewal</span>
505
                                                            <span class="renewals">(
506
                                                                [% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining
507
                                                                [% IF Koha.Preference('UnseenRenewals') && ISSUE.unseenallowed %]
508
                                                                    / [% ISSUE.unseenleft | html %] of [% ISSUE.unseenallowed | html %] renewals left before the item must be seen by the library
509
                                                                [% END %]
510
                                                            )</span>
511
                                                        [% ELSIF ( ISSUE.item_denied_renewal ) %]
503
                                                        [% ELSIF ( ISSUE.item_denied_renewal ) %]
512
                                                            Renewal not allowed
504
                                                            Renewal not allowed
513
                                                        [% END %]
505
                                                        [% END %]
506
                                                        [% IF ( ISSUE.auto_renew || ISSUE.auto_too_soon ) %]
507
                                                            <br><span class="usr-msg automatic-renewal">This item is scheduled for auto renewal.</span>
508
                                                        [% END %]
514
                                                        </td>
509
                                                        </td>
515
                                                    [% END %]
510
                                                    [% END %]
516
                                                    [% IF ( OPACFinesTab ) %]
511
                                                    [% IF ( OPACFinesTab ) %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt (-3 / +4 lines)
Lines 356-364 Link Here
356
                                                                    <input type="submit" value="Renew item" class="btn btn-primary btn-sm renew" />
356
                                                                    <input type="submit" value="Renew item" class="btn btn-primary btn-sm renew" />
357
                                                                [% END %]
357
                                                                [% END %]
358
                                                            [% ELSE %]
358
                                                            [% ELSE %]
359
                                                                [% IF ISSUE.renew_error == 'auto_renew' OR ISSUE.renew_error == 'auto_too_soon' %]
359
                                                                [% IF ISSUE.renew_error == 'onsite_checkout' %]
360
                                                                    <span>This item has been scheduled for automatic renewal and cannot be renewed</span>
361
                                                                [% ELSIF ISSUE.renew_error == 'onsite_checkout' %]
362
                                                                    <span>This is a on-site checkout, it cannot be renewed.</span>
360
                                                                    <span>This is a on-site checkout, it cannot be renewed.</span>
363
                                                                [% ELSIF ISSUE.renew_error == 'too_unseen' %]
361
                                                                [% ELSIF ISSUE.renew_error == 'too_unseen' %]
364
                                                                    <span>You have renewed this item the maximum number of consecutive times without it being seen by the library.</span>
362
                                                                    <span>You have renewed this item the maximum number of consecutive times without it being seen by the library.</span>
Lines 373-378 Link Here
373
                                                                    <input type="hidden" name="confirmed" value=""  />
371
                                                                    <input type="hidden" name="confirmed" value=""  />
374
                                                                [% END %]
372
                                                                [% END %]
375
                                                            [% END %]
373
                                                            [% END %]
374
                                                            [% IF ISSUE.auto_renew %]
375
                                                                <br><span>This item is scheduled for automatic renewal</span>
376
                                                            [% END %]
376
                                                        </form>
377
                                                        </form>
377
                                                    </td>
378
                                                    </td>
378
                                                    [% UNLESS ( nofines ) %]
379
                                                    [% UNLESS ( nofines ) %]
(-)a/svc/checkouts (-1 / +2 lines)
Lines 72-77 my $sql = ' Link Here
72
        issues.date_due,
72
        issues.date_due,
73
        issues.date_due < now() as date_due_overdue,
73
        issues.date_due < now() as date_due_overdue,
74
        issues.timestamp,
74
        issues.timestamp,
75
        issues.auto_renew,
75
76
76
        issues.onsite_checkout,
77
        issues.onsite_checkout,
77
78
Lines 272-277 while ( my $c = $sth->fetchrow_hashref() ) { Link Here
272
        date_due            => $c->{date_due},
273
        date_due            => $c->{date_due},
273
        date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
274
        date_due_overdue    => $c->{date_due_overdue} ? JSON::true : JSON::false,
274
        timestamp           => $c->{timestamp},
275
        timestamp           => $c->{timestamp},
276
        auto_renew          => $c->{auto_renew},
275
        onsite_checkout     => $c->{onsite_checkout},
277
        onsite_checkout     => $c->{onsite_checkout},
276
        enumchron           => $c->{enumchron},
278
        enumchron           => $c->{enumchron},
277
        renewals_count      => $renewals_count,
279
        renewals_count      => $renewals_count,
278
- 

Return to bug 25393