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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron-detail-tabs.inc (-17 / +21 lines)
Lines 23-32 Link Here
23
            [% WRAPPER tab_item tabname= "holds" %]
23
            [% WRAPPER tab_item tabname= "holds" %]
24
                <span>Holds</span> ([% holds_count || 0 | html %])
24
                <span>Holds</span> ([% holds_count || 0 | html %])
25
            [% END %]
25
            [% END %]
26
            [% WRAPPER tab_item tabname="bookings" %]
26
            [% IF Koha.Preference('EnableBooking') %]
27
                [% SET bookings_count = patron.bookings.filter_by_active.count %]
27
                [% WRAPPER tab_item tabname="bookings" %]
28
                [% SET expired_bookings_count = patron.bookings.count - bookings_count %]
28
                    [% SET bookings_count = patron.bookings.filter_by_active.count %]
29
                <span class="bookings_count">Bookings ([% bookings_count || 0 | html %])</span>
29
                    [% SET expired_bookings_count = patron.bookings.count - bookings_count %]
30
                    <span class="bookings_count">Bookings ([% bookings_count || 0 | html %])</span>
31
                [% END %]
30
            [% END %]
32
            [% END %]
31
        [% END %]
33
        [% END %]
32
34
Lines 214-232 Link Here
214
                [% END %]
216
                [% END %]
215
            [% END # /tab_panel#holds %]
217
            [% END # /tab_panel#holds %]
216
218
217
            [% WRAPPER tab_panel tabname="bookings" %]
219
            [% IF Koha.Preference('EnableBooking') %]
218
                [% IF ( bookings_count ) %]
220
                [% WRAPPER tab_panel tabname="bookings" %]
219
                    <fieldset class="action filters" style="cursor:pointer;">
221
                    [% IF ( bookings_count ) %]
220
                        <a id="expired_filter" class="filtered"><i class="fa fa-bars"></i> Show expired</a>
222
                        <fieldset class="action filters" style="cursor:pointer;">
221
                    </fieldset>
223
                            <a id="expired_filter" class="filtered"><i class="fa fa-bars"></i> Show expired</a>
222
                    <table id="bookings_table" style="width: 100% !Important;"></table>
224
                        </fieldset>
223
                [% ELSIF ( expired_bookings_count ) %]
225
                        <table id="bookings_table" style="width: 100% !Important;"></table>
224
                    <fieldset class="action filters" style="cursor:pointer;">
226
                    [% ELSIF ( expired_bookings_count ) %]
225
                        <a id="expired_filter"><i class="fa fa-filter"></i> Hide expired</a>
227
                        <fieldset class="action filters" style="cursor:pointer;">
226
                    </fieldset>
228
                            <a id="expired_filter"><i class="fa fa-filter"></i> Hide expired</a>
227
                    <table id="bookings_table" style="width: 100% !Important;"></table>
229
                        </fieldset>
228
                [% ELSE %]
230
                        <table id="bookings_table" style="width: 100% !Important;"></table>
229
                    <p>Patron has nothing booked.</p>
231
                    [% ELSE %]
232
                        <p>Patron has nothing booked.</p>
233
                    [% END %]
230
                [% END %]
234
                [% END %]
231
            [% END %]
235
            [% END %]
232
        [% END %]
236
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-4 / +7 lines)
Lines 752-758 Link Here
752
    [% INCLUDE 'modals/resolve_return_claim.inc' %]
752
    [% INCLUDE 'modals/resolve_return_claim.inc' %]
753
[% END %]
753
[% END %]
754
754
755
[% INCLUDE modals/cancel_booking.inc %]
755
[% IF Koha.Preference('EnableBooking') %]
756
    [% INCLUDE modals/cancel_booking.inc %]
757
[% END %]
756
758
757
[% MACRO jsinclude BLOCK %]
759
[% MACRO jsinclude BLOCK %]
758
    [% INCLUDE 'datatables.inc' %]
760
    [% INCLUDE 'datatables.inc' %]
Lines 786-792 Link Here
786
    [% END %]
788
    [% END %]
787
    [% Asset.js("js/holds.js") | $raw %]
789
    [% Asset.js("js/holds.js") | $raw %]
788
    [% INCLUDE 'calendar.inc' %]
790
    [% INCLUDE 'calendar.inc' %]
789
    [% Asset.js("js/cancel_booking_modal.js") | $raw %]
791
    [% IF Koha.Preference('EnableBooking') %]
792
        [% Asset.js("js/cancel_booking_modal.js") | $raw %]
793
        [% Asset.js("js/tables/bookings.js") | $raw %]
794
    [% END %]
790
    [% Asset.js("js/combobox.js") | $raw %]
795
    [% Asset.js("js/combobox.js") | $raw %]
791
    [% INCLUDE 'js-biblio-format.inc' %]
796
    [% INCLUDE 'js-biblio-format.inc' %]
792
    [% INCLUDE 'str/members-menu.inc' %]
797
    [% INCLUDE 'str/members-menu.inc' %]
Lines 855-861 Link Here
855
        });
860
        });
856
    </script>
861
    </script>
857
    [% Asset.js("js/checkouts.js") | $raw %]
862
    [% Asset.js("js/checkouts.js") | $raw %]
858
    [% Asset.js("js/tables/bookings.js") | $raw %]
859
[% END %]
863
[% END %]
860
864
861
[% INCLUDE 'intranet-bottom.inc' %]
865
[% INCLUDE 'intranet-bottom.inc' %]
862
- 

Return to bug 37661