fix(email): use client/org name as From display, not Ladill product
Deploy Ladill Frontdesk / deploy (push) Successful in 55s

Customer-facing outbound mail should appear from the business (organizer,
clinic, company, location), not the Ladill product brand.
This commit is contained in:
isaacclad
2026-07-16 12:01:10 +00:00
parent b3842adaff
commit 9c14d4db3b
3 changed files with 12 additions and 2 deletions
+7
View File
@@ -4,6 +4,7 @@ namespace App\Mail;
use Illuminate\Bus\Queueable;
use Illuminate\Mail\Mailable;
use Illuminate\Mail\Mailables\Address;
use Illuminate\Mail\Mailables\Content;
use Illuminate\Mail\Mailables\Envelope;
use Illuminate\Queue\SerializesModels;
@@ -23,7 +24,13 @@ class ContactMessageMail extends Mailable
public function envelope(): Envelope
{
$display = trim((string) ($this->fromName ?: $this->companyName));
$fromAddress = (string) config('mail.from.address');
return new Envelope(
from: $display !== '' && $fromAddress !== ''
? new Address($fromAddress, $display)
: null,
subject: $this->subjectLine,
replyTo: $this->replyToAddress ? [$this->replyToAddress] : [],
);
+3 -1
View File
@@ -33,9 +33,11 @@ class EmailService
$logoUrl = OrganizationBranding::emailLogoUrl($organization);
$companyName = $organization->name;
}
// Client-facing From display: org/company name, never the Ladill product brand.
$displayName = trim((string) ($fromName ?: $companyName)) ?: null;
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;
} catch (\Throwable $e) {
@@ -220,10 +220,11 @@ class NotificationDispatcher
} else {
try {
$html = OrganizationBranding::wrapEmailHtml(nl2br(e($message)), $organization);
$fromName = trim((string) ($credential->bird_from_name ?: $organization->name)) ?: null;
$sent = $this->customerEmail->send(
$apiKey,
(string) $credential->bird_from_email,
$credential->bird_from_name,
$fromName,
(string) $host->email,
$title,
$html,