diff --git a/app/Helpers/sendMailNotification.php b/app/Helpers/sendMailNotification.php index 358b362..859cd08 100755 --- a/app/Helpers/sendMailNotification.php +++ b/app/Helpers/sendMailNotification.php @@ -81,6 +81,21 @@ class sendMailNotification $client_data = $params['client_data']; $common = $params['common']; + $mailAttachmentModel = new MailAttachmentModel(); + $attachment_data = $mailAttachmentModel + ->select('file_path, file_name') + ->where('notification_id', $notification_data['id']) + ->where('is_active', 1) + ->findAll()??[]; + + $attachments = []; + foreach ($attachment_data as $data) { + $attachments[] = [ + "filePath" => WRITEPATH . $data['file_path'], + "fileName" => $data['file_name'] + ]; + } + $subject = $notification_data['subject']; $app_link = $_ENV['App_Url']; $mail_content = $notification_data['mail_content']; @@ -109,7 +124,7 @@ class sendMailNotification $mail_content = view('mail_template', $data); - $wholeData = ['mail' => $mail, 'subject' => $subject, 'message' => $mail_content, 'bcc' => $client_data['common_mails'], 'reply_to' => $client_data['reply_to'], 'common' => $common]; + $wholeData = ['mail' => $mail, 'subject' => $subject, 'message' => $mail_content, 'bcc' => $client_data['common_mails'], 'attachments' => $attachments, 'reply_to' => $client_data['reply_to'], 'common' => $common]; return $wholeData; } else if ($action == 'member_ecard_mail') { @@ -1264,6 +1279,23 @@ class sendMailNotification $client_data = $params['client_data']; $mail = $params['test_mail']; + $mailAttachmentModel = new MailAttachmentModel(); + $attachment_data = $mailAttachmentModel + ->select('file_path, file_name') + ->where('notification_id', $notification_data['id']) + ->where('is_active', 1) + ->findAll()??[]; + + $attachments = []; + foreach ($attachment_data as $data) { + $attachments[] = [ + "filePath" => WRITEPATH . $data['file_path'], + "fileName" => $data['file_name'] + ]; + } + + + $mail_content = $notification_data['mail_content']; $subject = $notification_data['subject']; @@ -1293,7 +1325,7 @@ class sendMailNotification $data['mail_content'] = $mail_content; $mail_content = view('mail_template', $data); - $wholeData = ['mail' => $mail, 'subject' => $subject, 'message' => $mail_content, 'bcc' => $client_data['common_mails'], 'reply_to' => $client_data['reply_to']]; + $wholeData = ['mail' => $mail, 'subject' => $subject, 'message' => $mail_content, 'bcc' => $client_data['common_mails'], 'attachments' => $attachments , 'reply_to' => $client_data['reply_to']]; } } diff --git a/app/Views/notification.php b/app/Views/notification.php index 6d5908c..cba44f6 100755 --- a/app/Views/notification.php +++ b/app/Views/notification.php @@ -370,6 +370,18 @@ +
| Attachments | +Action | +
|---|