Merge branch '24.06.00' into 24.07.00

code/aspen_app/src/screens/Auth/LoginForm.js

@@ -165,8 +165,9 @@ export const GetLoginForm = (props) => {
           await SecureStore.setItemAsync('userKey', valueUser);
           await SecureStore.setItemAsync('secretKey', valueSecret);
           await AsyncStorage.setItem('@lastStoredVersion', Constants.expoConfig.version);
+          const autoPickUserHomeLocation = LIBRARY.appSettings?.autoPickUserHomeLocation ?? 0;
 
-          if (PATRON.homeLocationId && !_.includes(GLOBALS.slug, 'aspen-lida')) {
+          if (PATRON.homeLocationId && !_.includes(GLOBALS.slug, 'aspen-lida') && autoPickUserHomeLocation === 1) {
                console.log(PATRON.homeLocationId);
                await getLocationInfo(GLOBALS.url, PATRON.homeLocationId).then(async (patronsLibrary) => {
                     if (!_.isUndefined(patronsLibrary.baseUrl)) {

code/aspen_app/src/screens/BrowseCategory/Home.js

@@ -341,14 +341,15 @@ export const DiscoverHomeScreen = () => {
           return loadingSpinner();
      }
 
+     /* 
      // load notification onboarding prompt
      if (isQueryFetching === 0 && preliminaryLoadingCheck) {
           if (notificationOnboard !== '0' && notificationOnboard !== 0) {
                if (isFocused && promptOpen === 'yes') {
                     return <NotificationsOnboard isFocused={isFocused} promptOpen={promptOpen} setPromptOpen={setPromptOpen} />;
                }
           }
-     }
+     }*/
 
      const clearSearch = () => {
           setSearchTerm('');

code/web/Drivers/PalaceProjectDriver.php

@@ -53,7 +53,7 @@ public function loadCirculationInformation(User $patron) {
 		}
 
 		$headers = $this->getPalaceProjectHeaders($patron);
-		$checkoutsUrl = $settings->apiUrl . "/" . $settings->libraryId . "/loans";
+		$checkoutsUrl = $settings->apiUrl . "/" . $settings->libraryId . "/loans?refresh=false";
 
 		$this->initCurlWrapper();
 		$this->curlWrapper->addCustomHeaders($headers, true);

code/web/interface/themes/responsive/theme.css.tpl

@@ -258,13 +258,13 @@ div.striped > div:nth-child(odd), div.striped > div:nth-child(odd){ldelim}
     background-color: {$browseCategoryPanelColor};
 {rdelim}
 
-.browse-category,#browse-sub-category-menu button{ldelim}
+.browse-category,#browse-sub-category-menu button, .manual [role="tab"]{ldelim}
     background-color: {$deselectedBrowseCategoryBackgroundColor} !important;
     border-color: {$deselectedBrowseCategoryBorderColor} !important;
     color: {$deselectedBrowseCategoryForegroundColor} !important;
 {rdelim}
 
-.browse-category.selected,.browse-category.selected:hover,#browse-sub-category-menu button.selected,#browse-sub-category-menu button.selected:hover{ldelim}
+.browse-category.selected,.browse-category.selected:hover,#browse-sub-category-menu button.selected,#browse-sub-category-menu button.selected:focus,#browse-sub-category-menu button.selected:hover,#browse-sub-category-menu button:focus,#browse-sub-category-menu button:hover, .manual [role="tab"]:focus, .manual [role="tab"]:hover, .manual [role="tab"][aria-selected="true"]{ldelim}
     border-color: {$selectedBrowseCategoryBorderColor} !important;
     background-color: {$selectedBrowseCategoryBackgroundColor} !important;
     color: {$selectedBrowseCategoryForegroundColor} !important;
@@ -449,13 +449,13 @@ div.striped > div:nth-child(odd), div.striped > div:nth-child(odd){ldelim}
     border-color: {$defaultButtonBorderColor};
 {rdelim}
 
-.btn-primary,.btn-primary:visited,a.btn-primary,a.btn-primary:visited, .manual [role="tab"]{ldelim}
+.btn-primary,.btn-primary:visited,a.btn-primary,a.btn-primary:visited{ldelim}
     background-color: {$primaryButtonBackgroundColor} !important;
     color: {$primaryButtonForegroundColor} !important;
     border-color: {$primaryButtonBorderColor};
 {rdelim}
 
-.btn-primary:hover, a.btn-primary:hover, .btn-primary:focus, a.btn-primary:focus, .btn-primary:active, a.btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary, .manual [role="tab"]:focus, .manual [role="tab"]:hover, .manual [role="tab"][aria-selected="true"]{ldelim}
+.btn-primary:hover, a.btn-primary:hover, .btn-primary:focus, a.btn-primary:focus, .btn-primary:active, a.btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ldelim}
     background-color: {$primaryButtonHoverBackgroundColor} !important;
     color: {$primaryButtonHoverForegroundColor} !important;
     border-color: {$primaryButtonHoverBorderColor};

code/web/release_notes/24.06.00.MD

@@ -9,6 +9,7 @@
 - On the Checkouts screen, the Access Online action for Libby items will now properly again open the content in the in-app browser. (*KK*)
 - Added an alert to warn Android 11 or older users that they will no longer receive app updates. (*KK*)
 - Updated the minimum iOS version to 16, users with older versions will no longer receive app updates or be able to download the app. (*KK*)
+- Removed the Notification Onboarding prompt. (*KK*) 
 
 ## Aspen Discovery Updates
 
@@ -99,6 +100,9 @@
 - Removed Magazines from Lending Periods on the Options page due to OverDrive no longer supporting it. (Tickets 120811, 123307) (*KK*)
 - Show when a record has been ungrouped from other works within staff view and allow them to be regrouped. (*MDN*) 
 
+### Palace Project Updates
+- When checking for titles checked out within Palace Project add a parameter to not check external systems like OverDrive, Boundless, and cloudLibrary. (*MDN*) 
+
 ### Polaris Updates
 - When processing records to reload, force the record to be updated from Polaris during the indexing process. (*MDN*)
 - Correct typo within indexing logs. (*MG*)

code/web/sys/Email/Mailer.php

@@ -118,9 +118,9 @@ private function sendViaAmazonSes(AmazonSesSetting $amazonSesSettings, string $t
 
 		if(!empty($attachments)) {
 			$i = 0;
-			foreach($attachments as $attachment) {
-				if($attachment['name'][$i]) {
-					$message->addAttachmentFromFile($attachment['name'][$i], $attachment['tmp_name'][$i], $attachment['type'][$i]);
+			if(isset($attachments['name'])) {
+				foreach ($attachments['name'] as $attachment) {
+					$message->addAttachmentFromFile($attachments['name'][$i], $attachments['tmp_name'][$i], $attachments['type'][$i]);
 					$i++;
 				}
 			}