diff --git a/app/EnquiriesManagementController/EnquiriesManagementController.php b/app/EnquiriesManagementController/EnquiriesManagementController.php index 8ad8e13cd..e82b6c789 100644 --- a/app/EnquiriesManagementController/EnquiriesManagementController.php +++ b/app/EnquiriesManagementController/EnquiriesManagementController.php @@ -128,9 +128,10 @@ public function sendEmail(string $ident, array $threadDetail, array $usersToNoti // In case for multiple users to notify, loop again for actual details. foreach ($u as $arr) { + $aliasEmail = str_replace('@', '+' . $threadDetail['thread']['unique_key']. '@', $arr['user']['email']); $to = [ 'to' => [ - 'email' => $arr['user']['email'], + 'email' => str_replace('@', '+' . $threadDetail['thread']['unique_key']. '@', $arr['user']['email']), 'name' => $arr['user']['firstname'] . ' ' . $arr['user']['lastname'], ], ]; @@ -146,6 +147,8 @@ public function sendEmail(string $ident, array $threadDetail, array $usersToNoti 'description' => 'EnquiriesManagementController failed to send email on behalf of ' . $jwtUser['id'] . ': ' . $e->getMessage(), ]); + + throw new Exception($e->getMessage()); } } diff --git a/app/Http/Controllers/Api/V1/EnquiryThreadController.php b/app/Http/Controllers/Api/V1/EnquiryThreadController.php index 3f1072e77..1614e2ccf 100644 --- a/app/Http/Controllers/Api/V1/EnquiryThreadController.php +++ b/app/Http/Controllers/Api/V1/EnquiryThreadController.php @@ -283,12 +283,14 @@ public function store(Request $request): JsonResponse 'description' => 'EnquiryThread ' . $enquiryThreadId . ' create - FAILED: ' . $e->getMessage(), ]); - } finally { - return response()->json([ - 'message' => Config::get('statuscodes.STATUS_BAD_REQUEST.message'), - 'data' => null, - ], Config::get('statuscodes.STATUS_BAD_REQUEST.code')); + + throw new Exception ($e->getMessage()); } + + return response()->json([ + 'message' => Config::get('statuscodes.STATUS_BAD_REQUEST.message'), + 'data' => null, + ], Config::get('statuscodes.STATUS_BAD_REQUEST.code')); } private function mapDatasets(array $datasets): array