From 38f7d203f2534ad8e1876c6f2463166aefb01472 Mon Sep 17 00:00:00 2001 From: Manish Verma Date: Tue, 7 Feb 2017 18:09:35 +0530 Subject: [PATCH] Revert "updates" This reverts commit 92e54c791edfb430c7679d998240b4e6a6e730bc. --- app/Http/Controllers/Common/PhpMailController.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Common/PhpMailController.php b/app/Http/Controllers/Common/PhpMailController.php index b58159fbd..3432c50f5 100644 --- a/app/Http/Controllers/Common/PhpMailController.php +++ b/app/Http/Controllers/Common/PhpMailController.php @@ -51,13 +51,15 @@ class PhpMailController extends Controller public function mailfrom($reg, $dept_id) { $email_id = ''; - $dept_mail = Department::select('outgoing_email')->where('id', '=', $dept_id)->first(); + $emails = Emails::where('department', '=', $dept_id)->first(); + $email = Email::find(1); - if ($dept_mail && $dept_mail->outgoing_email != '') { - $email_id = $dept_mail->outgoing_email; + if ($emails && $emails->sending_status) { + $email_id = $emails->id; } else { $email_id = $email->sys_email; } + return $email_id; }