diff --git a/resources/views/pages/orders/form.blade.php b/resources/views/pages/orders/form.blade.php index 23e01ae..9081efe 100644 --- a/resources/views/pages/orders/form.blade.php +++ b/resources/views/pages/orders/form.blade.php @@ -54,6 +54,16 @@ @endif @endcan + @if($order->has_warning) +
+
+ + + {{ __('Il est nécessaire de résoudre les issues de cette commande avant de pouvoir poursuivre.') }} + +
+
+ @endcan @if(!$order->mail_sent)
@@ -130,7 +140,18 @@
@endif
- @else + @endcan + @if($order->has_warning) +
+
+ + + {{ __('Il est nécessaire de résoudre les issues de cette commande avant de pouvoir modifier son état de livraison.') }} + +
+
+ @endcan + @if(!$order->mail_sent)
diff --git a/resources/views/pages/orders/parts/amounts.blade.php b/resources/views/pages/orders/parts/amounts.blade.php index 74d871a..ee3d4ea 100644 --- a/resources/views/pages/orders/parts/amounts.blade.php +++ b/resources/views/pages/orders/parts/amounts.blade.php @@ -1,5 +1,5 @@
-
+
{{ __('Montants') }} @if($order->discounted > 0) diff --git a/resources/views/pages/orders/parts/statuses.blade.php b/resources/views/pages/orders/parts/statuses.blade.php index b26de05..9ba7dee 100644 --- a/resources/views/pages/orders/parts/statuses.blade.php +++ b/resources/views/pages/orders/parts/statuses.blade.php @@ -4,21 +4,21 @@
-
+
    -
  • +
  • {{ __('Validation') }} :  @include('back::pages.orders.parts.badges.validation-status', compact('order'))
  • -
  • +
  • {{ __('Paiement') }} :  @include('back::pages.orders.parts.badges.payment-status', compact('order'))
  • -
  • +
  • {{ __('Livraison') }} :  @include('back::pages.orders.parts.badges.delivery-status', compact('order'))
  • -
  • +
  • {{ __('Date de récupération') }} :  @include('back::pages.orders.parts.badges.in-shop-pickup-date', compact('order'))