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

Fixes

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2021-08-24 23:41:10 +02:00
parent 82afe63c60
commit 67f490b2fe
15 changed files with 51 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,9 +15,16 @@ class ArticlesDataTable extends DataTable
// $model = $model::with('Family')->select('shop_articles.*','family.name as family_name')->join('shop_article_families as family', 'family.id', '=', 'shop_articles.article_family_id')->groupBy('shop_articles.id');
$model = $model::with('article_nature')->select('shop_articles.*');
// $model = $model::joinRelations('Family')->select('shop_articles.*','shop_article_families.name as family_name');
$model = self::filterByArticleNature($model);
return self::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;
}
protected function getColumns()
{
return [

1
app/Datatables/Shop/TagsDataTable.php
View File

@@ -21,7 +21,6 @@ class TagsDataTable extends DataTable
{
return [
Column::make('group.name')->title('Groupe'),
Column::make('sort_order')->title('Ordre'),
Column::make('name')->title('Nom'),
self::makeColumnButtons(),
];