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

fixed notification query

Browse Source
This commit is contained in:
Cüneyt Şentürk
2021-06-25 12:24:28 +03:00
parent aad691c5ae
commit 1b7f7ac34e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Livewire/Common/Notifications/Exports.php
View File

@@ -57,8 +57,10 @@ class Exports extends Component
protected function getNotifications($limit = false)
{
$query = user()->notifications()->unread()
->where('type', 'App\Notifications\Common\ExportCompleted')
->where('type', 'App\Notifications\Common\ExportFailed');
->where(function ($query) {
$query->where('type', 'App\Notifications\Common\ExportCompleted')
->orWhere('type', 'App\Notifications\Common\ExportFailed');
});
if ($limit) {
$notifications = $query->paginate($limit);

6
app/Http/Livewire/Common/Notifications/Imports.php
View File

@@ -57,8 +57,10 @@ class Imports extends Component
protected function getNotifications($limit = false)
{
$query = user()->notifications()->unread()
->where('type', 'App\Notifications\Common\ImportCompleted')
->where('type', 'App\Notifications\Common\ImportFailed');
->where(function ($query) {
$query->where('type', 'App\Notifications\Common\ImportCompleted')
->orWhere('type', 'App\Notifications\Common\ImportFailed');
});
if ($limit) {
$notifications = $query->paginate($limit);