diff --git a/app/Exports/SalariesExport.php b/app/Exports/SalariesExport.php index 1ae0d6b7..49b3b254 100644 --- a/app/Exports/SalariesExport.php +++ b/app/Exports/SalariesExport.php @@ -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, ]; } diff --git a/app/Http/Controllers/BasketController.php b/app/Http/Controllers/BasketController.php index c660eae8..4d9c54fe 100644 --- a/app/Http/Controllers/BasketController.php +++ b/app/Http/Controllers/BasketController.php @@ -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);