From 436291452f87c6410f2584032eb6db26abe428bf Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 10 Mar 2022 12:23:42 +0000 Subject: [PATCH] Bug 30266: Hide pickup location input on waiting hold This patch updates the holds table to always insert a hidden input when a hold is 'found' and covers the case where the hold is 'found' but doesn't match known statuses To test: 1 - Place two holds on a record for two different patrons, with different pickup locations 2 - Check in one item at expected branch to set waiting 3 - Then either: - Use batch modification or item editor to change the holding branch for the item - Sign in to a different branch and manually transfer the item back to it's home location 4 - View the holds for the record 5 - Note the 'Pickup library' column is blank for that hold 6 - Change pickup location for other hold and press 'Update holds' 7 - Note the waiting hold is still blank, and now second hold has no pickup location 8 - Check the DB and note the first hold has had the pickup location changed 8 - Apply patch 9 - Delete holds and repeat 1-4 10 - Note the waiting hold now displays: Hold expected at {Branch}, please checkin to verify status 11 - Change location for second hold and update holds 12 - COnfirm location chanegd correctly and first hold unaffected Signed-off-by: Andrew Fuerste-Henry Signed-off-by: Jonathan Druart Signed-off-by: Fridolin Somers --- koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc index fddaad03e3..b3951572ca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/holds_table.inc @@ -119,12 +119,15 @@ [%- IF ( hold.found ) -%] + [%- IF ( hold.atdestination ) -%] - Item waiting at [% hold.wbrname | html %][% IF hold.desk_name %], [% hold.desk_name | html %],[% END %] since [% hold.waiting_date | $KohaDates %] + Item waiting at [% hold.wbrname | html %][% IF hold.desk_name %], [% hold.desk_name | html %],[% END %] since [% hold.waiting_date | $KohaDates %] [%- ELSIF (hold.intransit) -%] - Item being transferred to [% hold.wbrname | html %] + Item being transferred to [% hold.wbrname | html %] [%- ELSIF (hold.inprocessing) -%] - Item being processed at [% hold.wbrname | html %] + Item being processed at [% hold.wbrname | html %] + [%- ELSE -%] + Hold expected at [% hold.wbrname | html %], please checkin to verify status [%- END -%] [%- ELSE -%] [%- IF Koha.Preference('IndependentBranches') && Branches.all().size == 1 -%] -- 2.39.5