display fixes on bo order form

This commit is contained in:
Jérémy Munsch 2023-05-19 16:23:06 +02:00
parent 622f75c298
commit 5af3ffa261
No known key found for this signature in database
GPG key ID: 18361AF3BFEC0FEC
3 changed files with 28 additions and 7 deletions

View file

@ -54,6 +54,16 @@
</div>
@endif
@endcan
@if($order->has_warning)
<div class="row mb-2">
<div class="col-12 col-sm-8">
<strong class="text-decoration-underline">
<i class="fa-solid fa-circle-exclamation"></i>
{{ __('Il est nécessaire de résoudre les issues de cette commande avant de pouvoir poursuivre.') }}
</strong>
</div>
</div>
@endcan
@if(!$order->mail_sent)
<div class="row mb-2">
<div class="col-12 col-sm-8">
@ -130,7 +140,18 @@
</div>
@endif
</div>
@else
@endcan
@if($order->has_warning)
<div class="row mb-2">
<div class="col-12 col-sm-8">
<strong class="text-decoration-underline">
<i class="fa-solid fa-circle-exclamation"></i>
{{ __('Il est nécessaire de résoudre les issues de cette commande avant de pouvoir modifier son état de livraison.') }}
</strong>
</div>
</div>
@endcan
@if(!$order->mail_sent)
<div class="row mb-2">
<div class="col-12 col-sm-8">
<strong class="text-decoration-underline">

View file

@ -1,5 +1,5 @@
<div class="row">
<div class="col">
<div class="col-12">
<fieldset class="border p-3 mb-3 d-flex flex-column">
<span class="h4 me-2">{{ __('Montants') }}</span>
@if($order->discounted > 0)

View file

@ -4,21 +4,21 @@
</div>
</div>
<div class="row mb-3">
<div class="col">
<div class="col-12">
<ul class="list-group d-inline-block">
<li class="list-group-item d-flex flex-row justify-content-between">
<li class="list-group-item d-flex flex-row flex-md-column flex-lg-row justify-content-between">
<span class="fw-bold">{{ __('Validation') }}&nbsp;:&nbsp;</span>
<span>@include('back::pages.orders.parts.badges.validation-status', compact('order'))</span>
</li>
<li class="list-group-item d-flex flex-row justify-content-between">
<li class="list-group-item d-flex flex-row flex-md-column flex-lg-row justify-content-between">
<span class="fw-bold">{{ __('Paiement') }}&nbsp;:&nbsp;</span>
<span>@include('back::pages.orders.parts.badges.payment-status', compact('order'))</span>
</li>
<li class="list-group-item d-flex flex-row justify-content-between">
<li class="list-group-item d-flex flex-row flex-md-column flex-lg-row justify-content-between">
<span class="fw-bold">{{ __('Livraison') }}&nbsp;:&nbsp;</span>
<span>@include('back::pages.orders.parts.badges.delivery-status', compact('order'))</span>
</li>
<li class="list-group-item d-flex flex-row justify-content-between">
<li class="list-group-item d-flex flex-row flex-md-column flex-lg-row justify-content-between">
<span class="fw-bold">{{ __('Date de récupération') }}&nbsp;:&nbsp;</span>
<span>@include('back::pages.orders.parts.badges.in-shop-pickup-date', compact('order'))</span>
</li>