Merge branch 'trunk'
This commit is contained in:
commit
7ccd63db5f
2 changed files with 9 additions and 1 deletions
|
|
@ -35,6 +35,9 @@ class SalariesExport implements FromCollection, WithHeadings, WithMapping, WithC
|
|||
{
|
||||
return [
|
||||
'Matricule',
|
||||
'Nom',
|
||||
'Prenom',
|
||||
'Site',
|
||||
'Code',
|
||||
];
|
||||
}
|
||||
|
|
@ -51,6 +54,9 @@ class SalariesExport implements FromCollection, WithHeadings, WithMapping, WithC
|
|||
//phpcs:enable
|
||||
return [
|
||||
$salaries->matricule,
|
||||
$salaries->nom,
|
||||
$salaries->prenom,
|
||||
$salaries->site,
|
||||
$salaries->code,
|
||||
];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -58,7 +58,9 @@ class BasketController extends Controller
|
|||
$rowId = $request->rowId;
|
||||
Cart::instance($instance);
|
||||
try {
|
||||
Cart::remove($rowId);
|
||||
if (Cart::content()->get($rowId)) {
|
||||
Cart::remove($rowId);
|
||||
}
|
||||
} catch (\Gloudemans\Shoppingcart\Exceptions\InvalidRowIDException $e) {
|
||||
// Attempted to remove a Row which is not in cart anymore.
|
||||
report($e);
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue