From e8d503b65d70111f7c96b5c2ff51b2e17f9e5217 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Mon, 1 Nov 2021 18:50:17 +0100
Subject: [PATCH] Minor fixes on traits

---
 app/Datatables/Botanic/SpeciesDataTable.php   |  2 +-
 app/Datatables/Botanic/VarietiesDataTable.php |  2 +-
 app/Datatables/Shop/ArticlesDataTable.php     |  2 +-
 app/Models/Shop/Article.php                   | 26 ++-----------------
 4 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/app/Datatables/Botanic/SpeciesDataTable.php b/app/Datatables/Botanic/SpeciesDataTable.php
index 83b0acfc..0412d11a 100644
--- a/app/Datatables/Botanic/SpeciesDataTable.php
+++ b/app/Datatables/Botanic/SpeciesDataTable.php
@@ -34,7 +34,7 @@ class SpeciesDataTable extends DataTable
     {
         return [
             Column::make('name')->title('Nom'),
-            Column::make('thumb')->searchable(false)->orderable(false)->width(40)->class('text-center'),
+            Column::make('thumb')->title('')->searchable(false)->orderable(false)->width(40)->class('text-center'),
             Column::make('alias'),
             Column::make('genre.name')->data('genre_name')->title('Genre'),
             Column::make('latin'),
diff --git a/app/Datatables/Botanic/VarietiesDataTable.php b/app/Datatables/Botanic/VarietiesDataTable.php
index 2f290213..aab54b9f 100644
--- a/app/Datatables/Botanic/VarietiesDataTable.php
+++ b/app/Datatables/Botanic/VarietiesDataTable.php
@@ -34,7 +34,7 @@ class VarietiesDataTable extends DataTable
     {
         return [
             Column::make('Specie.name')->data('specie_name')->title('Espèce'),
-            Column::make('thumb')->searchable(false)->orderable(false)->width(40)->class('text-center'),
+            Column::make('thumb')->title('')->searchable(false)->orderable(false)->width(40)->class('text-center'),
             Column::make('name')->title('Nom'),
             Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
             $this->makeColumnButtons(),
diff --git a/app/Datatables/Shop/ArticlesDataTable.php b/app/Datatables/Shop/ArticlesDataTable.php
index 2906ee7f..3b45b4fe 100644
--- a/app/Datatables/Shop/ArticlesDataTable.php
+++ b/app/Datatables/Shop/ArticlesDataTable.php
@@ -39,7 +39,7 @@ class ArticlesDataTable extends DataTable
     {
         return [
             Column::make('article_nature.name')->title('Nature'),
-            Column::make('thumb')->searchable(false)->orderable(false)->width(40)->class('text-center'),
+            Column::make('thumb')->title('')->searchable(false)->orderable(false)->width(40)->class('text-center'),
             Column::make('name')->title('Nom'),
             Column::make('tags_count')->title('Tags')->class('text-right')->searchable(false),
             Column::make('categories_count')->title('Rayons')->class('text-right')->searchable(false),
diff --git a/app/Models/Shop/Article.php b/app/Models/Shop/Article.php
index 272111b1..69d44fcc 100644
--- a/app/Models/Shop/Article.php
+++ b/app/Models/Shop/Article.php
@@ -5,11 +5,7 @@ namespace App\Models\Shop;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
 
-use Spatie\Image\Manipulations;
 use Spatie\MediaLibrary\HasMedia;
-use Spatie\MediaLibrary\InteractsWithMedia;
-use Spatie\MediaLibrary\MediaCollections\Models\Media;
-
 use Rinvex\Categories\Traits\Categorizable;
 use Rinvex\Tags\Traits\Taggable;
 use Kirschbaum\PowerJoins\PowerJoins;
@@ -17,10 +13,11 @@ use Fico7489\Laravel\EloquentJoin\Traits\EloquentJoin;
 use Wildside\Userstamps\Userstamps;
 
 use App\Traits\Model\HasComments;
+use App\Traits\Model\Imageable;
 
 class Article extends Model implements HasMedia
 {
-    use Categorizable, EloquentJoin, HasComments, InteractsWithMedia, Powerjoins, Taggable, SoftDeletes, UserStamps;
+    use Categorizable, EloquentJoin, HasComments, Imageable, Powerjoins, Taggable, SoftDeletes, UserStamps;
 
     protected $guarded = ['id'];
     protected $table = 'shop_articles';
@@ -30,16 +27,6 @@ class Article extends Model implements HasMedia
         return $this->belongsTo(ArticleNature::class);
     }
 
-    public function images()
-    {
-        return $this->hasMany('App\Models\Core\Media', 'model_id')->where('model_type', 'App\Models\Shop\Article');
-    }
-
-    public function image()
-    {
-        return $this->hasOne('App\Models\Core\Media', 'model_id')->where('model_type', 'App\Models\Shop\Article');
-    }
-
     public function invoiceItems()
     {
         return $this->hasMany(InvoiceItem::class);
@@ -101,13 +88,4 @@ class Article extends Model implements HasMedia
     {
         return $query->has('Offers');
     }
-
-    public function registerMediaConversions(Media $media = null) : void
-    {
-        $this->addMediaConversion('thumb')->fit(Manipulations::FIT_CROP, 32, 32);
-        $this->addMediaConversion('mini')->fit(Manipulations::FIT_CROP, 96, 96);
-        $this->addMediaConversion('preview')->fit(Manipulations::FIT_CROP, 160, 160);
-        $this->addMediaConversion('normal')->fit(Manipulations::FIT_CROP, 480, 480);
-        $this->addMediaConversion('zoom')->fit(Manipulations::FIT_CROP, 1200, 1200)->withResponsiveImages();
-    }
 }