Converted all notification emails to the branded layout by routing them through a shared Blade template and swapping
the MailMessage builders to use view(). This keeps the existing copy/labels but aligns the look with resources/views/ emails/partials/layout.blade.php. I also switched the customer add‑on receipt notification to reuse the existing branded view and added missing translations for the upload pipeline alert.
This commit is contained in:
@@ -26,18 +26,32 @@ class AddonPurchased extends Notification implements ShouldQueue
|
||||
$label = $this->addon->metadata['label'] ?? $this->addon->addon_key;
|
||||
$amount = $this->addon->amount ? number_format((float) $this->addon->amount, 2) : null;
|
||||
$currency = $this->addon->currency ?? 'EUR';
|
||||
$subject = __('emails.ops.addon.subject', ['addon' => $label]);
|
||||
$greeting = __('emails.ops.addon.greeting');
|
||||
$lines = [
|
||||
__('emails.ops.addon.tenant', ['tenant' => $tenant?->name ?? __('emails.tenant_feedback.unknown_tenant')]),
|
||||
__('emails.ops.addon.event', ['event' => $event?->name['de'] ?? $event?->name['en'] ?? $event?->name ?? __('emails.package_limits.event_fallback')]),
|
||||
__('emails.ops.addon.addon', ['addon' => $label, 'quantity' => $this->addon->quantity]),
|
||||
];
|
||||
|
||||
if ($amount) {
|
||||
$lines[] = __('emails.ops.addon.amount', ['amount' => $amount, 'currency' => $currency]);
|
||||
}
|
||||
|
||||
$lines[] = __('emails.ops.addon.provider', [
|
||||
'checkout' => $this->addon->checkout_id ?? '—',
|
||||
'transaction' => $this->addon->transaction_id ?? '—',
|
||||
]);
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('emails.ops.addon.subject', ['addon' => $label]))
|
||||
->greeting(__('emails.ops.addon.greeting'))
|
||||
->line(__('emails.ops.addon.tenant', ['tenant' => $tenant?->name ?? __('emails.tenant_feedback.unknown_tenant')]))
|
||||
->line(__('emails.ops.addon.event', ['event' => $event?->name['de'] ?? $event?->name['en'] ?? $event?->name ?? __('emails.package_limits.event_fallback')]))
|
||||
->line(__('emails.ops.addon.addon', ['addon' => $label, 'quantity' => $this->addon->quantity]))
|
||||
->when($amount, fn ($mail) => $mail->line(__('emails.ops.addon.amount', ['amount' => $amount, 'currency' => $currency])))
|
||||
->line(__('emails.ops.addon.provider', [
|
||||
'checkout' => $this->addon->checkout_id ?? '—',
|
||||
'transaction' => $this->addon->transaction_id ?? '—',
|
||||
]))
|
||||
->line(__('emails.ops.addon.footer'));
|
||||
->subject($subject)
|
||||
->view('emails.notifications.basic', [
|
||||
'title' => $subject,
|
||||
'preheader' => $greeting,
|
||||
'heroTitle' => $greeting,
|
||||
'heroSubtitle' => $subject,
|
||||
'lines' => $lines,
|
||||
'footer' => __('emails.ops.addon.footer'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -25,19 +25,28 @@ class PurchaseCreated extends Notification implements ShouldQueue
|
||||
$package = $this->purchase->package;
|
||||
$amount = number_format((float) $this->purchase->price, 2);
|
||||
$consents = $this->purchase->metadata['consents'] ?? [];
|
||||
$subject = __('emails.ops.purchase.subject', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]);
|
||||
$greeting = __('emails.ops.purchase.greeting');
|
||||
|
||||
return (new MailMessage)
|
||||
->subject(__('emails.ops.purchase.subject', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]))
|
||||
->greeting(__('emails.ops.purchase.greeting'))
|
||||
->line(__('emails.ops.purchase.tenant', ['tenant' => $tenant?->name ?? __('emails.tenant_feedback.unknown_tenant')]))
|
||||
->line(__('emails.ops.purchase.package', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]))
|
||||
->line(__('emails.ops.purchase.amount', ['amount' => $amount, 'currency' => '€']))
|
||||
->line(__('emails.ops.purchase.provider', ['provider' => $this->purchase->provider, 'id' => $this->purchase->provider_id ?? '—']))
|
||||
->line(__('emails.ops.purchase.consents', [
|
||||
'legal' => $consents['legal_version'] ?? 'n/a',
|
||||
'terms' => $consents['accepted_terms_at'] ?? 'n/a',
|
||||
'waiver' => $consents['digital_content_waiver_at'] ?? 'n/a',
|
||||
]))
|
||||
->line(__('emails.ops.purchase.footer'));
|
||||
->subject($subject)
|
||||
->view('emails.notifications.basic', [
|
||||
'title' => $subject,
|
||||
'preheader' => $greeting,
|
||||
'heroTitle' => $greeting,
|
||||
'heroSubtitle' => $subject,
|
||||
'lines' => [
|
||||
__('emails.ops.purchase.tenant', ['tenant' => $tenant?->name ?? __('emails.tenant_feedback.unknown_tenant')]),
|
||||
__('emails.ops.purchase.package', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]),
|
||||
__('emails.ops.purchase.amount', ['amount' => $amount, 'currency' => '€']),
|
||||
__('emails.ops.purchase.provider', ['provider' => $this->purchase->provider, 'id' => $this->purchase->provider_id ?? '—']),
|
||||
__('emails.ops.purchase.consents', [
|
||||
'legal' => $consents['legal_version'] ?? 'n/a',
|
||||
'terms' => $consents['accepted_terms_at'] ?? 'n/a',
|
||||
'waiver' => $consents['digital_content_waiver_at'] ?? 'n/a',
|
||||
]),
|
||||
],
|
||||
'footer' => __('emails.ops.purchase.footer'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -29,24 +29,33 @@ class RefundProcessed extends Notification implements ShouldQueue
|
||||
$tenant = $this->purchase->tenant;
|
||||
$package = $this->purchase->package;
|
||||
$amount = number_format((float) $this->purchase->price, 2);
|
||||
|
||||
$mail = (new MailMessage)
|
||||
->subject(__('emails.ops.refund.subject', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]))
|
||||
->greeting(__('emails.ops.refund.greeting'))
|
||||
->line(__('emails.ops.refund.tenant', ['tenant' => $tenant?->name ?? __('emails.tenant_feedback.unknown_tenant')]))
|
||||
->line(__('emails.ops.refund.package', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]))
|
||||
->line(__('emails.ops.refund.amount', ['amount' => $amount, 'currency' => '€']))
|
||||
->line(__('emails.ops.refund.provider', ['provider' => $this->purchase->provider, 'id' => $this->purchase->provider_id ?? '—']))
|
||||
->line($this->success ? __('emails.ops.refund.status_success') : __('emails.ops.refund.status_failed'));
|
||||
$subject = __('emails.ops.refund.subject', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]);
|
||||
$greeting = __('emails.ops.refund.greeting');
|
||||
$lines = [
|
||||
__('emails.ops.refund.tenant', ['tenant' => $tenant?->name ?? __('emails.tenant_feedback.unknown_tenant')]),
|
||||
__('emails.ops.refund.package', ['package' => $package?->name ?? __('emails.package_limits.package_fallback')]),
|
||||
__('emails.ops.refund.amount', ['amount' => $amount, 'currency' => '€']),
|
||||
__('emails.ops.refund.provider', ['provider' => $this->purchase->provider, 'id' => $this->purchase->provider_id ?? '—']),
|
||||
$this->success ? __('emails.ops.refund.status_success') : __('emails.ops.refund.status_failed'),
|
||||
];
|
||||
|
||||
if ($this->reason) {
|
||||
$mail->line(__('emails.ops.refund.reason', ['reason' => $this->reason]));
|
||||
$lines[] = __('emails.ops.refund.reason', ['reason' => $this->reason]);
|
||||
}
|
||||
|
||||
if ($this->error) {
|
||||
$mail->line(__('emails.ops.refund.error', ['error' => $this->error]));
|
||||
$lines[] = __('emails.ops.refund.error', ['error' => $this->error]);
|
||||
}
|
||||
|
||||
return $mail->line(__('emails.ops.refund.footer'));
|
||||
return (new MailMessage)
|
||||
->subject($subject)
|
||||
->view('emails.notifications.basic', [
|
||||
'title' => $subject,
|
||||
'preheader' => $greeting,
|
||||
'heroTitle' => $greeting,
|
||||
'heroSubtitle' => $subject,
|
||||
'lines' => $lines,
|
||||
'footer' => __('emails.ops.refund.footer'),
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user