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

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:06 +00:00
parent a5ebd1e414
commit a7231ab16f
4 changed files with 40 additions and 6 deletions
+3 -1
View File
@@ -74,10 +74,12 @@ class PlatformEmailClient
->withHeaders(['Idempotency-Key' => $key])
->acceptJson()
->timeout(30)
// from_name: pass the organizer/company display name. Do not default
// to EVENTS_SMTP_FROM_NAME ("Ladill Events") — attendee mail is from the customer.
->post($this->base().'/messages/send', array_filter([
'user' => $ownerPublicId,
'channel' => 'suite',
'from_name' => $fromName ?? config('smtp.from_name'),
'from_name' => $fromName,
'to' => $to,
'subject' => $subject,
'html' => $html,
@@ -133,6 +133,8 @@ class EventEmailService
$brandingSettings = AccountBranding::forOwnerRef($ownerPublicId);
$viewData['logoUrl'] = AccountBranding::emailLogoUrl($brandingSettings);
$viewData['companyName'] = AccountBranding::companyName($brandingSettings);
// From display: organizer name, else account/company branding — never "Ladill Events".
$fromName = trim((string) ($replyToName ?: $viewData['companyName'] ?? '')) ?: null;
$html = View::make($view, $viewData)->render();
$text = strip_tags(str_replace(['<br>', '<br/>', '<br />'], "\n", $html));
@@ -145,6 +147,7 @@ class EventEmailService
$text,
$replyToEmail,
$replyToName,
$fromName,
);
}
}
+23 -4
View File
@@ -5,6 +5,7 @@ namespace App\Services\Events;
use App\Services\Billing\PlatformEmailClient;
use App\Services\Messaging\CustomerEmailClient;
use App\Services\Messaging\MessagingCredentialsService;
use App\Support\AccountBranding;
/**
* Attendee/speaker email: prefer platform suite messaging (zero-config mailbox),
@@ -48,18 +49,20 @@ class EventMailer
?string $text = null,
?string $replyToEmail = null,
?string $replyToName = null,
?string $fromName = null,
): bool {
$this->lastError = null;
$displayName = $this->resolveFromName($ownerPublicId, $fromName, $replyToName);
if ($this->platformEmail->isConfigured()) {
$sent = $this->platformEmail->send($ownerPublicId, $to, $subject, $html, $text);
$sent = $this->platformEmail->send($ownerPublicId, $to, $subject, $html, $text, $displayName);
if ($sent) {
return true;
}
// Suite unavailable (mailbox, allowance) — try Bird power-user path next.
$suiteError = $this->platformEmail->lastError();
if ($this->tryCustomerBird($ownerPublicId, $to, $subject, $html, $text)) {
if ($this->tryCustomerBird($ownerPublicId, $to, $subject, $html, $text, $displayName)) {
return true;
}
@@ -68,7 +71,22 @@ class EventMailer
return false;
}
return $this->tryCustomerBird($ownerPublicId, $to, $subject, $html, $text);
return $this->tryCustomerBird($ownerPublicId, $to, $subject, $html, $text, $displayName);
}
private function resolveFromName(string $ownerPublicId, ?string $fromName, ?string $replyToName): ?string
{
foreach ([$fromName, $replyToName] as $candidate) {
$name = trim((string) $candidate);
if ($name !== '') {
return $name;
}
}
$settings = AccountBranding::forOwnerRef($ownerPublicId);
$company = trim(AccountBranding::companyName($settings));
return $company !== '' && strcasecmp($company, 'Company') !== 0 ? $company : null;
}
private function tryCustomerBird(
@@ -77,6 +95,7 @@ class EventMailer
string $subject,
string $html,
?string $text,
?string $fromName = null,
): bool {
$credential = $this->credentials->forOwner($ownerPublicId);
if (! $credential->hasValidBird()) {
@@ -95,7 +114,7 @@ class EventMailer
$sent = $this->customerEmail->send(
$apiKey,
(string) $credential->bird_from_email,
$credential->bird_from_name,
$credential->bird_from_name ?: $fromName,
$to,
$subject,
$html,