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

Add filters

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-11-01 23:42:53 +01:00
parent e8d503b65d
commit eb0c9444bc
18 changed files with 148 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -14,7 +14,7 @@ class VarietiesDataTable extends DataTable
public function query(Variety $model)
{
// $model = $model::with('specie')->withCount('Articles')->select('botanic_varieties.*');
$model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with(['image','Specie'])->withCount('Articles');
$model = $model::joinRelationship('Specie')->select('botanic_varieties.*', 'botanic_species.name as specie_name')->with(['image', 'Specie'])->withCount(['Articles', 'tags']);
return $this->buildQuery($model);
}
@@ -37,6 +37,7 @@ class VarietiesDataTable extends DataTable
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),
Column::make('tags_count')->title('Nb tags')->class('text-right')->searchable(false),
$this->makeColumnButtons(),
];
}

24
app/Datatables/Shop/OffersDataTable.php
View File

@@ -13,17 +13,31 @@ class OffersDataTable extends DataTable
public function query(Offer $model)
{
$model = $model->with(['article.article_nature', 'variation', 'tariff']);
$model = self::filterByArticleNature($model);
$model = self::filterByPackage($model);
return $this->buildQuery($model);
}
public static function filterByArticleNature($model, $article_nature_id = false)
{
$article_nature_id = $article_nature_id ? $article_nature_id : self::isFilteredByField('article_nature_id');
return $article_nature_id ? $model->byArticleNature($article_nature_id) : $model;
}
public static function filterByPackage($model, $package_id = false)
{
$package_id = $package_id ? $package_id : self::isFilteredByField('package_id');
return $package_id ? $model->byPackage($package_id) : $model;
}
protected function getColumns()
{
return [
Column::make('article.name')->title('Article'),
Column::make('article.article_nature.name')->title('Nature'),
Column::make('variation.name')->title('Déclinaison'),
Column::make('tariff.name')->title('Tarif'),
$this->makeColumnButtons(),
Column::make('article.name')->title('Article'),
Column::make('article.article_nature.name')->title('Nature'),
Column::make('variation.name')->title('Déclinaison'),
Column::make('tariff.name')->title('Tarif'),
$this->makeColumnButtons(),
];
}
}