From 1d35e8b22a3d37474235f65ccc49abe95e5bd26c Mon Sep 17 00:00:00 2001
From: Ere Maijala <ere.maijala@helsinki.fi>
Date: Mon, 3 Feb 2020 15:46:53 +0200
Subject: [PATCH] Alma: Return correct status information for all loan
renewals. (#1530)
- Also don't return a misleading message in the blocks elements.
---
module/VuFind/src/VuFind/ILS/Driver/Alma.php | 29 +++++++++-----------
1 file changed, 13 insertions(+), 16 deletions(-)
diff --git a/module/VuFind/src/VuFind/ILS/Driver/Alma.php b/module/VuFind/src/VuFind/ILS/Driver/Alma.php
index 7e5da05983b..4369663e75d 100644
--- a/module/VuFind/src/VuFind/ILS/Driver/Alma.php
+++ b/module/VuFind/src/VuFind/ILS/Driver/Alma.php
@@ -1264,29 +1264,26 @@ class Alma extends AbstractBase implements \VuFindHttp\HttpServiceAwareInterface
);
// Add information to the renewal array
- $blocks = false;
- $renewal[$loanId]['success'] = true;
- $renewal[$loanId]['new_date'] = $this->parseDate(
- (string)$apiResult->due_date,
- true
- );
- //$renewal[$loanId]['new_time'] = ;
- $renewal[$loanId]['item_id'] = (string)$apiResult->loan_id;
- $renewal[$loanId]['sysMessage'] = 'renew_success';
+ $renewal = [
+ 'success' => true,
+ 'new_date' => $this->parseDate(
+ (string)$apiResult->due_date,
+ true
+ ),
+ 'item_id' => (string)$apiResult->loan_id,
+ 'sysMessage' => 'renew_success'
+ ];
// Add the renewal to the return array
- $returnArray['details'] = $renewal;
+ $returnArray['details'][$loanId] = $renewal;
} catch (ILSException $ilsEx) {
// Add the empty renewal array to the return array
- $returnArray['details'] = $renewal;
-
- // Add a message that can be translated
- $blocks[] = 'renew_fail';
+ $returnArray['details'][$loanId] = [
+ 'success' => false
+ ];
}
}
- $returnArray['blocks'] = $blocks;
-
return $returnArray;
}
--
GitLab