hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-11 18:01:10 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

#3189 emlak24 bugs

Browse Source
This commit is contained in:
Diatrex 2021-01-28 13:33:37 +03:00
parent 4b30b2a41c
commit cb0152bfd2
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php
View File

@ -1,6 +1,7 @@
<?php namespace Visiosoft\AdvsModule\Adv;
use Anomaly\Streams\Platform\Entry\EntryCollection;
use Carbon\Carbon;
use Illuminate\Container\Container;
use Illuminate\Pagination\LengthAwarePaginator;
use Illuminate\Pagination\Paginator;
@ -26,4 +27,13 @@ class AdvCollection extends EntryCollection
'items', 'total', 'perPage', 'currentPage', 'options'
));
}
public function nonExpired()
{
return $this->filter(
function ($ad) {
return $ad->finish_at->gt(Carbon::now());
}
);
}
}

7
addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
View File

@ -475,15 +475,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
{
$ads = $this
->newQuery()
->whereIn('advs_advs.created_by_id', $usersIDs)
->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
->whereIn('advs_advs.created_by_id', $usersIDs);
if ($status) {
$ads = $ads->where('advs_advs.status', 'approved');
}
if (!$withDraft) {
$ads = $ads->where('advs_advs.slug', '!=', "");
$ads = $ads
->where('advs_advs.slug', '!=', "")
->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
}
return $ads;