wait #6243 @0:25

diff --git a/resources/styles/components/cart.styl b/resources/styles/components/cart.styl
index 83b44f0d0485bb7538c794567dfed708b099f6e4..29ce94b2c138e805a954899cef4b55dc87dabbe5 100644 (file)
--- a/resources/styles/components/cart.styl
+++ b/resources/styles/components/cart.styl
@@ -48,6 +48,13 @@
     &-footer
       @apply bg-grey-100 p-10
 
+.shipping-coast
+  margin-bottom: 10px
+  font-size: 14px
+  text-align: center
+  border-top: 1px solid #e2e8f0
+  padding-top: 12px
+
 
 // Show cart popout when .cart-open is applied to body
 .cart-open

diff --git a/resources/views/components/item-cart.blade.php b/resources/views/components/item-cart.blade.php
index 752c731104bba1e7907b54ed3b6c82ad108d439d..0edf71e4c54dcebed44bf498d6f7d26addfe0fa2 100644 (file)
--- a/resources/views/components/item-cart.blade.php
+++ b/resources/views/components/item-cart.blade.php
@@ -81,7 +81,7 @@
                 @if($item['total'])
                     <div class="text-right pb-6">
                         <p class="no-m">{{ __('Montant Total') }}</p>
-                        <p class="no-m">{{ $item['total'] }}€ HT</p>
+                        <p class="no-m">{{ $item['total'] }}€ TTC</p>
                     </div>
                 @endif
             </div>

diff --git a/resources/views/pages/order.blade.php b/resources/views/pages/order.blade.php
index 46bb1f537d39dcee7e07b59d1dda84284b765c2c..35c2d70d94694e479be30d8dec8cab00b9a61493 100644 (file)
--- a/resources/views/pages/order.blade.php
+++ b/resources/views/pages/order.blade.php
@@ -17,7 +17,7 @@
 
                     <div class="bg-grey-100 p-1v pt-0" v-cloak v-if="cartItemCount === cartItemHasPriceCount">
                         <div class="cart-shipping-fees text-navy">
-                            {{ __('Frais de ports') }} : <span v-cloak>@{{ total < 1000 ? '20€' : '0€' }}</span>
+                            {{ __('Frais de ports') }} : <span v-cloak>@{{ total < 1000 ? '20€' : '0€' }} HT</span>
                         </div>
                         <div class="cart-total">
                             <p class="text-2xl text-navy">{{ __('Total HT') }} : <span v-cloak>@{{ total }}</span>€</p>

diff --git a/resources/views/partials/header.blade.php b/resources/views/partials/header.blade.php
index 4de7b98a903fe0a58485a5e86eee52bfca1c01e2..813e38d0f9ef329c3c2ec0b064e8c0f3d08c3f28 100644 (file)
--- a/resources/views/partials/header.blade.php
+++ b/resources/views/partials/header.blade.php
@@ -64,6 +64,9 @@
                     <div v-if="cartItemCount == 0" class="pb-1v">
                         {{ __("Vous n'avez encore rien sélectionné") }}
                     </div>
+                    <div class="shipping-coast" v-if="cartItemCount > 0 && cartItemCount === cartItemHasPriceCount">
+                        Frais de ports : @{{ total - 20 < 1000 ? 20 : 0 }} € HT
+                    </div>
                 </div>
                 <div class="cart-header-popout-footer" v-cloak v-if="cartItemCount > 0 && cartItemCount !== cartItemHasPriceCount">
                     <link-button class="block text-center" :href="$nav->getHrefByName('cart')">