fix(email): use client/org name as From display, not Ladill product
Deploy Ladill Queue / deploy (push) Successful in 43s
Deploy Ladill Queue / deploy (push) Successful in 43s
Customer-facing outbound mail should appear from the business (organizer, clinic, company, location), not the Ladill product brand.
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Mail;
|
|||||||
|
|
||||||
use Illuminate\Bus\Queueable;
|
use Illuminate\Bus\Queueable;
|
||||||
use Illuminate\Mail\Mailable;
|
use Illuminate\Mail\Mailable;
|
||||||
|
use Illuminate\Mail\Mailables\Address;
|
||||||
use Illuminate\Mail\Mailables\Content;
|
use Illuminate\Mail\Mailables\Content;
|
||||||
use Illuminate\Mail\Mailables\Envelope;
|
use Illuminate\Mail\Mailables\Envelope;
|
||||||
use Illuminate\Queue\SerializesModels;
|
use Illuminate\Queue\SerializesModels;
|
||||||
@@ -23,7 +24,13 @@ class ContactMessageMail extends Mailable
|
|||||||
|
|
||||||
public function envelope(): Envelope
|
public function envelope(): Envelope
|
||||||
{
|
{
|
||||||
|
$display = trim((string) ($this->fromName ?: $this->companyName));
|
||||||
|
$fromAddress = (string) config('mail.from.address');
|
||||||
|
|
||||||
return new Envelope(
|
return new Envelope(
|
||||||
|
from: $display !== '' && $fromAddress !== ''
|
||||||
|
? new Address($fromAddress, $display)
|
||||||
|
: null,
|
||||||
subject: $this->subjectLine,
|
subject: $this->subjectLine,
|
||||||
replyTo: $this->replyToAddress ? [$this->replyToAddress] : [],
|
replyTo: $this->replyToAddress ? [$this->replyToAddress] : [],
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -27,9 +27,11 @@ class EmailService
|
|||||||
$logoUrl = OrganizationBranding::emailLogoUrl($organization);
|
$logoUrl = OrganizationBranding::emailLogoUrl($organization);
|
||||||
$companyName = $organization->name;
|
$companyName = $organization->name;
|
||||||
}
|
}
|
||||||
|
// Client-facing From display: org/company name, never the Ladill product brand.
|
||||||
|
$displayName = trim((string) ($fromName ?: $companyName)) ?: null;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
Mail::to($to)->send(new ContactMessageMail($subject, $body, $fromName, $replyTo, $logoUrl, $companyName));
|
Mail::to($to)->send(new ContactMessageMail($subject, $body, $displayName, $replyTo, $logoUrl, $companyName));
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
} catch (\Throwable $e) {
|
} catch (\Throwable $e) {
|
||||||
|
|||||||
@@ -77,7 +77,8 @@ class QueueNotificationService
|
|||||||
$this->sms->send($phone, $message);
|
$this->sms->send($phone, $message);
|
||||||
}
|
}
|
||||||
if ($email) {
|
if ($email) {
|
||||||
$this->email->send($email, 'Ladill Queue update', $message, null, null, $organization);
|
$orgName = trim((string) ($organization?->name ?? '')) ?: 'Queue';
|
||||||
|
$this->email->send($email, $orgName.' — queue update', $message, $orgName, null, $organization);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user