From 8a31265888785b1f6c615cd50daf06b1bfa7c176 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/ Signed-off-by: Koha Team University Lyon 3 Signed-off-by: Katrin Fischer --- .../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 cc7ba2df2c..97a208d1a2 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 @@ -52,6 +52,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 %] +
@@ -169,17 +193,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 %]
@@ -239,17 +256,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 %] @@ -321,17 +331,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 %] @@ -401,11 +404,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.30.2