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

Fixes on new model

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2020-07-26 23:17:49 +02:00
parent 4de381db06
commit 71e27ce9c3
19 changed files with 116 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
app/DataTables/Shop/ArticlesDataTable.php
View File

@@ -13,30 +13,15 @@ class ArticlesDataTable extends DataTable
public function query(Article $model)
{
// $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('Family')->select('shop_articles.*');
$model = $model::with('article_family')->select('shop_articles.*');
// $model = $model::joinRelations('Family')->select('shop_articles.*','shop_article_families.name as family_name');
return self::buildQuery($model);
}
protected function getColumns()
{
/*
$columns = [];
$columns[] = [
'name' => 'family',
'data' => 'family.name',
'title' => 'Famille',
'orderable' => false
];
$columns[] = [
'name' => 'name',
'title' => 'Nom',
];
$columns[] = self::makeColumnButtons();
return $columns;
*/
return [
Column::make('family.name')->title('Famille')->orderable(false),
Column::make('article_family.name')->title('Famille')->orderable(false),
Column::make('name')->title('Nom'),
self::makeColumnButtons(),
];