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

fixes on invoices relations and revisions

Browse Source
This commit is contained in:
Ludovic CANDELLIER
2022-11-20 00:21:38 +01:00
parent 71c0489862
commit 52193994a3
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Datatables/Shop/InvoicesDataTable.php
View File

@@ -13,6 +13,7 @@ class InvoicesDataTable extends DataTable
public function query(Invoice $model)
{
$model = $model->with('customer');
return $this->buildQuery($model);
}
@@ -26,7 +27,7 @@ class InvoicesDataTable extends DataTable
return $invoice->created_at->toDateTimeString();
})
->editColumn('customer.last_name', function (Invoice $invoice) {
return $invoice->customer->last_name . ' ' . $invoice->customer->first_name;
return ($invoice->customer ?? false) ? $invoice->customer->last_name . ' ' . $invoice->customer->first_name : '';
})
->rawColumns(['action']);
return parent::modifier($datatables);
@@ -38,7 +39,7 @@ class InvoicesDataTable extends DataTable
Column::make('status'),
Column::make('created_at')->title('Date'),
Column::make('customer.last_name'),
Column::make('customer.last_name')->default(''),
Column::make('total'),
$this->makeColumnButtons(),
];