From 768c7e88f971e62565c42a4e056262bfe48e8894 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Tue, 24 Aug 2021 20:42:51 +0200
Subject: [PATCH] Fix relationship

---
 app/Datatables/Botanic/VarietiesDataTable.php | 2 +-
 app/Models/Botanic/Variety.php                | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/Datatables/Botanic/VarietiesDataTable.php b/app/Datatables/Botanic/VarietiesDataTable.php
index 6170e719..0c56587e 100644
--- a/app/Datatables/Botanic/VarietiesDataTable.php
+++ b/app/Datatables/Botanic/VarietiesDataTable.php
@@ -13,7 +13,7 @@ class VarietiesDataTable extends DataTable
     public function query(Variety $model)
     {
         // $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
-        $model = $model::joinRelations('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with('Specie')->withCount('Articles');
+        $model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with('Specie')->withCount('Articles');
         return self::buildQuery($model);
     }
 
diff --git a/app/Models/Botanic/Variety.php b/app/Models/Botanic/Variety.php
index 80eeb311..6fdf103c 100644
--- a/app/Models/Botanic/Variety.php
+++ b/app/Models/Botanic/Variety.php
@@ -12,11 +12,11 @@ use Spatie\MediaLibrary\InteractsWithMedia;
 use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 use Rinvex\Tags\Traits\Taggable;
-use Fico7489\Laravel\EloquentJoin\Traits\EloquentJoin;
+use Kirschbaum\PowerJoins\PowerJoins;
 use Wildside\Userstamps\Userstamps;
 class Variety extends Model implements HasMedia
 {
-    use EloquentJoin, InteractsWithMedia, Taggable, SoftDeletes, UserStamps;
+    use InteractsWithMedia, PowerJoins, Taggable, SoftDeletes, UserStamps;
 
     protected $guarded = ['id'];
     protected $table = 'botanic_varieties';