From 21c8f55b708e691159791f2368f10ef64b8f114e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Munsch?= Date: Thu, 7 Dec 2023 15:14:57 +0100 Subject: [PATCH] SYNC 15 RE7 pages ok win --- .../participation/parts/animation.blade.php | 2 +- .../participation/parts/discount.blade.php | 57 ++++++++----------- .../pages/participation/parts/prize.blade.php | 10 +++- .../parts/winning-proof.blade.php | 4 +- views/pages/participation/won.blade.php | 2 +- 5 files changed, 36 insertions(+), 39 deletions(-) diff --git a/views/pages/participation/parts/animation.blade.php b/views/pages/participation/parts/animation.blade.php index ac90751..85ca019 100644 --- a/views/pages/participation/parts/animation.blade.php +++ b/views/pages/participation/parts/animation.blade.php @@ -15,10 +15,10 @@ $lotWbFamilly = Vite::asset('resources/theme/mounted/assets/images/animations/wb-famille-spin.png'); /** ID => picture */ $wheelParts = collect([ + [$lotWbFamilly, $prizesIdList->get(1)], [$brPicture, 'br'], [$lotWbHappy, $prizesIdList->get(0)], [$brPicture, 'br'], - [$lotWbFamilly, $prizesIdList->get(1)], ]); // * Quel fragment va tomber $spinChild = !empty($prizeModel) ? $wheelParts->search(fn($wheelPart) => Arr::get($wheelPart, 1) === $prizeModel->id) : null; diff --git a/views/pages/participation/parts/discount.blade.php b/views/pages/participation/parts/discount.blade.php index 296f3c0..7ebf0b0 100644 --- a/views/pages/participation/parts/discount.blade.php +++ b/views/pages/participation/parts/discount.blade.php @@ -1,40 +1,31 @@ -
- -
-
-
-

Félicitations !

- -

Vous avez gagné un bon d'achat de {{ number_format($coupon->face_value, 2) }}€
{{ $coupon->valid_on }}

- -
-
+
+
+
+ {{ __('Votre bon de réduction de :value', ['value' => $discount->face_value]) }}
-
-

Vous possédez un autre code ?

-
- Je rejoue -
-
-
- -
-
-
-
-

Félicitations !

-

Vous avez gagné un bon d'achat de {{ number_format($coupon->face_value, 2) }}€
{{ $coupon->valid_on }}

-
- Imprimer ma réduction +
+
+ {{ __("Félicitations\u{00A0}!") }} +

+ {{ __('Vous avez gagné un bon d\'achat de :amount € sur :product_name', [ + 'amount' => $discount->face_value, + 'product_name' => $discount->valid_on, + ]) }} +
+

+ -

Vous possédez un autre code ?

-
- Je rejoue +

{{ __("Vous possédez un autre code\u{00A0}?") }}

+
-
diff --git a/views/pages/participation/parts/prize.blade.php b/views/pages/participation/parts/prize.blade.php index b778985..3543ebb 100644 --- a/views/pages/participation/parts/prize.blade.php +++ b/views/pages/participation/parts/prize.blade.php @@ -4,8 +4,14 @@ {{ $prizeModel->picture_alt }}
-
-
+
+
$prizeModel->id % 2 === 0, + 'text-bg-tertiary' => $prizeModel->id % 2 === 1, + ])> {{ __("Félicitations\u{00A0}!") }}

{{ __('Vous avez gagné un :model !', [ diff --git a/views/pages/participation/parts/winning-proof.blade.php b/views/pages/participation/parts/winning-proof.blade.php index f9f09bc..e46a0e0 100644 --- a/views/pages/participation/parts/winning-proof.blade.php +++ b/views/pages/participation/parts/winning-proof.blade.php @@ -48,11 +48,11 @@ 'Merci de nous envoyer, sur papier libre :printLinkComment, vos coordonnées ainsi que vos preuves d\'achat originales. Le tout sous pli suffisamment affranchi sous dix jours à l\'adresse suivante :', [ // Optionnal winning proof pdf - 'printLinkComment' => $prizeModel->pdf_winning_proof + 'printLinkComment' => optional($prizeModel ?? '')->pdf_winning_proof ? __('(ou en utilisant le formulaire :startA téléchargeable ici :endA)', [ 'startA' => '', diff --git a/views/pages/participation/won.blade.php b/views/pages/participation/won.blade.php index 183a614..28e835b 100644 --- a/views/pages/participation/won.blade.php +++ b/views/pages/participation/won.blade.php @@ -32,7 +32,7 @@ @endphp @endif - @if ($settingsGlobal->winning_proof) + @if ($settingsGlobal->winning_proof and !empty($prizeModel)) {{-- WINNING PROOF SUBMIT PART --}} @include('theme::pages.participation.parts.winning-proof', [ 'sectionId' => 'winning-proof-section',