fixes

app/DataTables/Botanic/GenresDataTable.php

@@ -16,13 +16,24 @@ class GenresDataTable extends DataTable
         return self::buildQuery($model);
     }
 
+    public function modifier($datatables)
+    {
+        $datatables
+            ->editColumn('family_name', function(Genre $genre) {
+                return $genre->family ? $genre->family->name : ''; 
+            })
+            ->rawColumns(['genre_name', 'action'])
+        ;
+        return Parent::modifier($datatables);
+    }
+
     protected function getColumns()
     {
         return [
             Column::make('name')->title('Nom'),
             Column::make('alias'),
             Column::make('latin'),
-            Column::make('family.name')->title('Famille'),
+            Column::make('family.name')->data('family_name')->title('Famille'),
             Column::make('species_count')->title('Nb Espèces')->searchable(false)->addClass('text-right'),
             Column::make('varieties_count')->title('Nb Variétés')->searchable(false)->addClass('text-right'),
             self::makeColumnButtons(),

app/DataTables/Botanic/SpeciesDataTable.php

@@ -16,12 +16,24 @@ class SpeciesDataTable extends DataTable
 		return self::buildQuery($model);
 	}
 
+	public function modifier($datatables)
+	{
+		$datatables
+			->editColumn('genre_name', function(Specie $specie) {
+				return $specie->genre ? $specie->genre->name : ''; 
+			})
+			->rawColumns(['genre_name', 'action'])
+		;
+		return Parent::modifier($datatables);
+	}
+
+
 	protected function getColumns()
 	{
 		return [
 			Column::make('name')->title('Nom'),
 			Column::make('alias'),
-            Column::make('genre.name')->title('Genre'),
+			Column::make('genre.name')->data('genre_name')->title('Genre'),
 			Column::make('latin'),
 			Column::make('varieties_count')->title('Nb variétés')->searchable(false)->addClass('text-right'),
 			self::makeColumnButtons(),

app/DataTables/Shop/PackagesDataTable.php

@@ -13,9 +13,16 @@ class PackagesDataTable extends DataTable
 	public function query(Package $model)
 	{
 		$model = $model::with(['article_family'])->select('shop_packages.*');
+		$model = self::filterByFamily($model);
 		return self::buildQuery($model);
 	}
 
+	public static function filterByFamily($model, $family_id = false)
+	{
+		$family_id = $family_id ? $family_id : self::isFilteredByField('family_id');
+		return $family_id ? $model->byArticleFamily($family_id) : $model;	
+	}
+
 	protected function getColumns()
 	{
 		return [

app/Http/Controllers/Botanic/Admin/VarietyController.php

@@ -19,11 +19,6 @@ class VarietyController extends Controller
 		return $dataTable->render('Botanic.Admin.Varieties.list');
 	}
 
-    public function getDatatable(Request $request)
-    {
-        return Varieties::getDatatable($request->all());
-    }
-
 	public function getOptionsWithSpecie()
 	{
 		return response()->json(Varieties::getOptionsWithSpecie());
@@ -78,4 +73,6 @@ class VarietyController extends Controller
 	{
 		return Varieties::exportExcel();
 	}
+
+
 }

app/Http/Controllers/Shop/Admin/ArticleController.php

@@ -31,8 +31,8 @@ class ArticleController extends Controller
 	public function store(Request $request)
 	{
 		$data = $request->all();
-		dump($data);
+		// dump($data);
-		exit;
+		// exit;
 		Articles::storeFull($data);
 		return redirect()->route('Shop.Admin.Articles.index');
 	}

app/Http/Controllers/Shop/Admin/TagGroupController.php

@@ -6,6 +6,7 @@ use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 
 use App\Repositories\Shop\TagGroups;
+use App\Repositories\Shop\ArticleFamilies;
 use App\DataTables\Shop\TagGroupsDataTable; 
 
 class TagGroupController extends Controller
@@ -40,6 +41,7 @@ class TagGroupController extends Controller
 	public function edit($id)
 	{
 		$data = TagGroups::get($id);
+		$data['article_families'] = ArticleFamilies::getOptions();
 		return view('Shop.Admin.TagGroups.edit', $data);
 	}
 

app/Models/Botanic/Variety.php

@@ -10,9 +10,7 @@ use Fico7489\Laravel\EloquentJoin\Traits\EloquentJoin;
 
 class Variety extends Model implements HasMedia
 {
-	use HasMediaTrait;
+	use EloquentJoin, HasMediaTrait, Taggable;
-    use EloquentJoin;
-    use Taggable;
 
 	protected $guarded = ['id'];
 	protected $table = 'botanic_varieties';

app/Models/Shop/Article.php

@@ -11,7 +11,7 @@ use Fico7489\Laravel\EloquentJoin\Traits\EloquentJoin;
 
 class Article extends Model implements HasMedia
 {
-    use Categorizable, Taggable, HasMediaTrait, EloquentJoin;
+	use Categorizable, EloquentJoin, HasMediaTrait, Taggable;
 
 	protected $guarded = ['id']; 
 	protected $table = 'shop_articles'; 
@@ -21,11 +21,6 @@ class Article extends Model implements HasMedia
 		return $this->belongsTo('App\Models\Shop\ArticleFamily');
 	}
 
-    public function attributes()
-    {
-        return $this->hasMany('App\Models\Shop\ArticleAttribute');
-    }
-
 	public function images()
 	{
 		return $this->hasMany('App\Models\Core\Media','model_id')->where('model_type','App\Models\Shop\Article');

app/Repositories/Botanic/Varieties.php

@@ -58,7 +58,8 @@ class Varieties
 
 	public static function getTagsByVariety($variety)
 	{
-		return $variety->tags->pluck('id')->toArray();
+		$tags = $variety->tags; 
+		return $tags ? $tags->pluck('id')->toArray() : null;
 	}
 
 

app/Repositories/Shop/Articles.php

@@ -28,7 +28,7 @@ class Articles
 
 	public static function getFull($id)
 	{
-		$article = self::get($id);
+		$article = Article::with('product')->findOrFail($id);
 		$data = $article->toArray();
 		$data['categories'] = self::getCategoriesByArticle($article);
 		$data['tags'] = self::getTagsByArticle($article);
@@ -177,6 +177,9 @@ class Articles
 
 	public static function getThumbSrc($image)
 	{
+		if (!$image) {
+			return null;
+		}
 		$id = $image['id'];
 		$images = json_decode($image['responsive_images'], true);
 		$urls = $images['medialibrary_original']['urls'];

resources/views/Shop/Admin/Packages/list.blade.php

@@ -5,8 +5,9 @@
 ])
 
 @section('content')
+
 	@component('components.card')
-		@include('components.datatable', ['route' => route('Shop.Admin.Packages.index'), 'model' => 'packages'])
+		@include('components.datatable', ['route' => route('Shop.Admin.Packages.index'), 'model' => 'packages', 'with_filters' => true])
 	@endcomponent
 
 	@component('components.layout.modal', ['title' => 'Filtres', 'id' => 'modal-packages-filters'])

resources/views/Shop/Admin/TagGroups/form.blade.php

@@ -1,8 +1,11 @@
 <div class="row">
-	<div class="col-md-8">
+	<div class="col-md-6">
+		{{ Form::label('name', 'Famille d\'articles') }}
+		@include('components.select', ['name' => 'article_family_id', 'value' => $article_family_id ?? null, 'list' => $article_families ?? [], 'required' => true, 'with_empty' => ''])
+	</div>
+	<div class="col-md-6">
 		{{ Form::label('name', 'Nom') }}
 		@include('components.input', ['name' => 'name', 'value' => isset($name) ? $name : null, 'required' => true])
-
 	</div>
 </div>