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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc (-1 / +2 lines)
Lines 1-4 Link Here
1
[% USE raw %]
1
[% USE raw %]
2
[% USE Branches %]
2
[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
3
[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
3
[% SET return_claims = patron.return_claims %]
4
[% SET return_claims = patron.return_claims %]
4
5
Lines 190-196 Link Here
190
[% END # /IF WaitingHolds.count %]
191
[% END # /IF WaitingHolds.count %]
191
192
192
[% IF Koha.Preference("CurbsidePickup") %]
193
[% IF Koha.Preference("CurbsidePickup") %]
193
    [% SET curbside_pickups = patron.curbside_pickups.search( branchcode => logged_in_user.branchcode ) %]
194
    [% SET curbside_pickups = patron.curbside_pickups.search( branchcode => Branches.GetLoggedInBranchcode ) %]
194
    [% IF curbside_pickups.count %]
195
    [% IF curbside_pickups.count %]
195
        <div id="curbside_pickups" class="circmessage">
196
        <div id="curbside_pickups" class="circmessage">
196
            <h4>Curbside pickups scheduled here</h4>
197
            <h4>Curbside pickups scheduled here</h4>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt (-5 / +4 lines)
Lines 169-175 Link Here
169
                                                        [% END %]
169
                                                        [% END %]
170
                                                    </td>
170
                                                    </td>
171
                                                    <td>
171
                                                    <td>
172
                                                        [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
172
                                                        [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
173
                                                        [% FOREACH h IN waiting_holds %]
173
                                                        [% FOREACH h IN waiting_holds %]
174
                                                           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
174
                                                           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
175
                                                        [% END %]
175
                                                        [% END %]
Lines 239-245 Link Here
239
                                                        [% END %]
239
                                                        [% END %]
240
                                                    </td>
240
                                                    </td>
241
                                                    <td>
241
                                                    <td>
242
                                                        [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
242
                                                        [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
243
                                                        [% FOREACH h IN waiting_holds %]
243
                                                        [% FOREACH h IN waiting_holds %]
244
                                                           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
244
                                                           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
245
                                                        [% END %]
245
                                                        [% END %]
Lines 321-327 Link Here
321
                                                        [% END %]
321
                                                        [% END %]
322
                                                    </td>
322
                                                    </td>
323
                                                    <td>
323
                                                    <td>
324
                                                        [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
324
                                                        [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
325
                                                        [% FOREACH h IN waiting_holds %]
325
                                                        [% FOREACH h IN waiting_holds %]
326
                                                           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
326
                                                           <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% h.biblionumber | uri %]">[% h.biblio.title | html %]</a> ([% h.biblio.author | html %], <a href="/cgi-bin/koha/catalogue/moredetail.pl?itemnumber=[% h.itemnumber | html %]&biblionumber=[% h.biblionumber | html %]#item[% h.itemnumber | html %]">[% h.item.barcode | html %]</a>)<br/>
327
                                                        [% END %]
327
                                                        [% END %]
Lines 443-449 Link Here
443
                                <button type="submit" class="btn btn-default">Submit</button>
443
                                <button type="submit" class="btn btn-default">Submit</button>
444
                            </form>
444
                            </form>
445
                        [% ELSE %]
445
                        [% ELSE %]
446
                            [% SET waiting_holds = patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
446
                            [% SET waiting_holds = patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
447
                            [% IF !policy.enable_waiting_holds_only || waiting_holds.count > 0 %]
447
                            [% IF !policy.enable_waiting_holds_only || waiting_holds.count > 0 %]
448
                                <form id="create-pickup" method="post">
448
                                <form id="create-pickup" method="post">
449
                                    <fieldset class="rows" style="float: none;">
449
                                    <fieldset class="rows" style="float: none;">
450
- 

Return to bug 30650