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-11-07 19:58:38 +01:00
parent c7c8e18cbc
commit 63c6671c97
22 changed files with 143 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Datatables/Shop/TariffsDataTable.php
View File

@@ -13,7 +13,7 @@ class TariffsDataTable extends DataTable
public function query(Tariff $model)
{
$model = $model->with(['sale_channel'])->select(['shop_tariffs.*']);
$model = $model->with(['sale_channels'])->select(['shop_tariffs.*']);
return $this->buildQuery($model);
}
@@ -23,7 +23,14 @@ class TariffsDataTable extends DataTable
->editColumn('status', function (Tariff $tariff) {
return Tariffs::getStatus($tariff['status_id']);
})
->rawColumns(['action'])
->editColumn('sale_channels2', function (Tariff $tariff) {
$html = '';
foreach ($tariff->sale_channels as $sale_channel) {
$html .= $sale_channel->code . ', ';
}
return $html;
})
->rawColumns(['sale_channels2', 'action'])
;
return parent::modifier($datatables);
}
@@ -33,7 +40,7 @@ class TariffsDataTable extends DataTable
return [
Column::make('status_id')->data('status')->title('status'),
Column::make('name')->title('Nom'),
Column::make('sale_channel.name')->title('Canal de vente par défaut'),
Column::make('sale_channels2')->title('Canaux de vente'),
Column::make('code')->title('Code'),
Column::make('ref')->title('Référence'),
$this->makeColumnButtons(),