jev/opensem
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor fixes on traits

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-01 18:50:17 +01:00
parent e9ce44481a
commit 459d35e8a1
4 changed files with 5 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/Datatables/Botanic/SpeciesDataTable.php
View File

@@ -34,7 +34,7 @@ class SpeciesDataTable extends DataTable
{ {
return [ return [
Column::make('name')->title('Nom'), 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('alias'),
Column::make('genre.name')->data('genre_name')->title('Genre'), Column::make('genre.name')->data('genre_name')->title('Genre'),
Column::make('latin'), Column::make('latin'),

2
app/Datatables/Botanic/VarietiesDataTable.php
View File

@@ -34,7 +34,7 @@ class VarietiesDataTable extends DataTable
{ {
return [ return [
Column::make('Specie.name')->data('specie_name')->title('Espèce'), 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('name')->title('Nom'),
Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false), Column::make('articles_count')->title('Nb articles')->class('text-right')->searchable(false),
$this->makeColumnButtons(), $this->makeColumnButtons(),

2
app/Datatables/Shop/ArticlesDataTable.php
View File

@@ -39,7 +39,7 @@ class ArticlesDataTable extends DataTable
{ {
return [ return [
Column::make('article_nature.name')->title('Nature'), 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('name')->title('Nom'),
Column::make('tags_count')->title('Tags')->class('text-right')->searchable(false), Column::make('tags_count')->title('Tags')->class('text-right')->searchable(false),
Column::make('categories_count')->title('Rayons')->class('text-right')->searchable(false), Column::make('categories_count')->title('Rayons')->class('text-right')->searchable(false),

26
app/Models/Shop/Article.php
View File

@@ -5,11 +5,7 @@ namespace App\Models\Shop;
use Illuminate\Database\Eloquent\Model; use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\SoftDeletes;
use Spatie\Image\Manipulations;
use Spatie\MediaLibrary\HasMedia; use Spatie\MediaLibrary\HasMedia;
use Spatie\MediaLibrary\InteractsWithMedia;
use Spatie\MediaLibrary\MediaCollections\Models\Media;
use Rinvex\Categories\Traits\Categorizable; use Rinvex\Categories\Traits\Categorizable;
use Rinvex\Tags\Traits\Taggable; use Rinvex\Tags\Traits\Taggable;
use Kirschbaum\PowerJoins\PowerJoins; use Kirschbaum\PowerJoins\PowerJoins;
@@ -17,10 +13,11 @@ use Fico7489\Laravel\EloquentJoin\Traits\EloquentJoin;
use Wildside\Userstamps\Userstamps; use Wildside\Userstamps\Userstamps;
use App\Traits\Model\HasComments; use App\Traits\Model\HasComments;
use App\Traits\Model\Imageable;
class Article extends Model implements HasMedia 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 $guarded = ['id'];
protected $table = 'shop_articles'; protected $table = 'shop_articles';
@@ -30,16 +27,6 @@ class Article extends Model implements HasMedia
return $this->belongsTo(ArticleNature::class); 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() public function invoiceItems()
{ {
return $this->hasMany(InvoiceItem::class); return $this->hasMany(InvoiceItem::class);
@@ -101,13 +88,4 @@ class Article extends Model implements HasMedia
{ {
return $query->has('Offers'); 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();
}
} }