Code simplification.

module/VuFind/src/VuFind/ILS/Driver/VoyagerRestful.php

@@ -441,6 +441,27 @@ class VoyagerRestful extends Voyager implements \VuFindHttp\HttpServiceAwareInte
         return $transactions;
     }
 
+    /**
+     * Is the selected pickup location valid for the hold?
+     *
+     * @param string $pickUpLocation Selected pickup location
+     * @param array  $patron         Patron information returned by the patronLogin
+     * method.
+     * @param array  $holdDetails    Details of hold being placed
+     *
+     * @return bool
+     */
+    protected function pickUpLocationIsValid($pickUpLocation, $patron, $holdDetails)
+    {
+        $pickUpLibs = $this->getPickUpLocations($patron, $holdDetails);
+        foreach ($pickUpLibs as $location) {
+            if ($location['locationID'] == $pickUpLocation) {
+                return true;
+            }
+        }
+        return false;
+    }
+
     /**
      * Get Pick Up Locations
      *
@@ -1058,15 +1079,7 @@ class VoyagerRestful extends Voyager implements \VuFindHttp\HttpServiceAwareInte
         }
 
         // Make Sure Pick Up Library is Valid
-        $pickUpValid = false;
-        $pickUpLibs = $this->getPickUpLocations($patron, $holdDetails);
-        foreach ($pickUpLibs as $location) {
-            if ($location['locationID'] == $pickUpLocation) {
-                $pickUpValid = true;
-            }
-        }
-        if (!$pickUpValid) {
-            // Invalid Pick Up Point
+        if (!$this->pickUpLocationIsValid($pickUpLocation, $patron, $holdDetails)) {
             return $this->holdError("hold_invalid_pickup");
         }