cuongpv/faveo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "updates"

Browse Source 
This reverts commit 92e54c791e.
This commit is contained in:
Manish Verma
2017-02-07 18:09:35 +05:30
parent 92e54c791e
commit 38f7d203f2
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Http/Controllers/Common/PhpMailController.php
View File

@@ -51,13 +51,15 @@ class PhpMailController extends Controller
public function mailfrom($reg, $dept_id) public function mailfrom($reg, $dept_id)
{ {
$email_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); $email = Email::find(1);
if ($dept_mail && $dept_mail->outgoing_email != '') { if ($emails && $emails->sending_status) {
$email_id = $dept_mail->outgoing_email; $email_id = $emails->id;
} else { } else {
$email_id = $email->sys_email; $email_id = $email->sys_email;
} }
return $email_id; return $email_id;
} }