Change tag routines, articles saving is ok

app/Models/Botanic/Variety.php

@@ -5,6 +5,7 @@ namespace App\Models\Botanic;
 use Illuminate\Database\Eloquent\Model;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
+use Rinvex\Tags\Traits\Taggable;
 
 class Variety extends Model implements HasMedia
 {

app/Models/Shop/Article.php

@@ -6,9 +6,9 @@ use Illuminate\Database\Eloquent\Model;
 use Spatie\MediaLibrary\HasMedia\HasMedia;
 use Spatie\MediaLibrary\HasMedia\HasMediaTrait;
 use Rinvex\Categories\Traits\Categorizable;
-use Conner\Tagging\Taggable;
+use Rinvex\Tags\Traits\Taggable;
 
-class Article extends Model
+class Article extends Model implements HasMedia
 {
     use Categorizable;
     use Taggable;
@@ -37,11 +37,6 @@ class Article extends Model
         return $this->hasManyThrough('App\Models\Shop\ArticleAttribute','App\Models\Shop\ArticlePrice');
     }
 
-    public function Categories()
-    {
-        return $this->hasMany('App\Models\Shop\ArticleCategory');
-    }
-
     public function InvoiceItems()
     {
         return $this->hasMany('App\Models\Shop\InvoiceItem');

app/Models/Shop/Category.php

@@ -5,7 +5,7 @@ namespace App\Models\Shop;
 use Illuminate\Database\Eloquent\Model;
 
 use Rinvex\Categories\Traits\Categorizable;
-use Conner\Tagging\Taggable;
+// use Conner\Tagging\Taggable;
 
 class Category extends Model
 {

app/Models/Shop/Tag.php

@@ -7,11 +7,20 @@ use Illuminate\Database\Eloquent\Model;
 class Tag extends Model
 {
     protected $guarded = ['id']; 
-    protected $table = 'tagging_tags';
 
     public function group()
     {
 		return $this->hasOne('App\Models\Shop\TagGroup','id','tag_group_id'); 
     }
 
+    public function scopeByGroup($query, $id)
+    {
+    	return $query->where('tag_group_id', $id);
+    }
+
+    public function getNameAttribute($value)
+    {
+    	return json_decode($value)->fr;
+    }
+
 }

app/Models/Shop/TagGroup.php

@@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model;
 class TagGroup extends Model
 {
     protected $guarded = ['id']; 
-    protected $table = 'tagging_tag_groups';
+    protected $table = 'tag_groups';
 
 	public function tags()
     {

app/Models/Shop/Tax.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models\Shop;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Tax extends Model
+{
+    protected $guarded = ['id']; 
+    protected $table = 'shop_taxes';
+
+    public function price()
+    {
+		return $this->hasMany('App\Models\Shop\ArticlePrice','id','tax_id'); 
+    }
+
+}