From a393b0e1b7bdabd3563af72a57771ac11fae30e0 Mon Sep 17 00:00:00 2001 From: Vincent BRIDIER Date: Wed, 15 Jun 2022 13:42:05 +0200 Subject: [PATCH] Fix eggs routes --- app/Http/Controllers/Fo/EggController.php | 10 +++++----- app/Models/TraceaEgg.php | 2 +- .../front/egg/details-alimentation.blade.php | 2 +- .../views/front/egg/details-emballage.blade.php | 2 +- .../views/front/egg/elevages/portrait.blade.php | 2 +- resources/views/front/egg/index_id.blade.php | 17 ++++++++--------- .../views/front/egg/infos_elevages.blade.php | 2 +- .../front/egg/labels_and_certifs.blade.php | 2 +- resources/views/front/egg/search.blade.php | 2 +- routes/web-fo.php | 2 +- 10 files changed, 21 insertions(+), 22 deletions(-) diff --git a/app/Http/Controllers/Fo/EggController.php b/app/Http/Controllers/Fo/EggController.php index 0f5539d..21d0a96 100644 --- a/app/Http/Controllers/Fo/EggController.php +++ b/app/Http/Controllers/Fo/EggController.php @@ -41,10 +41,10 @@ class EggController extends Controller return redirect('/search'); } - $edes = $mobas->ede_code; + $edes = $mobas->code_edes; // * check if Bio or not - $code_ede = $mobas->code_ede; + $code_ede = $mobas->ede_code; $code_prod = substr($code_ede, 0, 1); if ($code_prod === 0) { @@ -60,16 +60,16 @@ class EggController extends Controller $date_today = Carbon::now(); $dcrGood = $date_today < $date_dcr; - $eleveurs = CafelEggBreeder::whereEdeCode($edes)->get(); + $eleveurs = CafelEggBreeder::whereIn('ede_code', $edes)->get(); + if (!$eleveurs->count()) { return view('front.egg.notFound'); } - + $uniqueEleveurs = $eleveurs->unique('code_ede'); if (count($uniqueEleveurs) > 1) { $multiple = true; } - $multiple = true; $inuavs = $eleveurs->pluck('inuavs')->flatten(1); diff --git a/app/Models/TraceaEgg.php b/app/Models/TraceaEgg.php index 96193f7..eec3e64 100644 --- a/app/Models/TraceaEgg.php +++ b/app/Models/TraceaEgg.php @@ -62,7 +62,7 @@ class TraceaEgg extends Model public function getCodeEdesAttribute(): Collection { return self::select('ede_code') - ->where('box_code', $this->code_boite) + ->where('box_code', $this->box_code) ->distinct()->get()->pluck('ede_code'); } } diff --git a/resources/views/front/egg/details-alimentation.blade.php b/resources/views/front/egg/details-alimentation.blade.php index 20a3b0c..91a0162 100644 --- a/resources/views/front/egg/details-alimentation.blade.php +++ b/resources/views/front/egg/details-alimentation.blade.php @@ -8,7 +8,7 @@
- +

◄

Retour

diff --git a/resources/views/front/egg/details-emballage.blade.php b/resources/views/front/egg/details-emballage.blade.php index cc2c065..7c181e0 100644 --- a/resources/views/front/egg/details-emballage.blade.php +++ b/resources/views/front/egg/details-emballage.blade.php @@ -8,7 +8,7 @@
- +

◄

Retour

diff --git a/resources/views/front/egg/elevages/portrait.blade.php b/resources/views/front/egg/elevages/portrait.blade.php index 3a610fd..5f60b69 100644 --- a/resources/views/front/egg/elevages/portrait.blade.php +++ b/resources/views/front/egg/elevages/portrait.blade.php @@ -8,7 +8,7 @@
- +

◄

Retour

diff --git a/resources/views/front/egg/index_id.blade.php b/resources/views/front/egg/index_id.blade.php index 6720141..73064fa 100644 --- a/resources/views/front/egg/index_id.blade.php +++ b/resources/views/front/egg/index_id.blade.php @@ -1,6 +1,6 @@ @extends('layouts.front') -@section('title', __('Traceabilité des Volailles de Loué')) -@section('description', __('Recherchez la treaceabilité de votre produit Loué ainsi que sa provenance.')) +@section('title', __('Tracabilité des Oeufs de Loué')) +@section('description', __('Recherchez la tracabilité de votre produit Loué ainsi que sa provenance.')) @section('breadcrumb', request()->route()->getName()) @@ -28,19 +28,19 @@ @endif @@ -92,7 +92,6 @@ @if (isset($mep) && !empty($mep))

Date de l'arrivée des poules
dans le poulailler :

- @dump($mep->transfert_date)

{{ Carbon\Carbon::parse($mep->transfert_date)->format('d/m/Y') }}

@endif @@ -106,7 +105,7 @@ PAR PLUSIEURS ÉLEVEURS :

@if (isset($eleveurs[0]->path_picture_1) && $eleveurs[0]->path_picture_1 != '') - Élevage + Élevage @else Élevage @endif diff --git a/resources/views/front/egg/infos_elevages.blade.php b/resources/views/front/egg/infos_elevages.blade.php index 1bff083..f6ed92a 100644 --- a/resources/views/front/egg/infos_elevages.blade.php +++ b/resources/views/front/egg/infos_elevages.blade.php @@ -8,7 +8,7 @@
- +

◄

Retour

diff --git a/resources/views/front/egg/labels_and_certifs.blade.php b/resources/views/front/egg/labels_and_certifs.blade.php index 328f5a3..ae47306 100644 --- a/resources/views/front/egg/labels_and_certifs.blade.php +++ b/resources/views/front/egg/labels_and_certifs.blade.php @@ -8,7 +8,7 @@
- +

◄

Retour

diff --git a/resources/views/front/egg/search.blade.php b/resources/views/front/egg/search.blade.php index a0ceee2..ee2d610 100644 --- a/resources/views/front/egg/search.blade.php +++ b/resources/views/front/egg/search.blade.php @@ -26,7 +26,7 @@
-