multiple fixes
This commit is contained in:
Jérémy Munsch
parent
51c77da9c2
commit
03370aae78
7 changed files with 45 additions and 47 deletions
4
resources/js/pages/poultry-show.js
vendored
4
resources/js/pages/poultry-show.js
vendored
|
|
@ -57,9 +57,7 @@ document.addEventListener('DOMContentLoaded', () => {
|
|||
behavior: "smooth"
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
if (orderNum.imask.value !== orderNum.dataset.orderNumber) {
|
||||
if (orderNum.imask.value.slice(0, -5) !== orderNum.dataset.orderNumber) {
|
||||
orderInvalid.classList.add('d-block')
|
||||
orderExp.classList.add('d-none')
|
||||
orderNum.imask.masked.reset()
|
||||
|
|
|
|||
12
resources/sass/_variables.scss
vendored
12
resources/sass/_variables.scss
vendored
|
|
@ -1,10 +1,16 @@
|
|||
$boMenuHeigth: 3rem;
|
||||
$boDarkBg: rgb(55, 55, 55);
|
||||
|
||||
$greyBG: darken($color:gray, $amount: 10);
|
||||
$breedingGreen: darken($color:#78ba56, $amount: 17.7);
|
||||
$greyBG: darken(
|
||||
$color: #a9afac,
|
||||
$amount: 10,
|
||||
);
|
||||
$breedingGreen: darken(
|
||||
$color: #78ba56,
|
||||
$amount: 17.7,
|
||||
);
|
||||
$purpleInfo: #282649;
|
||||
$bgSalmon :#ffe8cd;
|
||||
$bgSalmon: #ffe8cd;
|
||||
$beaGreen: #008c35;
|
||||
$foodYellow: #f7bc3d;
|
||||
$contactRed: #e62a30;
|
||||
|
|
|
|||
|
|
@ -25,13 +25,13 @@
|
|||
& > span {
|
||||
position: absolute;
|
||||
top: -0.4rem;
|
||||
right: 31%;
|
||||
right: 32.5%;
|
||||
transform: translateX(100%) translateY(0%);
|
||||
font-size: 21vw;
|
||||
font-size: 5rem;
|
||||
font-weight: bold;
|
||||
font-family: Arial, Helvetica, sans-serif;
|
||||
@include media-breakpoint-up(sm) {
|
||||
font-size: 8rem;
|
||||
@media (max-width: 360px) {
|
||||
font-size: 21vw !important;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -72,42 +72,36 @@ $previousUrl = session()->get('poultrySearch.model') ? route('poultry.show') : r
|
|||
</div>
|
||||
</div>
|
||||
@if($breeder->issue_1 or $breeder->issue_2)
|
||||
<div class="row justify-content-center mt-5">
|
||||
<div class="mt-5">
|
||||
<div class="glider-issues-nav">
|
||||
<button aria-label="{{ __('Lien précédent') }}" class="glider-prev">‹</button>
|
||||
<span class="pagination">
|
||||
<span class="question">{{ __('Question') }}</span>
|
||||
<span class="pages">
|
||||
<span class="page">1</span> / 2
|
||||
</span>
|
||||
<div class="row subpart justify-content-center mt-3">
|
||||
<div class="glider-issues-nav">
|
||||
<button aria-label="{{ __('Lien précédent') }}" class="glider-prev">‹</button>
|
||||
<span class="pagination">
|
||||
<span class="question">{{ __('Question') }}</span>
|
||||
<span class="pages">
|
||||
<span class="page">1</span> / 2
|
||||
</span>
|
||||
<button aria-label="{{ __('Lien suivant') }}" class="glider-next">›</button>
|
||||
</div>
|
||||
<div class="glider-container p-0 issues">
|
||||
<div class="glider">
|
||||
@if($breeder->issue_1)
|
||||
<div class="issue">
|
||||
<span class="d-block p-2 text-light bg-loue-gray text-center fw-bold">
|
||||
{{ __('Question 1') }}
|
||||
</span>
|
||||
<span class="d-block text-loue-breeding issue_answer">
|
||||
{{ $breeder->issue_1 }}
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
@if($breeder->issue_2)
|
||||
<div class="issue">
|
||||
<span class="d-block p-2 text-light bg-loue-gray text-center fw-bold">
|
||||
{{ __('Qu’est-ce qui vous plaît votre métier d’éleveur(se) de volailles de Loué ?') }}
|
||||
</span>
|
||||
<span class="d-block text-loue-breeding issue_answer">
|
||||
{{ $breeder->issue_2 }}
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</span>
|
||||
<button aria-label="{{ __('Lien suivant') }}" class="glider-next">›</button>
|
||||
</div>
|
||||
<div class="glider-container p-0 issues">
|
||||
<div class="glider">
|
||||
@if($breeder->issue_1)
|
||||
<div class="issue container p-0">
|
||||
<span class="d-block p-2 text-light bg-loue-gray text-center fw-bold">
|
||||
{{ __('Question 1') }}
|
||||
</span>
|
||||
<span class="d-block text-loue-breeding issue_answer">
|
||||
{{ $breeder->issue_1 }}
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
@if($breeder->issue_2)
|
||||
<div class="issue container p-0">
|
||||
<span class="d-block text-loue-breeding issue_answer">
|
||||
{{ $breeder->issue_2 }}
|
||||
</span>
|
||||
</div>
|
||||
@endif
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ $previousUrl = session()->get('poultrySearch.model') ? route('poultry.show') : r
|
|||
<div class="container pb-4">
|
||||
<div class="row">
|
||||
<div class="col text-arial text-center">
|
||||
<p>{{ __('De l\'éleveur lui-même. Il cultive les céréales qui seront ensuite envoyées à l\'usine d\'aliments de la coopérative des Fermiers de Loué, ALIFEL, pour les transformer en alimentation pour poulets, qui sera ensuite retournée à l\éleveur.') }}</p>
|
||||
<p>{{ __('De l\'éleveur lui-même. Il cultive les céréales qui seront ensuite envoyées à l\'usine d\'aliments de la coopérative des Fermiers de Loué, ALIFEL, pour les transformer en alimentation pour poulets, qui sera ensuite retournée à l\'éleveur.') }}</p>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row mt-4">
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
<div class="row mt-4 pb-2">
|
||||
<div class="col">
|
||||
<p class="d-block h5 fw-bold text-dark mb-3">{{
|
||||
__('ALIFEL est l\'usine dédié aux volailles de Loué Label Rouge pour des almiments sûrs et sains.')
|
||||
__('ALIFEL est l\'usine dédiée aux volailles de Loué Label Rouge pour des aliments sûrs et sains.')
|
||||
}}</p>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
<div class="col text-center">
|
||||
<div class="d-flex flex-column">
|
||||
<div class="text-center">
|
||||
<input id="order_num" name="order_num" type="text" class="commandInput inputMask" pattern="^[0-9]{6}$" data-mask="000000" length="6" placeholder="{{ __('123456') }}" title="{{ __('Saisissez le numéro de commande tel qu\'indiqué sur l\'image ci-dessous (6 premiers chiffres)') }}" data-order-number="{{ $traceaPoultry->order_num }}">
|
||||
<input id="order_num" name="order_num" type="text" class="commandInput inputMask" pattern="^[0-9]{6}\/[0-9]{3}[A-Z]$" data-mask="000000/000a" length="10" placeholder="{{ __('123456/123A') }}" title="{{ __('Saisissez le numéro de commande tel qu\'indiqué sur l\'image ci-dessous') }}" data-order-number="{{ str_pad($traceaPoultry->order_num, 6, '0', STR_PAD_LEFT) }}">
|
||||
@include('back.modules.input-error', ['inputName' => 'order_num'])
|
||||
<div id="order_num_invalid" class="invalid-feedback">{{ __('Numéro de commande invalide') }}</div>
|
||||
</div>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue