fixes, add weight

This commit is contained in:
Ludovic CANDELLIER
2023-08-01 21:55:17 +02:00
parent 902604b9cd
commit 1cba52bb6d
11 changed files with 295 additions and 180 deletions

View File

@@ -22,18 +22,18 @@ class OffersDataTable extends DataTable
return $this->buildQuery($model);
}
public static function filterByArticleNature($model, $article_nature_id = false)
public static function filterByArticleNature($model, $articleNatureId = false)
{
$article_nature_id = $article_nature_id ? $article_nature_id : self::isFilteredByField('article_nature_id');
$articleNatureId = $articleNatureId ? $articleNatureId : self::isFilteredByField('article_nature_id');
return $article_nature_id ? $model->byArticleNature($article_nature_id) : $model;
return $articleNatureId ? $model->byArticleNature($articleNatureId) : $model;
}
public static function filterByPackage($model, $package_id = false)
public static function filterByPackage($model, $packageId = false)
{
$package_id = $package_id ? $package_id : self::isFilteredByField('package_id');
$packageId = $packageId ? $packageId : self::isFilteredByField('package_id');
return $package_id ? $model->byPackage($package_id) : $model;
return $packageId ? $model->byPackage($packageId) : $model;
}
public function modifier($datatables)
@@ -49,7 +49,7 @@ class OffersDataTable extends DataTable
'on' => __('active'),
'off' => __('inactive'),
'meta' => 'data-id='.$offer->id,
'size' => 'sm',
'size' => 'xs',
]);
})
->editColumn('stock_delayed', function (Offer $offer) {
@@ -63,15 +63,16 @@ class OffersDataTable extends DataTable
protected function getColumns()
{
return [
Column::make('status_id')->title('')->width(40),
Column::make('article.article_nature.name')->title('Nature')->defaultContent(''),
Column::make('thumb')->title('')->width(40)->searchable(false)->order(false),
Column::make('status_id')->title('')->width(40)->searchable(false),
Column::make('article.article_nature.name')->title('Nature')->defaultContent('')->searchable(false),
Column::make('thumb')->title('')->width(30)->searchable(false)->addClass('text-center'),
Column::make('article.name')->title('Article')->defaultContent(''),
Column::make('variation.name')->title('Déclinaison')->defaultContent(''),
Column::make('tariff.name')->title('Tarif')->defaultContent(''),
Column::make('stock_current')->title('Appro im')->searchable(false),
Column::make('stock_delayed')->title('Appro délai')->searchable(false),
Column::make('stock_ondemand')->title('Dmde')->searchable(false),
Column::make('variation.name')->title('Déclinaison')->defaultContent('')->searchable(false),
Column::make('weight')->title('Poids')->searchable(false)->addClass('text-right'),
Column::make('tariff.name')->title('Tarif')->defaultContent('')->searchable(false),
Column::make('stock_current')->title('Appro im')->searchable(false)->addClass('text-right'),
Column::make('stock_delayed')->title('Appro délai')->searchable(false)->addClass('text-right'),
Column::make('stock_ondemand')->title('Dmde')->searchable(false)->addClass('text-right'),
$this->makeColumnButtons(),
];
}