diff --git a/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php b/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php index b5d77aa5..a932762b 100644 --- a/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php +++ b/app/Http/Requests/Bo/StaticPages/UpdateStaticPageRequest.php @@ -60,16 +60,16 @@ class UpdateStaticPageRequest extends UpdateMiniCrudRequest } // check nullable value of image's slider if ($staticPageModel->type->equals(StaticPageType::exitOutside)) { - $test = $this->data; - foreach ($test as $key => $value) { + $curentData = $this->data; + foreach ($curentData as $key => $value) { if (Str::startsWith($key, 'slider_image_')) { - $checkValue = isset($value['value']) ? $value['value'] : null; - $test[$key]['value'] = $checkValue; - $test[$key]['alt'] = (! is_null($checkValue) ? $value['alt'] : null); - $test[$key]['title'] = (! is_null($checkValue) ? $value['title'] : null); + $checkValue = isset($value['value']) ? $value['value'] : null; + $curentData[$key]['value'] = $checkValue; + $curentData[$key]['alt'] = (! is_null($checkValue) ? $value['alt'] : null); + $curentData[$key]['title'] = (! is_null($checkValue) ? $value['title'] : null); } } - $this->merge(['data' => $test]); + $this->merge(['data' => $curentData]); } parent::prepareForValidation(); } diff --git a/app/Http/Requests/Bo/UpdateMiniCrudRequest.php b/app/Http/Requests/Bo/UpdateMiniCrudRequest.php index f94c9d07..d6a0db99 100644 --- a/app/Http/Requests/Bo/UpdateMiniCrudRequest.php +++ b/app/Http/Requests/Bo/UpdateMiniCrudRequest.php @@ -143,30 +143,28 @@ abstract class UpdateMiniCrudRequest extends FormRequest ]; $rules = array_merge($rules, [ - "data.$iptName.value" => array_merge( - [ - function (string $attribute, $value, callable $fail) use ($sizes, $input) { - // Picture can be null. - if ($input['required'] || $value !== null) { - ToolboxHelper::validatePicture($attribute, $value, $fail, $sizes); - } - }, - ], - $this->compileValidate( - implode('|', [ - $required, - 'image', - 'mimes:png,jpg,jpeg,svg', - sprintf( - 'dimensions:%s=%d,%s=%d', - $max ? 'max_height' : 'height', - $dim['height'], - $max ? 'max_width' : 'width', - $dim['width'] - ), - ]), - $input - ), + "data.$iptName.value" => [ + function (string $attribute, $value, callable $fail) use ($sizes, $input) { + // Picture can be null. + if ($input['required'] || $value !== null) { + ToolboxHelper::validatePicture($attribute, $value, $fail, $sizes); + } + }, + ], + $this->compileValidate( + implode('|', [ + $required, + 'image', + 'mimes:png,jpg,jpeg,svg', + sprintf( + 'dimensions:%s=%d,%s=%d', + $max ? 'max_height' : 'height', + $dim['height'], + $max ? 'max_width' : 'width', + $dim['width'] + ), + ]), + $input ), ]); diff --git a/resources/views/bo/layouts/sidemenu.blade.php b/resources/views/bo/layouts/sidemenu.blade.php index 2c9e0822..6e30015c 100644 --- a/resources/views/bo/layouts/sidemenu.blade.php +++ b/resources/views/bo/layouts/sidemenu.blade.php @@ -1175,13 +1175,20 @@ {{-- DEMARCHES --}}
+ @php + $isApproachesActive = + (isset($exitOutsideStaticPageModel) && url()->current() === route('bo.static_pages.edit', $exitOutsideStaticPageModel)) + || (isset($ouiCestBonStaticPageModel) && url()->current() === route('bo.static_pages.edit', $ouiCestBonStaticPageModel)) + || request()->routeIs('bo.categories.approaches.*') + || request()->routeIs('bo.sections.approaches.*'); + @endphp @@ -1193,14 +1200,12 @@ @class([ 'dropdown-item px-3 py-2', 'fw-bold text-bg-secondary' => - url()->current() === - route('bo.static_pages.edit', $exitOutsideStaticPageModel), + url()->current() === route('bo.static_pages.edit', $exitOutsideStaticPageModel), ])> - url()->current() === - route('bo.static_pages.edit', $exitOutsideStaticPageModel), + url()->current() === route('bo.static_pages.edit', $exitOutsideStaticPageModel), ])> {{ str(__("Page Sortir à l'éxterieur"))->ucFirst() }} diff --git a/resources/views/bo/pages/sections_approaches/form.blade.php b/resources/views/bo/pages/sections_approaches/form.blade.php index 1969680e..ef50fff2 100644 --- a/resources/views/bo/pages/sections_approaches/form.blade.php +++ b/resources/views/bo/pages/sections_approaches/form.blade.php @@ -4,7 +4,7 @@ @endphp
{{-- Page --}} -
+
{{ str(trans_choice('models.classes.static_page', 1))->ucFirst() }}
@@ -36,7 +36,7 @@
{{-- Category --}} -
+
{{ str(trans_choice('models.classes.static_page', 1))->ucFirst() }}
@@ -67,9 +67,8 @@
- - {{-- TITLE --}} -
+ {{-- TITLE --}} +
{{ str(__('validation.attributes.name'))->ucfirst() }}
diff --git a/resources/views/bo/pages/static_pages/edit.blade.php b/resources/views/bo/pages/static_pages/edit.blade.php index c6d78175..563f1ce2 100644 --- a/resources/views/bo/pages/static_pages/edit.blade.php +++ b/resources/views/bo/pages/static_pages/edit.blade.php @@ -1,7 +1,7 @@ @extends('bo.layout', ['brParam' => $staticPageModel]) -@section('title', __('Édition d\'un :model', ['model' => __('models.classes.static_page')])) -@section('description', __('Édition d\'un :model déjà existant', ['model' => __('models.classes.static_page')])) +@section('title', __('Édition d\'une :model', ['model' => trans_choice('models.classes.static_page', 1)])) +@section('description', __('Édition d\'une :model déjà existant', ['model' => trans_choice('models.classes.static_page', 1)])) @section('breadcrumb', request()->route()->getName()) @section('content') diff --git a/resources/views/bo/pages/static_pages/form.blade.php b/resources/views/bo/pages/static_pages/form.blade.php index c6bae3a4..7cfa2fd1 100644 --- a/resources/views/bo/pages/static_pages/form.blade.php +++ b/resources/views/bo/pages/static_pages/form.blade.php @@ -129,8 +129,8 @@ !$staticPageModel->type->equals(StaticPageType::poultryBrand) && !$staticPageModel->type->equals(StaticPageType::raiseSustainably) && !$staticPageModel->type->equals(StaticPageType::feedProperly) && - !$staticPageModel->type->equals(StaticPageType::home)) - ) + !$staticPageModel->type->equals(StaticPageType::home) + ) {{-- SUBTITLE --}}
diff --git a/resources/views/bo/pages/static_pages/sections/form_section.blade.php b/resources/views/bo/pages/static_pages/sections/form_section.blade.php index c7cd2f71..61e95e04 100644 --- a/resources/views/bo/pages/static_pages/sections/form_section.blade.php +++ b/resources/views/bo/pages/static_pages/sections/form_section.blade.php @@ -3,14 +3,12 @@
- @foreach ($sections as $index => $section) @php $collapseId = 'collapse-' . $section->id; $toggleId = 'toggle-' . $section->id; $isVisible = $section->visibility ?? true; - $sectionData = json_decode(json_encode($section->data), true) ?? []; $hasPictos = !empty($sectionData['has_pictos']); $hasBlocks = $section->blocks->where('type', BlockTypeEnum::redirection->value)->isNotEmpty(); @@ -18,11 +16,8 @@ $maxPictos = $sectionData['max_pictos'] ?? 5; $redirectionBlocks = $section->blocks->where('type', \App\Enums\BlockTypeEnum::redirection->value); $bienfaitBlocks = $section->blocks->where('type', \App\Enums\BlockTypeEnum::bienfait->value); - @endphp -
- {{-- Header --}}
-
Visible @@ -41,7 +35,6 @@
- {{-- Body + Tabs --}}
@@ -52,7 +45,6 @@ Général - @if ($hasBlocks) @endif - @if ($hasPictos)
- @if (!$loop->last)
@endif @endforeach
@endif - {{-- Tab Pictogrammes --}} @if ($hasPictos)
@@ -161,7 +147,6 @@ @endforeach - {{-- Tabs content --}}
@foreach ($bienfaitBlocks as $i => $block) @@ -179,7 +164,6 @@ 'model' => $block, 'idPrefix' => 's' . $section->id . '-b' . $block->id, ]) -
@endif -
@endforeach -
diff --git a/resources/views/fo/pages/commitments/brand.blade.php b/resources/views/fo/pages/commitments/brand.blade.php index e0bbd3ee..8a5491f4 100644 --- a/resources/views/fo/pages/commitments/brand.blade.php +++ b/resources/views/fo/pages/commitments/brand.blade.php @@ -6,7 +6,7 @@ $section_2_model = $staticPageModel->sections[0]; $section_2 = $section_2_model->data; - $reduction_2 = $section_2_model->blocks[0]->data; + $reduction_2 = data_get($section_2_model, 'blocks.0.data'); $section_3_model = $staticPageModel->sections[1]; $section_3 = $section_3_model->data; @@ -18,8 +18,7 @@ $section_5_model = $staticPageModel->sections[3]; $section_5 = $section_5_model->data; - $reduction_5 = $section_5_model->blocks[0]->data; - + $reduction_5 = data_get($section_5_model, 'blocks.0.data'); //collections $collectionSimpleItems = collect([ (object) [ @@ -55,7 +54,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], - 'content' => $staticPageModel->content + 'content' => $staticPageModel->content, ]) {{-- PARAGRAPH WITH PICTURE --}} @if ($section_2_model->visibility) diff --git a/resources/views/fo/pages/commitments/eat.blade.php b/resources/views/fo/pages/commitments/eat.blade.php index 61dd7591..391ebf68 100644 --- a/resources/views/fo/pages/commitments/eat.blade.php +++ b/resources/views/fo/pages/commitments/eat.blade.php @@ -1,27 +1,28 @@ @php $commitmentId = 3; $badge = new stdClass(); + $badge->label = str("engagement n°{$commitmentId}")->upper(); $badge->color = '#006633'; $section_2_model = $staticPageModel->sections[0]; $section_2 = $section_2_model->data; - $reduction_2 = $section_2_model->blocks[0]->data; + $reduction_2 = data_get($section_2_model, 'blocks.0.data'); $section_3_model = $staticPageModel->sections[1]; $section_3 = $section_3_model->data; - $reduction_3 = $section_3_model->blocks[0]->data; + $reduction_3 = data_get($section_3_model, 'blocks.0.data'); $section_4_model = $staticPageModel->sections[2]; $section_4 = $section_4_model->data; $section_4_pictos = $section_4_model->pictos; - $reduction_4 = $section_4_model->blocks[0]->data; + $reduction_4 = data_get($section_4_model, 'blocks.0.data'); $section_5_model = $staticPageModel->sections[3]; $section_5 = $section_5_model->data; $section_5_pictos = $section_5_model->pictos; - $reduction_5 = $section_5_model->blocks[0]->data; + $reduction_5 = data_get($section_5_model, 'blocks.0.data'); $section_6_model = $staticPageModel->sections[4]; $section_6 = $section_6_model->data; @@ -34,7 +35,7 @@ : $field->value, ), ); - $reduction_6 = $section_6_model->blocks[0]->data; + $reduction_6 = data_get($section_6_model, 'blocks.0.data'); $section_7_model = $staticPageModel->sections[5]; $section_7 = $section_7_model->data; @@ -42,11 +43,11 @@ $section_8_model = $staticPageModel->sections[6]; $section_8 = $section_8_model->data; - $reduction_8 = $section_8_model->blocks[0]->data; + $reduction_8 = data_get($section_8_model, 'blocks.0.data'); $section_9_model = $staticPageModel->sections[7]; $section_9 = $section_9_model->data; - $reduction_9 = $section_9_model->blocks[0]->data; + $reduction_9 = data_get($section_9_model, 'blocks.0.data'); @endphp @extends('fo.layout', ['brParam' => $staticPageModel]) diff --git a/resources/views/fo/pages/commitments/life.blade.php b/resources/views/fo/pages/commitments/life.blade.php index d2b80713..4dc329d2 100644 --- a/resources/views/fo/pages/commitments/life.blade.php +++ b/resources/views/fo/pages/commitments/life.blade.php @@ -7,7 +7,7 @@ $section_2_model = $staticPageModel->sections[0]; $section_2 = $section_2_model->data; - $reduction_2 = $section_2_model->blocks[0]->data; + $reduction_2 = data_get($section_2_model, 'blocks.0.data'); $section_3_model = $staticPageModel->sections[1]; $section_3 = $section_3_model->data; @@ -15,7 +15,7 @@ $section_4_model = $staticPageModel->sections[2]; $section_4 = $section_4_model->data; - $reduction_4 = $section_4_model->blocks[0]->data; + $reduction_4 = data_get($section_4_model, 'blocks.0.data'); @endphp @extends('fo.layout', ['brParam' => $staticPageModel]) diff --git a/resources/views/fo/pages/commitments/raise.blade.php b/resources/views/fo/pages/commitments/raise.blade.php index 48aa63ae..bbb6863e 100644 --- a/resources/views/fo/pages/commitments/raise.blade.php +++ b/resources/views/fo/pages/commitments/raise.blade.php @@ -6,7 +6,7 @@ $section_2_model = $staticPageModel->sections[0]; $section_2 = $section_2_model->data; - $reduction_2 = $section_2_model->blocks[0]->data; + $reduction_2 = data_get($section_2_model, 'blocks.0.data'); $section_3_model = $staticPageModel->sections[1]; $section_3 = $section_3_model->data; @@ -15,16 +15,16 @@ $section_4_model = $staticPageModel->sections[2]; $section_4 = $section_4_model->data; $section_4_pictos = $section_4_model->pictos; - $reduction_4 = $section_4_model->blocks[0]->data; + $reduction_4 = data_get($section_4_model, 'blocks.0.data'); $section_5_model = $staticPageModel->sections[3]; $section_5 = $section_5_model->data; $section_5_pictos = $section_5_model->pictos; - $reduction_5 = $section_5_model->blocks[0]->data; + $reduction_5 = data_get($section_5_model, 'blocks.0.data'); $section_6_model = $staticPageModel->sections[4]; $section_6 = $section_6_model->data; - $reduction_6 = $section_6_model->blocks[0]->data; + $reduction_6 = data_get($section_6_model, 'blocks.0.data'); $section_7_model = $staticPageModel->sections[5]; $section_7 = $section_7_model->data; @@ -65,7 +65,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], - 'content' => $staticPageModel->content + 'content' => $staticPageModel->content, ]) {{-- PARAGRAPH WITH PICTURE --}} @if ($section_2_model->visibility) @@ -105,19 +105,15 @@ @if ($section_4_model->visibility)
{{-- BEA --}} - - + {{ __('Entreprise adhérente au collectif Filière Agricole Engagée pour le Bien-être Animal. Découvrez nos engagements pour un poulet origine France élevé dans le respect du bien-être animal.') }} - + {{ __('Entreprise adhérente au collectif Filière Agricole Engagée pour le Bien-être Animal. Découvrez nos engagements pour un poulet origine France élevé dans le respect du bien-être animal.') }} + title="{{ __('Découvrez les engagements de la Filière Agricole Engagée pour le Bien-être Animal') }}" />
@include('fo.partials.commitments.paragraph-with-visual', [ diff --git a/resources/views/fo/pages/commitments/respect.blade.php b/resources/views/fo/pages/commitments/respect.blade.php index e309d03b..edee80a5 100644 --- a/resources/views/fo/pages/commitments/respect.blade.php +++ b/resources/views/fo/pages/commitments/respect.blade.php @@ -7,16 +7,16 @@ $section_2_model = $staticPageModel->sections[0]; $section_2 = $section_2_model->data; $section_2_pictos = $section_2_model->pictos; - $reduction_2 = $section_2_model->blocks[0]->data; + $reduction_2 = data_get($section_2_model, 'blocks.0.data'); $section_3_model = $staticPageModel->sections[1]; $section_3 = $section_3_model->data; - $reduction_3 = $section_3_model->blocks[0]->data; + $reduction_3 = data_get($section_3_model, 'blocks.0.data'); $section_4_model = $staticPageModel->sections[2]; $section_4 = $section_4_model->data; $section_4_pictos = $section_4_model->pictos; - $reduction_4 = $section_4_model->blocks[0]->data; + $reduction_4 = data_get($section_4_model, 'blocks.0.data'); @endphp @@ -37,7 +37,7 @@ 'picto_alt' => __($staticPageModel->picture_alt), 'picto_title' => __($staticPageModel->picture_title), 'picto_baner' => $staticPageModel->data['picto_banner'], - 'content' => $staticPageModel->content + 'content' => $staticPageModel->content, ]) {{-- PARAGRAPH WITH VISUAL AND COMPLEX ITEMS --}} @@ -46,7 +46,7 @@ 'title' => __($section_2->title->value), 'text' => nl2br(__($section_2->description->value)), 'collection' => $section_2_pictos, - 'picture' => + 'picture' => $section_2->media->value->picture->path ?? null ? asset($section_2->media->value->picture->path) : null, @@ -66,7 +66,7 @@ 'title' => __($section_3->title->value), 'text' => __($section_3->description->value), 'background_color' => 'light', - 'picture' => + 'picture' => $section_3->media->value->picture->path ?? null ? asset($section_3->media->value->picture->path) : null, diff --git a/resources/views/fo/partials/block/reduction-card.blade.php b/resources/views/fo/partials/block/reduction-card.blade.php index 4d7182cc..c9932fd5 100644 --- a/resources/views/fo/partials/block/reduction-card.blade.php +++ b/resources/views/fo/partials/block/reduction-card.blade.php @@ -1,8 +1,8 @@ @php use App\Enums\Block\BlockContentTypeEnum; - $pos = \App\Enums\Block\BlockPositionEnum::from($position)->toBootstrap(); - $hasCta = in_array($blockType, [BlockContentTypeEnum::Cta->value, BlockContentTypeEnum::Both->value]); - $hasActu = in_array($blockType, [BlockContentTypeEnum::Actu->value, BlockContentTypeEnum::Both->value]); + $pos = $position !== null ? \App\Enums\Block\BlockPositionEnum::tryFrom($position)?->toBootstrap() : null; + $hasCta = in_array($blockType, [BlockContentTypeEnum::Cta->value, BlockContentTypeEnum::Both->value], true); + $hasActu = in_array($blockType, [BlockContentTypeEnum::Actu->value, BlockContentTypeEnum::Both->value], true); @endphp
@@ -15,10 +15,8 @@
- {{ $news->picture_alt }} + {{ $news->picture_alt }}
@@ -43,8 +41,9 @@ @endif @if ($hasCta && $ctaUrl && $ctaLabel) -
+
{{ $ctaLabel }}
@endif -
\ No newline at end of file +
diff --git a/resources/views/fo/partials/commitment-card.blade.php b/resources/views/fo/partials/commitment-card.blade.php index 9aca3006..73d98c10 100644 --- a/resources/views/fo/partials/commitment-card.blade.php +++ b/resources/views/fo/partials/commitment-card.blade.php @@ -2,10 +2,10 @@ 'card card-custom d-flex flex-column justify-content-center align-items-center text-secondary border-0 bg-transparent text-center', 'swiper-slide' => isset($isSlide) && $isSlide, ])> - {{ $commitment->picture_alt }} + {{ $commitment['picto_alt'] }}
-

{{ $commitment->title }}

-

{!! clean($commitment->description) !!}

- +

{{ str($commitment['title'])->upper() }}

+

{{ str($commitment['text'])->ucFirst() }}

+
diff --git a/resources/views/fo/partials/commitments/duo-title-text.blade.php b/resources/views/fo/partials/commitments/duo-title-text.blade.php index 9f7abdd6..00b4e8d3 100644 --- a/resources/views/fo/partials/commitments/duo-title-text.blade.php +++ b/resources/views/fo/partials/commitments/duo-title-text.blade.php @@ -1,11 +1,11 @@ @php - $blockType = $reduction->block_type->value; - $position = $reduction->position->value; - $ctaUrl = $reduction->cta_url->value ?? null; - $ctaLabel = $reduction->cta_label->value ?? null; - $articleId = $reduction->article_id->value ?? null; + $blockType = data_get($reduction, 'block_type.value'); + $position = data_get($reduction, 'position.value'); + $ctaUrl = data_get($reduction, 'cta_url.value'); + $ctaLabel = data_get($reduction, 'cta_label.value'); + $articleId = data_get($reduction, 'article_id.value'); $reductionNews = $articleId ? \App\Models\News::find($articleId) : null; - $visibility = $reduction->visibility->value ?? true; + $visibility = data_get($reduction, 'visibility.value', true); @endphp
diff --git a/resources/views/fo/partials/commitments/list-pages.blade.php b/resources/views/fo/partials/commitments/list-pages.blade.php index a4b675e5..47faa447 100644 --- a/resources/views/fo/partials/commitments/list-pages.blade.php +++ b/resources/views/fo/partials/commitments/list-pages.blade.php @@ -2,14 +2,61 @@

- {{ $sectionData->title->value }} + {{ str(__('le gaulois, une marque engagée et responsable'))->ucFirst() }}

+ @php + $arrayCommitments = [ + [ + 'picto' => Vite::asset( + 'resources/assets/images/home/commitments/picto-volaille-francaise-blanc.svg', + ), + 'picto_alt' => __('Pictogramme d\'une volaille française'), + 'picto_title' => __('Volaille dans le territoire français'), + 'title' => __('volaille 100% française'), + 'text' => __('être la grande marque alimentaire française'), + 'url' => route('fo.commitments.brand'), + ], + [ + 'picto' => Vite::asset('resources/assets/images/home/commitments/picto-elever-blanc.svg'), + 'picto_alt' => __('Pictogramme d\'une volaille'), + 'picto_title' => __('Volaille avec ses petits'), + 'title' => __('élever durablement'), + 'text' => __('favoriser une démarche d\'élevage durable et locale auprès de nos + éleveurs et des volailles'), + 'url' => route('fo.commitments.raise'), + ], + [ + 'picto' => Vite::asset('resources/assets/images/home/commitments/picto-bien-nourrir-blanc.svg'), + 'picto_alt' => __('Pictogramme d\'une assiette'), + 'picto_title' => __('Assiette avec des couverts'), + 'title' => __('bien nourrir'), + 'text' => __('agir sur la nutrition et la sécurité de nos produits pour satisfaire les français'), + 'url' => route('fo.commitments.eat'), + ], + [ + 'picto' => Vite::asset('resources/assets/images/home/commitments/picto-mieux-vivre-blanc.svg'), + 'picto_alt' => __('Pictogramme de deux mains'), + 'picto_title' => __('Serrage de mains'), + 'title' => __('mieux vivre ensemble'), + 'text' => __('accompagner nos collaborateurs dans la pratique du sport'), + 'url' => route('fo.commitments.life'), + ], + [ + 'picto' => Vite::asset('resources/assets/images/home/commitments/picto-respect-blanc.svg'), + 'picto_alt' => __('Pictogramme d\'une plante'), + 'picto_title' => __('Pousse d\'une plante au creux d\'une main'), + 'title' => __('respecter la terre'), + 'text' => __('minimiser notre empreinte carbone et agir sur le changement climatique'), + 'url' => route('fo.commitments.respect'), + ], + ]; + @endphp
- @foreach ($commitments as $commitment) + @foreach ($arrayCommitments as $commitment) @include('fo.partials.commitment-card', ['isSlide' => true]) @endforeach
@@ -26,7 +73,7 @@
- @foreach ($commitments as $commitment) + @foreach ($arrayCommitments as $commitment) @include('fo.partials.commitment-card') @endforeach
diff --git a/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php b/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php index e2bf7efe..f21e84cc 100644 --- a/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php +++ b/resources/views/fo/partials/commitments/paragraph-with-visual-complex-flex-items.blade.php @@ -1,11 +1,11 @@ @php - $blockType = $reduction->block_type->value; - $position = $reduction->position->value; - $ctaUrl = $reduction->cta_url->value ?? null; - $ctaLabel = $reduction->cta_label->value ?? null; - $articleId = $reduction->article_id->value ?? null; + $blockType = data_get($reduction, 'block_type.value'); + $position = data_get($reduction, 'position.value'); + $ctaUrl = data_get($reduction, 'cta_url.value'); + $ctaLabel = data_get($reduction, 'cta_label.value'); + $articleId = data_get($reduction, 'article_id.value'); $reductionNews = $articleId ? \App\Models\News::find($articleId) : null; - $visibility = $reduction->visibility->value ?? true; + $visibility = data_get($reduction, 'visibility.value', true); @endphp
diff --git a/resources/views/fo/partials/commitments/paragraph.blade.php b/resources/views/fo/partials/commitments/paragraph.blade.php index 1916df7e..76c4b109 100644 --- a/resources/views/fo/partials/commitments/paragraph.blade.php +++ b/resources/views/fo/partials/commitments/paragraph.blade.php @@ -1,12 +1,13 @@ @php - $blockType = $reduction->block_type->value; - $position = $reduction->position->value; - $ctaUrl = $reduction->cta_url->value ?? null; - $ctaLabel = $reduction->cta_label->value ?? null; - $articleId = $reduction->article_id->value ?? null; + $blockType = data_get($reduction, 'block_type.value'); + $position = data_get($reduction, 'position.value'); + $ctaUrl = data_get($reduction, 'cta_url.value'); + $ctaLabel = data_get($reduction, 'cta_label.value'); + $articleId = data_get($reduction, 'article_id.value'); $reductionNews = $articleId ? \App\Models\News::find($articleId) : null; - $visibility = $reduction->visibility->value ?? true; + $visibility = data_get($reduction, 'visibility.value', true); @endphp +
diff --git a/resources/views/fo/partials/commitments/tabs-texts.blade.php b/resources/views/fo/partials/commitments/tabs-texts.blade.php index 10b473c6..faded0f4 100644 --- a/resources/views/fo/partials/commitments/tabs-texts.blade.php +++ b/resources/views/fo/partials/commitments/tabs-texts.blade.php @@ -1,11 +1,11 @@ @php - $blockType = $reduction->block_type->value; - $position = $reduction->position->value; - $ctaUrl = $reduction->cta_url->value ?? null; - $ctaLabel = $reduction->cta_label->value ?? null; - $articleId = $reduction->article_id->value ?? null; + $blockType = data_get($reduction, 'block_type.value'); + $position = data_get($reduction, 'position.value'); + $ctaUrl = data_get($reduction, 'cta_url.value'); + $ctaLabel = data_get($reduction, 'cta_label.value'); + $articleId = data_get($reduction, 'article_id.value'); $reductionNews = $articleId ? \App\Models\News::find($articleId) : null; - $visibility = $reduction->visibility->value ?? true; + $visibility = data_get($reduction, 'visibility.value', true); @endphp
diff --git a/resources/views/fo/partials/commitments/visual-with-cards.blade.php b/resources/views/fo/partials/commitments/visual-with-cards.blade.php index 4b8692de..2d797c79 100644 --- a/resources/views/fo/partials/commitments/visual-with-cards.blade.php +++ b/resources/views/fo/partials/commitments/visual-with-cards.blade.php @@ -1,11 +1,11 @@ @php - $blockType = $reduction->block_type->value; - $position = $reduction->position->value; - $ctaUrl = $reduction->cta_url->value ?? null; - $ctaLabel = $reduction->cta_label->value ?? null; - $articleId = $reduction->article_id->value ?? null; + $blockType = data_get($reduction, 'block_type.value'); + $position = data_get($reduction, 'position.value'); + $ctaUrl = data_get($reduction, 'cta_url.value'); + $ctaLabel = data_get($reduction, 'cta_label.value'); + $articleId = data_get($reduction, 'article_id.value'); $reductionNews = $articleId ? \App\Models\News::find($articleId) : null; - $visibility = $reduction->visibility->value ?? true; + $visibility = data_get($reduction, 'visibility.value', true); @endphp
@@ -70,6 +70,7 @@
@endforeach
+ @if ($collection->isNotEmpty())
@@ -88,6 +89,7 @@
+ @endif