From 0dba8ce11d37127aad934b8080332ebc394f31e3 Mon Sep 17 00:00:00 2001 From: Jitendra Purohit Date: Mon, 19 Feb 2018 15:34:47 +0530 Subject: [PATCH] additional changes --- CRM/Case/BAO/Case.php | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/CRM/Case/BAO/Case.php b/CRM/Case/BAO/Case.php index 4bce7be5fe..c300a6a024 100644 --- a/CRM/Case/BAO/Case.php +++ b/CRM/Case/BAO/Case.php @@ -1039,13 +1039,10 @@ SELECT case_status.label AS case_status, status_id, civicrm_case_type.title AS c $caseDeleted = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_Case', $caseID, 'is_deleted'); - // define statuses which are handled like Completed status (others are assumed to be handled like Scheduled status) - $compStatusValues = array(); - $compStatusNames = array('Left Message', 'Cancelled', 'Unreachable', 'Not Required'); - foreach ($compStatusNames as $name) { - $compStatusValues[] = CRM_Core_PseudoConstant::getKey('CRM_Activity_BAO_Activity', 'activity_status_id', $name); - } - $compStatusValues = array_merge($compStatusValues, array_keys(CRM_Activity_BAO_Activity::getStatusesByType(CRM_Activity_BAO_Activity::COMPLETED))); + $compStatusValues = array_keys( + CRM_Activity_BAO_Activity::getStatusesByType(CRM_Activity_BAO_Activity::COMPLETED) + + CRM_Activity_BAO_Activity::getStatusesByType(CRM_Activity_BAO_Activity::CANCELLED) + ); $contactViewUrl = CRM_Utils_System::url("civicrm/contact/view", "reset=1&cid=", FALSE, NULL, FALSE); $hasViewContact = CRM_Core_Permission::giveMeAllACLs(); -- 2.25.1