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 215-233 Link Here
215
                [% END %]
217
                [% END %]
216
            [% END # /tab_panel#holds %]
218
            [% END # /tab_panel#holds %]
217
219
218
            [% WRAPPER tab_panel tabname="bookings" %]
220
            [% IF Koha.Preference('EnableBooking') %]
219
                [% IF ( bookings_count ) %]
221
                [% WRAPPER tab_panel tabname="bookings" %]
220
                    <fieldset class="action filters" style="cursor:pointer;">
222
                    [% IF ( bookings_count ) %]
221
                        <a id="expired_filter" class="filtered"><i class="fa fa-bars"></i> Show expired</a>
223
                        <fieldset class="action filters" style="cursor:pointer;">
222
                    </fieldset>
224
                            <a id="expired_filter" class="filtered"><i class="fa fa-bars"></i> Show expired</a>
223
                    <table id="bookings_table" style="width: 100% !Important;"></table>
225
                        </fieldset>
224
                [% ELSIF ( expired_bookings_count ) %]
226
                        <table id="bookings_table" style="width: 100% !Important;"></table>
225
                    <fieldset class="action filters" style="cursor:pointer;">
227
                    [% ELSIF ( expired_bookings_count ) %]
226
                        <a id="expired_filter"><i class="fa fa-filter"></i> Hide expired</a>
228
                        <fieldset class="action filters" style="cursor:pointer;">
227
                    </fieldset>
229
                            <a id="expired_filter"><i class="fa fa-filter"></i> Hide expired</a>
228
                    <table id="bookings_table" style="width: 100% !Important;"></table>
230
                        </fieldset>
229
                [% ELSE %]
231
                        <table id="bookings_table" style="width: 100% !Important;"></table>
230
                    <p>Patron has nothing booked.</p>
232
                    [% ELSE %]
233
                        <p>Patron has nothing booked.</p>
234
                    [% END %]
231
                [% END %]
235
                [% END %]
232
            [% END %]
236
            [% END %]
233
        [% END %]
237
        [% END %]
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tt (-4 / +7 lines)
Lines 735-741 Link Here
735
            [% INCLUDE 'modals/resolve_return_claim.inc' %]
735
            [% INCLUDE 'modals/resolve_return_claim.inc' %]
736
        [% END %]
736
        [% END %]
737
737
738
        [% INCLUDE modals/cancel_booking.inc %]
738
        [% IF Koha.Preference('EnableBooking') %]
739
            [% INCLUDE modals/cancel_booking.inc %]
740
        [% END %]
739
741
740
[% MACRO jsinclude BLOCK %]
742
[% MACRO jsinclude BLOCK %]
741
    [% INCLUDE 'datatables.inc' %]
743
    [% INCLUDE 'datatables.inc' %]
Lines 770-776 Link Here
770
    [% END %]
772
    [% END %]
771
    [% Asset.js("js/holds.js") | $raw %]
773
    [% Asset.js("js/holds.js") | $raw %]
772
    [% INCLUDE 'calendar.inc' %]
774
    [% INCLUDE 'calendar.inc' %]
773
    [% Asset.js("js/cancel_booking_modal.js") | $raw %]
775
    [% IF Koha.Preference('EnableBooking') %]
776
        [% Asset.js("js/cancel_booking_modal.js") | $raw %]
777
        [% Asset.js("js/tables/bookings.js") | $raw %]
778
    [% END %]
774
    [% Asset.js("js/combobox.js") | $raw %]
779
    [% Asset.js("js/combobox.js") | $raw %]
775
    [% INCLUDE 'js-biblio-format.inc' %]
780
    [% INCLUDE 'js-biblio-format.inc' %]
776
    [% INCLUDE 'str/members-menu.inc' %]
781
    [% INCLUDE 'str/members-menu.inc' %]
Lines 840-846 Link Here
840
        });
845
        });
841
    </script>
846
    </script>
842
    [% Asset.js("js/checkouts.js") | $raw %]
847
    [% Asset.js("js/checkouts.js") | $raw %]
843
    [% Asset.js("js/tables/bookings.js") | $raw %]
844
[% END %]
848
[% END %]
845
849
846
[% INCLUDE 'intranet-bottom.inc' %]
850
[% INCLUDE 'intranet-bottom.inc' %]
847
- 

Return to bug 37661