From 6ab3fb014c8645b73fdfe80efb5babac77968fb4 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Mon, 30 Nov 2020 12:02:10 +0100 Subject: [PATCH] - Fix EAN13 search --- app/Http/Controllers/EnterCodeController.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/EnterCodeController.php b/app/Http/Controllers/EnterCodeController.php index ff348df..1f1bb13 100644 --- a/app/Http/Controllers/EnterCodeController.php +++ b/app/Http/Controllers/EnterCodeController.php @@ -31,6 +31,7 @@ class EnterCodeController extends Controller } public function participate(Request $request) { + // TODO : VALIDATE avec / sans code ean // Récupération des données à utilisées $code = strtoupper($request->code); $codeBase = Codes::where('code_unique', $code)->first(); @@ -73,12 +74,15 @@ class EnterCodeController extends Controller if ($settings->use_ean_codes === 1) { $codeEan = $request->code_ean; $codeEanBase = CodesEAN::where('code', $codeEan)->first(); + if (!$codeEanBase) + $codeEanBase = CodesEAN::where('code', 'like', substr($codeEan, 0, 6) . "%")->first(); + if (!$codeEanBase) + $codeEanBase = CodesEAN::where('code', 'like', substr($codeEan, 0, 5) . "%")->first(); if (!$codeEanBase) return back()->withErrors('Le code barre entré est incorrect, veuillez réessayer.'); } $codeNbUsage = Participation::where('code_unique_id', $codeBase->id)->count(); - $codeUsedChanged = false; // Gestion du nombre d'utilisation d'un code if ($codeNbUsage >= $settings->nb_unique_code_use) {