diff --git a/app/Listeners/Menu/ShowInNotifications.php b/app/Listeners/Menu/ShowInNotifications.php index 6ba776b82..c73da1ecc 100644 --- a/app/Listeners/Menu/ShowInNotifications.php +++ b/app/Listeners/Menu/ShowInNotifications.php @@ -59,6 +59,13 @@ class ShowInNotifications continue; } + $app_url = route('apps.app.show', [ + 'alias' => $new_app->alias, + 'utm_source' => 'notification', + 'utm_medium' => 'software', + 'utm_campaign' => str_replace('-', '', $new_app->alias), + ]); + $new = new DatabaseNotification(); $new->id = $key; $new->type = 'new-apps'; @@ -66,7 +73,7 @@ class ShowInNotifications $new->notifiable_id = user()->id; $new->data = [ 'title' => $new_app->name, - 'description' => '', // $new_app->message, + 'description' => trans('notifications.new_apps', ['app' => $new_app->name, 'url' => $app_url]), 'alias' => $new_app->alias, ]; $new->created_at = $new_app->started_at->date; diff --git a/resources/lang/en-GB/notifications.php b/resources/lang/en-GB/notifications.php index f94a6b39e..896c6378d 100644 --- a/resources/lang/en-GB/notifications.php +++ b/resources/lang/en-GB/notifications.php @@ -6,9 +6,10 @@ return [ 'hello' => 'Hello!', 'salutation' => 'Regards,
:company_name', 'subcopy' => 'If you’re having trouble clicking the ":text" button, copy and paste the URL below into your web browser: [:url](:url)', - 'mark_read' => 'Mark Read', - 'mark_read_all' => 'Mark Read All', + 'mark_read' => 'Mark as Read', + 'mark_read_all' => 'Mark as All Read', 'empty' => 'Woohoo, notification zero!', + 'new_apps' => ':app is available. Check it out now!', 'update' => [ diff --git a/resources/views/livewire/menu/notifications.blade.php b/resources/views/livewire/menu/notifications.blade.php index 31249be66..57af525d6 100644 --- a/resources/views/livewire/menu/notifications.blade.php +++ b/resources/views/livewire/menu/notifications.blade.php @@ -9,7 +9,7 @@ @if ($notifications)
- + @@ -26,15 +26,18 @@
{!! $notification->data['title'] !!} - {{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }} + + + {{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }} +
@if ($notification->type != 'updates') - - - + + + @endif