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(),
];

5
app/Http/Controllers/Admin/Shop/ArticleController.php
View File

@@ -18,7 +18,7 @@ class ArticleController extends Controller
public function index(ArticlesDataTable $dataTable)
{
$data['families'] = ArticleNatures::getOptions();
$data['article_natures'] = ArticleNatures::getOptions();
return $dataTable->render('Admin.Shop.Articles.list', $data);
}
@@ -44,8 +44,7 @@ class ArticleController extends Controller
public function edit($id)
{
$data = Articles::getMeta();
$data['article'] = Articles::getFull($id);
$data = Articles::getFull($id);
return view('Admin.Shop.Articles.edit', $data);
}

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

@@ -61,16 +61,26 @@ class Article extends Model implements HasMedia
public function scopeByArticle($query, $id)
{
return $query->where('shop_articles.id', $id);
return $query->where($this->table . '.id', $id);
}
public function scopeByCategory($query, $category_id)
{
}
public function scopeByFamily($query, $id)
public function scopeByArticleNature($query, $id)
{
return $query->where('shop_articles.article_family_id', $id);
return $query->where($this->table . '.article_nature_id', $id);
}
public function scopeByProduct($query, $model)
{
return $query->where($this->table . '.product_type', $model);
}
public function scopeByProductId($query, $model_id)
{
return $query->where($this->table . '.product_id', $model_id);
}
public function registerMediaConversions(Media $media = null) : void

2
app/Repositories/Shop/Articles.php
View File

@@ -46,7 +46,7 @@ class Articles
public static function getFull($id)
{
$data = self::getArticleEdit($id);
$data['article'] = self::getArticleEdit($id);
self::getMeta($data);
return $data;
}