From 2627057f5174f6516586dd45a6ee1c97216ab423 Mon Sep 17 00:00:00 2001 From: Brendan Lawlor Date: Mon, 9 Sep 2024 15:07:31 +0000 Subject: [PATCH] Bug 37860: Add Main contact method to Holds awaiting pickup table This patch adds the main contact method to the patron column of the Holds awaiting pickup table. The style is intended to match the modal on the hold found modal. To test: 1. Apply patch and run yarn build && restart_all 2. Place a hold for a patron and check in the item 3. Notice the modal displays the main contact method in a yellow box 4. Go to Circulation > Holds awaiting pickup 5. Notice the main contact method displays in the Patron column in the same style Signed-off-by: Shi Yao Wang Signed-off-by: Baptiste Wojtkowski --- .../prog/css/src/staff-global.scss | 13 ++++++++++++ .../prog/en/includes/waiting_holds.inc | 21 +++++++++++++++++++ 2 files changed, 34 insertions(+) diff --git a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss index 47e85450..17ca1a4e 100644 --- a/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss +++ b/koha-tmpl/intranet-tmpl/prog/css/src/staff-global.scss @@ -795,6 +795,19 @@ form { } } +td .main_contact_method { + background-color: #FFE; + border: 1px solid #CCC; + border-radius: 5px; + display: inline-block; + margin: .5em 0; + padding: .1em .3em; + + &.none { + background-color: #EEE; + } +} + h1 { } diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc index ef43953e..31e4e3fb 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/waiting_holds.inc @@ -59,6 +59,27 @@ > [% END %] + [% IF reserveloo.borrower.primary_contact_method %] +
Main contact method: + [% SWITCH reserveloo.borrower.primary_contact_method %] + [% CASE 'phone' %] + Primary phone + [% CASE 'phonepro' %] + Secondary phone + [% CASE 'mobile' %] + Other phone + [% CASE 'email' %] + Primary email + [% CASE 'emailpro' %] + Secondary email + [% CASE 'fax' %] + Fax + [% END %] +
+ [% ELSE %] +
Main contact method: None
+ [% END %] [% Branches.GetName( reserveloo.item.homebranch ) | html %] [% Branches.GetName( reserveloo.item.holdingbranch ) | html %][% IF (reserveloo.desk_id ) %], [% reserveloo.desk.desk_name | html %][% END %] -- 2.30.2