From 154bb8be20dbbd54b6d9a581f52d9ba945d0c9cd Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 18 Nov 2019 16:15:06 +0200
Subject: [PATCH] Revert "Alma: Fix date and status display for the holds list.
(#1501)"
This reverts commit 37c55aa51669ab2f7330eb504743852a188a75ee.
---
module/VuFind/src/VuFind/ILS/Driver/Alma.php | 20 +++-----------------
1 file changed, 3 insertions(+), 17 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Alma.php b/module/VuFind/src/VuFind/ILS/Driver/Alma.php
index b18e8feaa64..b8228ab810c 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Alma.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Alma.php
@@ -895,25 +895,11 @@ class Alma extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
);
$holdList = [];
foreach ($xml as $request) {
- $lastInterestDate = $request->last_interest_date
- ? $this->dateConverter->convertToDisplayDate(
- 'Y-m-dT', (string)$request->last_interest_date
- ) : null;
- $available = (string)$request->request_status === 'On Hold Shelf';
- if ($available) {
- $lastPickupDate = $request->expiry_date
- ? $this->dateConverter->convertToDisplayDate(
- 'Y-m-dT', (string)$request->expiry_date
- ) : null;
- }
$holdList[] = [
- 'create' => $this->dateConverter->convertToDisplayDate(
- 'Y-m-dT', (string)$request->request_date
- ),
- 'expire' => $lastInterestDate,
+ 'create' => (string)$request->request_date,
+ 'expire' => (string)$request->last_interest_date,
'id' => (string)$request->request_id,
- 'available' => $available,
- 'last_pickup_date' => $lastPickupDate,
+ 'in_transit' => (string)$request->request_status !== 'On Hold Shelf',
'item_id' => (string)$request->mms_id,
'location' => (string)$request->pickup_location,
'processed' => $request->item_policy === 'InterlibraryLoan'
--
GitLab