@@ -, +, @@
---
.../intranet-tmpl/prog/en/includes/patron_messages.inc | 3 ++-
.../prog/en/modules/circ/curbside_pickups.tt | 8 ++++----
2 files changed, 6 insertions(+), 5 deletions(-)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
+++ a/koha-tmpl/intranet-tmpl/prog/en/includes/patron_messages.inc
@@ -1,4 +1,5 @@
[% USE raw %]
+[% USE Branches %]
[% SET ClaimReturnedWarningThreshold = Koha.Preference('ClaimReturnedWarningThreshold') %]
[% SET return_claims = patron.return_claims %]
@@ -190,7 +191,7 @@
[% END # /IF WaitingHolds.count %]
[% IF Koha.Preference("CurbsidePickup") %]
- [% SET curbside_pickups = patron.curbside_pickups.search( branchcode => logged_in_user.branchcode ) %]
+ [% SET curbside_pickups = patron.curbside_pickups.search( branchcode => Branches.GetLoggedInBranchcode ) %]
[% IF curbside_pickups.count %]
Curbside pickups scheduled here
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt
@@ -169,7 +169,7 @@
[% END %]
- [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
+ [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
[% FOREACH h IN waiting_holds %]
[% h.biblio.title | html %] ([% h.biblio.author | html %], [% h.item.barcode | html %])
[% END %]
@@ -239,7 +239,7 @@
[% END %]
|
- [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
+ [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
[% FOREACH h IN waiting_holds %]
[% h.biblio.title | html %] ([% h.biblio.author | html %], [% h.item.barcode | html %])
[% END %]
@@ -321,7 +321,7 @@
[% END %]
|
- [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
+ [% SET waiting_holds = cp.patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
[% FOREACH h IN waiting_holds %]
[% h.biblio.title | html %] ([% h.biblio.author | html %], [% h.item.barcode | html %])
[% END %]
@@ -443,7 +443,7 @@
[% ELSE %]
- [% SET waiting_holds = patron.holds.search( found => 'W', branchcode => logged_in_user.branchcode ) %]
+ [% SET waiting_holds = patron.holds.search( found => 'W', branchcode => Branches.GetLoggedInBranchcode ) %]
[% IF !policy.enable_waiting_holds_only || waiting_holds.count > 0 %]
|