Merge branch 'develop' into trunk

This commit is contained in:
Jérémy Munsch 2021-11-10 09:14:07 +01:00
commit 9be8a44be2
No known key found for this signature in database
GPG key ID: 55196BEE445F6049

View file

@ -77,11 +77,11 @@ class ArcadiaController extends Controller
)), $xml);
return response()->json();
} catch (\Exception $e) {
Log::critical("ARCADIA XML CREATION FAILED : " . $e->getMessage());
Log::critical("ARCADIA XML CREATION FAILED FOR $request->order_num : " . $e->getMessage());
if (!config('app.debug')) {
dispatch(function () use ($xml, $e) {
dispatch(function () use ($xml, $e, $request) {
Mail::to(config('mail.MAIL_ADMIN'))->send(new CourrierArcadiaError(
"ARCADIA XML CREATION FAILED",
"ARCADIA XML CREATION FAILED FOR $request->order_num",
"Une erreur est survenue lors de la création du fichier XML : " . $e->getMessage(),
$xml
));
@ -89,7 +89,7 @@ class ArcadiaController extends Controller
} else {
throw $e;
}
throw new CrmException('Failed to create the arcadia xml file', 0, $e);
throw new CrmException("Failed to create the arcadia xml file for $request->order_num", 0, $e);
}
}