From 20d66fdfd6736e09ffbbe2ee55be6a295c0c5fad Mon Sep 17 00:00:00 2001
From: Tomas Cohen Arazi <tomascohen@theke.io>
Date: Mon, 15 Mar 2021 08:33:49 -0300
Subject: [PATCH] Bug 26999: (follow-up) Simplify code

Doing
$ git grep pickup_locations_code

shows there's some calculated data that is not actually used anywhere.
We can get rid of it.

This patch also reuses $item_object (which is in the same loop scope) to
avoid an extra DB call.

To test:
1. Run:
   $ git grep pickup_locations_code
=> FAIL: It is only used/set as a comma separated string, inside
request.pl
2. Apply this patch
3. Repeat 1
=> SUCCESS: The unused stuff is not there anymore
4. Open the page for placing some holds
=> SUCCESS: It doesn't explode
5. Sign off :-D

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 0fd2be61e8376ad0db0f8ecf1eacde706cec6816)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 7ca4b8e15c968b763d58b428a1aed26a293d08b8)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
---
 reserve/request.pl | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/reserve/request.pl b/reserve/request.pl
index 9373dae008..1fadbd3437 100755
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -573,16 +573,15 @@ foreach my $biblionumber (@biblionumbers) {
                 {
                     $item->{available} = 1;
                     $num_available++;
-                    if($branchitemrule->{'hold_fulfillment_policy'} eq 'any' ) {
+
+                    if ( $branchitemrule->{'hold_fulfillment_policy'} eq 'any' )
+                    {
                         $item->{any_pickup_location} = 1;
-                    } else {
-                        my $arr_locations = Koha::Items->find($itemnumber)
-                                    ->pickup_locations( { patron => $patron } )->as_list();
+                    }
+                    else {
+                        my @pickup_locations = $item_object->pickup_locations({ patron => $patron });
 
-                        $item->{pickup_locations} = join( ', ',
-                            map { $_->unblessed->{branchname} } @$arr_locations);
-                        $item->{pickup_locations_code} = join( ',',
-                            map { $_->unblessed->{branchcode} } @$arr_locations);
+                        $item->{pickup_locations} = join( ', ', map { $_->branchname } @pickup_locations );
                     }
 
                     push( @available_itemtypes, $item->{itype} );
-- 
2.39.5