Merge branch '25.02.01' into 25.02.10

Aspen-Discovery · Feb 27, 2025 · 7509560 · 7509560
2 parents 7b90225 + b33122a
commit 7509560
Show file tree

Hide file tree

Showing 4 changed files with 36 additions and 8 deletions.
diff --git a/code/web/Drivers/SirsiDynixROA.php b/code/web/Drivers/SirsiDynixROA.php
@@ -1231,12 +1231,12 @@ public function getHolds($patron): array {
 				$curHold->expirationDate = strtotime($expireDate);
 				$curHold->automaticCancellationDate = strtotime($fillByDate);
 				$curHold->reactivateDate = strtotime($reactivateDate);
-				$curHold->cancelable = strcasecmp($curHold->status, 'Suspended') != 0 && strcasecmp($curHold->status, 'Expired') != 0 && strcasecmp($curHold->status, 'INSHIPPING') != 0 && strcasecmp($curHold->status, 'ILL WYLD') != 0;
+				$curHold->cancelable = !in_array(strtoupper($curHold->status), ['SUSPENDED', 'EXPIRED', 'INSHIPPING', 'INTRANSIT', 'ILL_WYLD', 'ILLSHIPPED']);
 
 				$curHold->frozen = strcasecmp($curHold->status, 'Suspended') == 0;
 				$curHold->canFreeze = true;
 				$curHold->locationUpdateable = true;
-				if (in_array(strtoupper($curHold->status), ['TRANSIT', 'EXPIRED', 'INSHIPPING', 'ILL WYLD', 'ILLPENDING'])) {
+				if (in_array(strtoupper($curHold->status), ['TRANSIT', 'EXPIRED', 'INSHIPPING', 'ILL WYLD', 'ILLPENDING', 'ILLSHIPPED'])) {
 					$curHold->locationUpdateable = false;
 					$curHold->canFreeze = false;
 				}

diff --git a/code/web/RecordDrivers/MarcRecordDriver.php b/code/web/RecordDrivers/MarcRecordDriver.php
@@ -1149,9 +1149,6 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is
 						//Check to see if all items require a request
 						$allVolumesRequireIll = true;
 						if ($interLibraryLoanType !== 'none') {
-							if (count($itemsWithoutVolumes) > 0 && !$itemsWithoutVolumesNeedIllRequest) {
-								$allVolumesRequireIll = false;
-							}
 							foreach ($holdableVolumes as $volumeInfo) {
 								if (!$volumeInfo['needsIllRequest']) {
 									$allVolumesRequireIll = false;
@@ -1161,8 +1158,22 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is
 							$allVolumesRequireIll = false;
 						}
 						if ($allVolumesRequireIll) {
-							//The button will show a message to the patron no volumes can be requested
-							$this->_actions[$variationId][] = getNoVolumesCanBeRequestedAction($this->getModule(), $source, $id);
+							if (count($itemsWithoutVolumes) > 0) {
+								//Check to see if a title level request is possible and if so show a request or hold button as appropriate
+								if ($itemsWithoutVolumesNeedIllRequest) {
+									if ($interLibraryLoanType == 'vdx') {
+										//VDX does not support volumes, we'll just prompt for a regular VDX
+										$this->_actions[$variationId][] = getVdxRequestAction($this->getModule(), $source, $id);
+									} elseif ($interLibraryLoanType == 'localIll') {
+										$this->_actions[$variationId][] = getLocalIllRequestAction($this->getModule(), $source, $id);
+									}
+								}else{
+									$this->_actions[$variationId][] = getHoldRequestAction($this->getModule(), $source, $id, $variationId);
+								}
+							} else {
+								//The button will show a message to the patron no volumes can be requested
+								$this->_actions[$variationId][] = getNoVolumesCanBeRequestedAction($this->getModule(), $source, $id);
+							}
 						}else{
 							//We will need to show a popup to select the volume
 							$interface->assign('itemsWithoutVolumesNeedIllRequest', $itemsWithoutVolumesNeedIllRequest);

diff --git a/code/web/interface/themes/responsive/MyAccount/myPreferences.tpl b/code/web/interface/themes/responsive/MyAccount/myPreferences.tpl
@@ -155,7 +155,7 @@
 						<div id="pickupSublocationOptions" class="form-group propertyRow">
 							{assign var=activePickupLocationId value=$profile->pickupLocationId}
 							{if $edit == true && !empty($allowPickupLocationUpdates)}
-								{if $activePickupLocationId > 0 && count($pickupSublocations.$activePickupLocationId) > 1}
+								{if $activePickupLocationId > 0 && !empty($pickupSublocations.$activePickupLocationId) && count($pickupSublocations.$activePickupLocationId) > 1}
 									{if $profile->pickupLocationId}
 										<div id="sublocationSelectPlaceHolder">
 											<label class="control-label" for="pickupSublocation">{translate text='Preferred Pickup Location' isPublicFacing=true}</label>

diff --git a/code/web/release_notes/25.02.01.MD b/code/web/release_notes/25.02.01.MD
@@ -0,0 +1,17 @@
+## Aspen Discovery Updates
+### Account Updates
+- When looking for sublocations while setting the preferred pickup location, handle cases where the active pickup location is disabled. (DIS-433) (*MDN*)
+
+### Local ILL Updates
+- Allow patrons to place requests for items without volumes if there is a mix of items with and without items on a record, and their library does not own any copies. (DIS-34) (*MDN*)
+
+### Symphony Updates
+- Do not allow changing pickup location, canceling, or freezing holds that have a status of ILLSHIPPED. (DIS-34) (*MDN*)
+
+## This release includes code contributions from
+### Grove For Libraries
+- Mark Noble (MDN)
+
+## Special Testing thanks to
+- Desiree Saunders (WYLD)
+- Leo Stoyanov (ByWater Solutions)