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-09-09 00:03:24 +02:00
parent 50d445bb3b
commit 9cf96b7d4e
22 changed files with 183 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5,6 +5,7 @@ namespace App\Datatables\Shop;
use Yajra\DataTables\Html\Column;
use App\Datatables\ParentDataTable as DataTable;
use App\Models\Shop\PriceList;
use App\Repositories\Shop\PriceLists;
class PriceListsDataTable extends DataTable
{
@@ -17,7 +18,7 @@ class PriceListsDataTable extends DataTable
public function query(PriceList $model)
{
$model = $model->with('sale_channel');
$model = $model->with(['sale_channel','price_list_values']);
$model = self::filterByTariff($model);
return self::buildQuery($model);
}
@@ -28,10 +29,20 @@ class PriceListsDataTable extends DataTable
return $tariff_id ? $model->byTariff($tariff_id) : $model;
}
public function modifier($datatables)
{
$datatables
->editColumn('status', function (PriceList $price_list) {
return PriceLists::getStatus($price_list['status_id']);
})
->rawColumns(['action']);
return parent::modifier($datatables);
}
protected function getColumns()
{
return [
Column::make('status_id')->data('status')->title('etat'),
Column::make('name')->title('Nom'),
Column::make('sale_channel.name')->title('Canal de vente'),
self::makeColumnButtons(),

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

@@ -5,6 +5,7 @@ namespace App\Datatables\Shop;
use Yajra\DataTables\Html\Column;
use App\Datatables\ParentDataTable as DataTable;
use App\Models\Shop\Tariff;
use App\Repositories\Shop\Tariffs;
class TariffsDataTable extends DataTable
{
@@ -16,9 +17,21 @@ class TariffsDataTable extends DataTable
return self::buildQuery($model);
}
public function modifier($datatables)
{
$datatables
->editColumn('status', function (Tariff $tariff) {
return Tariffs::getStatus($tariff['status_id']);
})
->rawColumns(['action'])
;
return parent::modifier($datatables);
}
protected function getColumns()
{
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('code')->title('Code'),