verbesserung von benachrichtungen und warnungen an nutzer abgeschlossen. layout editor nun auf gutem stand.

This commit is contained in:
Codex Agent
2025-11-02 11:11:13 +01:00
parent 8e6c66f0db
commit 792b5dfe8b
32 changed files with 1292 additions and 149 deletions

View File

@@ -2,6 +2,7 @@
namespace App\Jobs\Packages;
use App\Jobs\Concerns\LogsTenantNotifications;
use App\Models\TenantPackage;
use App\Notifications\Packages\TenantPackageExpiringNotification;
use Illuminate\Bus\Queueable;
@@ -16,6 +17,7 @@ class SendTenantPackageExpiringNotification implements ShouldQueue
{
use Dispatchable;
use InteractsWithQueue;
use LogsTenantNotifications;
use Queueable;
use SerializesModels;
@@ -36,14 +38,26 @@ class SendTenantPackageExpiringNotification implements ShouldQueue
return;
}
$tenant = $tenantPackage->tenant;
$preferences = app(\App\Services\Packages\TenantNotificationPreferences::class);
if (! $preferences->shouldNotify($tenantPackage->tenant, 'package_expiring')) {
if (! $preferences->shouldNotify($tenant, 'package_expiring')) {
$this->logNotification($tenant, [
'type' => 'package_expiring',
'status' => 'skipped',
'context' => [
'tenant_package_id' => $tenantPackage->id,
'days_remaining' => $this->daysRemaining,
'reason' => 'opt_out',
],
]);
return;
}
$emails = collect([
$tenantPackage->tenant->contact_email,
$tenantPackage->tenant->user?->email,
$tenant->contact_email,
$tenant->user?->email,
])->filter(fn ($email) => is_string($email) && filter_var($email, FILTER_VALIDATE_EMAIL))
->unique();
@@ -53,14 +67,35 @@ class SendTenantPackageExpiringNotification implements ShouldQueue
'days_remaining' => $this->daysRemaining,
]);
$this->logNotification($tenant, [
'type' => 'package_expiring',
'status' => 'skipped',
'context' => [
'tenant_package_id' => $tenantPackage->id,
'days_remaining' => $this->daysRemaining,
'reason' => 'no_recipient',
],
]);
return;
}
foreach ($emails as $email) {
Notification::route('mail', $email)->notify(new TenantPackageExpiringNotification(
$tenantPackage,
$this->daysRemaining,
));
}
$context = [
'tenant_package_id' => $tenantPackage->id,
'days_remaining' => $this->daysRemaining,
];
$this->dispatchToRecipients(
$tenant,
$emails,
'package_expiring',
function (string $email) use ($tenantPackage) {
Notification::route('mail', $email)->notify(new TenantPackageExpiringNotification(
$tenantPackage,
$this->daysRemaining,
));
},
$context
);
}
}