Merge pull request #1202 from openclassify/vedat

add new service

addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php

@@ -11,8 +11,14 @@ class AdvApiCollection extends AdvRepository
 
     public function getMyAds()
     {
-        return $this->model->userAdv()
+        return $this->currentAds()
-            ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
+            ->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;
     }

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()

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();

addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig

@@ -2,7 +2,7 @@
     <li class="categories-list-li category-icon category-{{ main_category.slug }}">
         {% set categoryIcon = (main_category.icon) ? main_category.icon : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
 
-        <img src="{{ categoryIcon }}" alt="{{ main_category.name }}" class="img-responsive">
+        <img src="{{ categoryIcon }}?v={{ random() }}" alt="{{ main_category.name }}" class="img-responsive">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
             <b>{{ main_category.name }}</b>
             {% if showAdsCount %}

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)

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());
             }