diff --git a/CRM/Mailingcategorisation/APIWrappers/Mailing.php b/CRM/Mailingcategorisation/APIWrappers/Mailing.php index 6ee1e229ea70584bd86718ef7920604d03032d7f..2fcf512baa3a2bcf14157f72cf27da6814b83c53 100644 --- a/CRM/Mailingcategorisation/APIWrappers/Mailing.php +++ b/CRM/Mailingcategorisation/APIWrappers/Mailing.php @@ -22,7 +22,7 @@ class CRM_Mailingcategorisation_APIWrappers_Mailing implements API_Wrapper { 'category_id' => $mailingCategoryID ]); } - elseif (!empty($result['id'])) { + elseif (!empty($result['id']) && !empty($mailingCategoryID)) { // Otherwise look up a mailing category if we are in mailing AB test situation to populate category in b and c object in angular. $mailingAB = civicrm_api3('MailingAB', 'get', [ 'mailing_id_b' => $result['id'], @@ -39,6 +39,12 @@ class CRM_Mailingcategorisation_APIWrappers_Mailing implements API_Wrapper { $mailingCategoryID = $mailingAMailingCategory->category_id; } } + if (empty($mailingCategoryID)) { + $MailingCategory = new CRM_Mailingcategorisation_DAO_MailingCategory(); + $MailingCategory->mailing_id = $result['id']; + $MailingCategory->find(TRUE); + $mailingCategoryID = $MailingCategory->category_id; + } $result['values'][$result['id']]['category_id'] = $mailingCategoryID; } if ($apiRequest['entity'] == 'Mailing' && $apiRequest['action'] == 'getsingle') { diff --git a/info.xml b/info.xml index 8ba2794b39ac2c69d794bb8f520016574114cbba..9f3340f9fbd6a679d20ce0f35b6f5d89eafd69fd 100644 --- a/info.xml +++ b/info.xml @@ -14,8 +14,8 @@ <url desc="Support">https://lab.jmaconsulting.biz/extensions/mailingcategorisation</url> <url desc="Licensing">http://www.gnu.org/licenses/agpl-3.0.html</url> </urls> - <releaseDate>2024-07-09</releaseDate> - <version>1.1.3</version> + <releaseDate>2024-07-15</releaseDate> + <version>1.1.4</version> <develStage>stable</develStage> <compatibility> <ver>5.70</ver>