From 17d9a71ef0e72ed24778407331b91f965c24c9a6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 27 Jun 2022 15:20:03 +0200 Subject: [PATCH] Bug 30964: Add 'restricted' and 'has overdues' on curbside pickup This patch adds more information about the patron's account on the curbside pickup list view. "Patron's account is restricted" if the patron is restricted "Patron has items overdue" if the patron has overdues Sponsored-by: Association KohaLa - https://koha-fr.org/ --- .../prog/en/modules/circ/curbside_pickups.tt | 63 +++++++++---------- 1 file changed, 31 insertions(+), 32 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt index 575534c4f43..de00df15e0e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/curbside_pickups.tt @@ -51,6 +51,30 @@ + +[% BLOCK waiting_holds %] + [% 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 %] +[% END %] + +[% BLOCK patron_info %] + [% cp.patron.firstname | html %] [% cp.patron.surname | html %] ([% cp.patron.cardnumber | html %]) + [% IF cp.notes %] +
+ Notes: [% cp.notes | html %] + [% END %] + [% IF cp.patron.debarred %] +
+ Patron's account is restricted + [% END %] + [% IF cp.patron.has_overdues %] +
+ Patron has items overdue + [% END %] +[% END %] +
@@ -162,17 +186,10 @@ [% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %] - [% cp.patron.firstname | html %] [% cp.patron.surname | html %] ([% cp.patron.cardnumber | html %]) - [% IF cp.notes %] -
- Notes: [% cp.notes | html %] - [% END %] + [% PROCESS patron_info %] - [% 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 %] + [% PROCESS waiting_holds %]
@@ -232,17 +249,10 @@ [% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %] - [% cp.patron.firstname | html %] [% cp.patron.surname | html %] ([% cp.patron.cardnumber | html %]) - [% IF cp.notes %] -
- Notes: [% cp.notes | html %] - [% END %] + [% PROCESS patron_info %] - [% 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 %] + [% PROCESS waiting_holds %] [% cp.staged_by_staff.firstname | html %] [% cp.staged_by_staff.surname | html %] @@ -314,17 +324,10 @@ [% cp.scheduled_pickup_datetime | $KohaDates with_hours = 1 %] - [% cp.patron.firstname | html %] [% cp.patron.surname | html %] ([% cp.patron.cardnumber | html %]) - [% IF cp.notes %] -
- Notes: [% cp.notes | html %] - [% END %] + [% PROCESS patron_info %] - [% 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 %] + [% PROCESS waiting_holds %] [% cp.staged_by_staff.firstname | html %] [% cp.staged_by_staff.surname | html %] @@ -394,11 +397,7 @@ [% cp.delivered_datetime | $KohaDates with_hours = 1 %] - [% cp.patron.firstname | html %] [% cp.patron.surname | html %] ([% cp.patron.cardnumber | html %]) - [% IF cp.notes %] -
- Notes: [% cp.notes | html %] - [% END %] + [% PROCESS patron_info %] [% FOREACH c IN cp.checkouts %] -- 2.25.1