diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php index cd428ce96..ab27c59f1 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php @@ -11,8 +11,14 @@ class AdvApiCollection extends AdvRepository public function getMyAds() { - return $this->model->userAdv() - ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')); + return $this->currentAds() + ->where('created_by_id', Auth::id()); + } + + public function getMyExpiredAds() + { + return $this->expiredAds() + ->where('created_by_id', Auth::id()); } public function createNewAd(array $params) @@ -40,7 +46,7 @@ class AdvApiCollection extends AdvRepository $this->checkOwner($ad); - unset($params['ad_id'],$params['id'], $params['created_at'], $params['updated_at'], + unset($params['ad_id'], $params['id'], $params['created_at'], $params['updated_at'], $params['deleted_at'], $params['created_by_id'], $params['updated_by_id']); @@ -49,7 +55,7 @@ class AdvApiCollection extends AdvRepository 'updated_at' => Carbon::now() ]; - $ad->update(array_merge($update_params,$params)); + $ad->update(array_merge($update_params, $params)); return $ad; } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 6d17281cf..77fe83b9b 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -569,6 +569,13 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ->orderBy('publish_at', 'desc'); } + public function expiredAds() { + return $this->newQuery() + ->whereDate('finish_at', '<', date("Y-m-d H:i:s")) + ->where('slug', '!=', '') + ->orderBy('publish_at', 'desc'); + } + public function findByCFJSON($key, $value) { return $this->currentAds() diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php index 4856c3bd3..e47d9286f 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php @@ -57,6 +57,8 @@ interface AdvRepositoryInterface extends EntryRepositoryInterface public function currentAds(); + public function expiredAds(); + public function findByCFJSON($key, $value); public function uploadImage(); diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig index 8bbda877b..5c37b4446 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig @@ -2,7 +2,7 @@
  • {% set categoryIcon = (main_category.icon) ? main_category.icon : img('visiosoft.theme.base::images/default-categories-icon.png').url %} - {{ main_category.name }} + {{ main_category.name }} {{ main_category.name }} {% if showAdsCount %} diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php index 0117cb417..5c4b53182 100644 --- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php +++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php @@ -16,7 +16,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface if ($this->icon === null) { return $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img'))->url(); } - return $this->icon; + return $this->icon.'?v='.rand(); } public function getCat($id) diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php index b5941ed38..5d75a7cb5 100644 --- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php +++ b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/CategoryController.php @@ -271,7 +271,9 @@ class CategoryController extends AdminController $file = $uploader->upload($file, $folder); - $category->setCategoryIconUrl($file->make()->url()); + $url = route('anomaly.module.files::files.view',['folder' => $folder->slug,'name' => $file->name]); + + $category->setCategoryIconUrl($url); } catch (\Exception $exception) { $this->messages->error($exception->getMessage()); }