shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New app notification description empty issue solved ( #32w9d5y )

Browse Source
This commit is contained in:
Cüneyt Şentürk 2022-06-24 09:06:46 +03:00
parent 43dba38232
commit 22bdcd12f7
3 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/Listeners/Menu/ShowInNotifications.php
View File

@ -59,6 +59,13 @@ class ShowInNotifications
continue; 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 = new DatabaseNotification();
$new->id = $key; $new->id = $key;
$new->type = 'new-apps'; $new->type = 'new-apps';
@ -66,7 +73,7 @@ class ShowInNotifications
$new->notifiable_id = user()->id; $new->notifiable_id = user()->id;
$new->data = [ $new->data = [
'title' => $new_app->name, 'title' => $new_app->name,
'description' => '', // $new_app->message, 'description' => trans('notifications.new_apps', ['app' => $new_app->name, 'url' => $app_url]),
'alias' => $new_app->alias, 'alias' => $new_app->alias,
]; ];
$new->created_at = $new_app->started_at->date; $new->created_at = $new_app->started_at->date;

5
resources/lang/en-GB/notifications.php
View File

@ -6,9 +6,10 @@ return [
'hello' => 'Hello!', 'hello' => 'Hello!',
'salutation' => 'Regards,<br> :company_name', 'salutation' => 'Regards,<br> :company_name',
'subcopy' => 'If you’re having trouble clicking the ":text" button, copy and paste the URL below into your web browser: [:url](:url)', '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' => 'Mark as Read',
'mark_read_all' => 'Mark Read All', 'mark_read_all' => 'Mark as All Read',
'empty' => 'Woohoo, notification zero!', 'empty' => 'Woohoo, notification zero!',
'new_apps' => ':app is available. <a href=":url">Check it out now</a>!',
'update' => [ 'update' => [

17
resources/views/livewire/menu/notifications.blade.php
View File

@ -9,7 +9,7 @@
@if ($notifications) @if ($notifications)
<div class="flex justify-end mt-1 mb-3"> <div class="flex justify-end mt-1 mb-3">
<x-tooltip id="notification-all" placement="top" message="Mark as All Read"> <x-tooltip id="notification-all" placement="top" message="{{ trans('notifications.mark_read_all') }}">
<button type="button" wire:click="markReadAll()"> <button type="button" wire:click="markReadAll()">
<span id="menu-notification-read-all" class="material-icons text-lg text-purple">done_all</span> <span id="menu-notification-read-all" class="material-icons text-lg text-purple">done_all</span>
</button> </button>
@ -26,15 +26,18 @@
<div class="flex items-start justify-between font-medium text-sm text-purple mb-1"> <div class="flex items-start justify-between font-medium text-sm text-purple mb-1">
<div class="flex flex-col"> <div class="flex flex-col">
{!! $notification->data['title'] !!} {!! $notification->data['title'] !!}
<span class="text-gray-500" style="font-size: 10px;">{{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }}</span>
<span class="text-gray-500" style="font-size: 10px;">
{{ \Carbon\Carbon::createFromTimeStamp(strtotime($notification->created_at))->diffForHumans() }}
</span>
</div> </div>
@if ($notification->type != 'updates') @if ($notification->type != 'updates')
<x-tooltip id="notification-{{ $notification->id }}" placement="top" message="Clear Notification"> <x-tooltip id="notification-{{ $notification->id }}" placement="top" message="{{ trans('notifications.mark_read') }}">
<button type="button" wire:click="markRead('{{ $notification->type }}', '{{ $notification->id }}')"> <button type="button" wire:click="markRead('{{ $notification->type }}', '{{ $notification->id }}')">
<span id="menu-notification-mark-read" class="material-icons text-lg text-purple">check_circle_outline</span> <span id="menu-notification-mark-read" class="material-icons text-lg text-purple">check_circle_outline</span>
</button> </button>
</x-tooltip> </x-tooltip>
@endif @endif
</div> </div>