Change the logic to check for get this compatibility

Author: rominail

module/VuFind/src/VuFind/AjaxHandler/GetItemStatuses.php

@@ -518,9 +518,6 @@ public function handleRequest(Params $params)
                 ];
             }
         }
-        if (!$this->ils->getDriver()->supportsGetThis()) {
-            $this->getThis = null;
-        }
 
         if (!is_array($results)) {
             // If getStatuses returned garbage, let's turn it into an empty array

module/VuFind/src/VuFind/GetThis/GetThisLoader.php

@@ -17,6 +17,7 @@
 use Exception;
 use Throwable;
 use VuFind\Config\YamlReader;
+use VuFind\ILS\Logic\AvailabilityStatusInterface;
 use VuFind\Log\LoggerAwareTrait;
 use VuFind\Regex\Regex;
 use VuFind\View\Helper\Root\Translate;
@@ -762,4 +763,25 @@ public function setItemId(?string $itemId): void
         }
         $this->subTemplates = null;
     }
+
+    /**
+     * Given holdings, return whether the holdings are compatible with the get this feature
+     *
+     * @param array $items Holdings
+     *
+     * @return bool
+     */
+    public function areItemsSupported(array $items): bool
+    {
+        foreach ($items as $item) {
+            if (
+                array_key_exists('location', $item)
+                || array_key_exists('location_code', $item)
+                || (array_key_exists('availability', $item) && $item['availability'] instanceof AvailabilityStatusInterface)
+            ) {
+                return true;
+            }
+        }
+        return false;
+    }
 }

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

@@ -81,14 +81,4 @@ protected function throwAsIlsException(
     ): void {
         throw new ILSException($msg ?? $exception->getMessage(), 0, $exception);
     }
-
-    /**
-     * Whether the driver supports the GetThis feature
-     *
-     * @return bool
-     */
-    public function supportsGetThis(): bool
-    {
-        return false;
-    }
 }

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

@@ -2906,14 +2906,4 @@ public function getUrlsForRecord(string $id): array
         }
         return $links;
     }
-
-    /**
-     * Whether the driver supports the GetThis feature
-     *
-     * @return bool
-     */
-    public function supportsGetThis(): bool
-    {
-        return true;
-    }
 }

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

@@ -2767,14 +2767,4 @@ public function getNewItems($page, $limit, $daysOld, $fundId = null)
     {
         return [];
     }
-
-    /**
-     * Whether the driver supports the GetThis feature
-     *
-     * @return bool
-     */
-    public function supportsGetThis(): bool
-    {
-        return true;
-    }
 }

module/VuFind/src/VuFind/RecordTab/HoldingsILS.php

@@ -205,14 +205,4 @@ public function getPaginator($totalItemCount, $page, $itemLimit)
 
         return $paginator;
     }
-
-    /**
-     * Whether the driver supports the GetThis feature
-     *
-     * @return bool
-     */
-    public function supportsGetThis(): bool
-    {
-        return $this->catalog->getDriver()->supportsGetThis();
-    }
 }

themes/bootstrap5/templates/RecordTab/holdingsils/standard.phtml

@@ -4,7 +4,7 @@
     $checkStorageRetrievalRequest = $holding['checkStorageRetrievalRequest'] ?? false;
     $checkILLRequest = $holding['checkILLRequest'] ?? false;
     $availabilityStatus = $holding['availability'];
-    $getThisEnabled = isset($this->getThis) && $this->tab->supportsGetThis();
+    $getThisEnabled = isset($this->getThis) && $this->getThis->areItemsSupported([$holding]);
     if ($getThisEnabled) {
         $this->getThis->setItems([$holding]);
         $this->getThis->setRecord($this->record($this->driver));

themes/bootstrap5/templates/ajax/status-full.phtml

@@ -1,5 +1,5 @@
 <?php
-$getThisEnabled = isset($this->getThis);
+$getThisEnabled = isset($this->getThis) && $this->getThis->areItemsSupported($this->statusItems);
 if ($getThisEnabled) {
     $this->getThis->setItems($this->statusItems);
 }