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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/recalls.inc (-20 / +18 lines)
Lines 41-49 Link Here
41
                            <td class="recall-patron"> [% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 link_to="circulation_recalls" %] </td>
41
                            <td class="recall-patron"> [% INCLUDE 'patron-title.inc' patron=recall.patron hide_patron_infos_if_needed=1 link_to="circulation_recalls" %] </td>
42
                        [% END %]
42
                        [% END %]
43
43
44
                        <td class="recall-date"> [% recall.created_date | $KohaDates %] </td>
44
                        <td class="recall-date" data-order="[% recall.created_date | html %]"> [% recall.created_date | $KohaDates %] </td>
45
45
46
                        <td class="recall-expiry">
46
                        <td class="recall-expiry" data-order="[% recall.expiration_date | html %]">
47
                            [% IF ( recall.expiration_date ) %]
47
                            [% IF ( recall.expiration_date ) %]
48
                                [% recall.expiration_date | $KohaDates %]
48
                                [% recall.expiration_date | $KohaDates %]
49
                            [% ELSIF ( !recall.completed ) %]
49
                            [% ELSIF ( !recall.completed ) %]
Lines 74-80 Link Here
74
                        </td>
74
                        </td>
75
75
76
                        [% UNLESS viewing_old %]
76
                        [% UNLESS viewing_old %]
77
                            <td class="recall-duedate">
77
                            <td class="recall-duedate" data-order="[% recall.checkout.date_due | html %]">
78
                                [% IF recall.requested and recall.checkout %]
78
                                [% IF recall.requested and recall.checkout %]
79
                                    <span>Due to be returned by [% recall.checkout.date_due | $KohaDates %]</span>
79
                                    <span>Due to be returned by [% recall.checkout.date_due | $KohaDates %]</span>
80
                                [% ELSIF recall.waiting and RECALL.expiration_date %]
80
                                [% ELSIF recall.waiting and RECALL.expiration_date %]
Lines 94-120 Link Here
94
                                        <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Actions </button>
94
                                        <button type="button" class="btn btn-sm btn-default dropdown-toggle" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> Actions </button>
95
                                        <ul class="dropdown-menu dropdown-menu-end">
95
                                        <ul class="dropdown-menu dropdown-menu-end">
96
                                            [% IF ( recall.requested or recall.overdue ) %]
96
                                            [% IF ( recall.requested or recall.overdue ) %]
97
                                                <li
97
                                                <li>
98
                                                    ><a class="cancel_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel</a></li
98
                                                    <a class="cancel_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel</a>
99
                                                >
99
                                                </li>
100
                                                [% IF ( recall.should_be_overdue ) %]
100
                                                [% IF ( recall.should_be_overdue ) %]
101
                                                    <li
101
                                                    <li>
102
                                                        ><a class="overdue_recall" data-id="[% recall.id | html %]"><i class="fa fa-hourglass-end"></i> Mark as overdue</a></li
102
                                                        <a class="overdue_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-hourglass-end"></i> Mark as overdue</a>
103
                                                    >
103
                                                    </li>
104
                                                [% END %]
104
                                                [% END %]
105
                                            [% ELSIF ( recall.waiting ) %]
105
                                            [% ELSIF ( recall.waiting ) %]
106
                                                <li
106
                                                <li>
107
                                                    ><a class="revert_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-undo"></i> Revert waiting</a></li
107
                                                    <a class="revert_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-undo"></i> Revert waiting</a>
108
                                                >
108
                                                </li>
109
                                                <li
109
                                                <li>
110
                                                    ><a class="expire_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Expire</a></li
110
                                                    <a class="expire_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Expire</a>
111
                                                >
111
                                                </li>
112
                                            [% ELSIF ( recall.in_transit ) %]
112
                                            [% ELSIF ( recall.in_transit ) %]
113
                                                <li
113
                                                <li>
114
                                                    ><a class="transit_recall dropdown-item" data-id="[% recall.id | html %]"
114
                                                    <a class="transit_recall dropdown-item" data-id="[% recall.id | html %]"><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a>
115
                                                        ><i class="fa fa-times"></i> Cancel recall and return to: [% Branches.GetName(recall.item.homebranch) | html %]</a
115
                                                </li>
116
                                                    ></li
117
                                                >
118
                                            [% END %]
116
                                            [% END %]
119
                                        </ul>
117
                                        </ul>
120
                                    </div>
118
                                    </div>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/recallshistory.tt (-4 / +5 lines)
Lines 40-48 Link Here
40
    [% INCLUDE 'members-toolbar.inc' %]
40
    [% INCLUDE 'members-toolbar.inc' %]
41
    <h1>Recalls history</h1>
41
    <h1>Recalls history</h1>
42
    [% IF Koha.Preference('UseRecalls') %]
42
    [% IF Koha.Preference('UseRecalls') %]
43
        <input type="checkbox" id="hide_old" name="hide_old" checked="checked" />
43
        [% IF recalls.count %]
44
        <label for="hide_old">Show old recalls</label>
44
            <input type="checkbox" id="hide_old" name="hide_old" checked="checked" />
45
        [% INCLUDE 'recalls.inc' %]
45
            <label for="hide_old">Show old recalls</label>
46
        [% END %]
47
        <div class="page-section"> [% INCLUDE 'recalls.inc' %] </div>
46
    [% ELSE %]
48
    [% ELSE %]
47
        <div class="alert alert-info">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
49
        <div class="alert alert-info">Recalls have not been enabled. Enable the <a href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">UseRecalls</a> system preference to use recalls.</div>
48
    [% END %]
50
    [% END %]
49
- 

Return to bug 40568