wait #6244 @1:30

diff --git a/app/Models/ECommerceCommon.php b/app/Models/ECommerceCommon.php
index 4e1a86b816d4ecd5b966a677d357a4a17f2d3ed4..24aee78cd535d2b2e93a92176b1c47e2c82a3dcb 100644 (file)
--- a/app/Models/ECommerceCommon.php
+++ b/app/Models/ECommerceCommon.php
@@ -47,7 +47,7 @@ class ECommerceCommon extends CubistMagicAbstractModel
     }
     public static function totalHT($price, $discount, $quantity) {
         $t = self::priceWithDiscount($price, $discount) * $quantity;
-        $t += ($t > 1000) ? 20 : 0;
+        $t += ($t < 1000) ? 20 : 0;
         return $t;
     }
 
@@ -110,7 +110,7 @@ class ECommerceCommon extends CubistMagicAbstractModel
         });
 
         $ht = array_reduce($total, function($carry, $item) { return $carry + $item; });
-        $ht += ($ht > 1000) ? 20 : 0;
+        $ht += ($ht < 1000) ? 20 : 0;
         $tva = $ht * 0.2;
         $ttc = $ht + $tva;
         $data['total'] = !$unavailableEcommerceProduct ? number_format($ttc,2) : null;

diff --git a/resources/views/components/item-cart-order.blade.php b/resources/views/components/item-cart-order.blade.php
index b9ec1a03916cc12ab4edba5e3343c7823c40523c..3d9691e805e08dfc115a1fe920b70097ef138f17 100644 (file)
--- a/resources/views/components/item-cart-order.blade.php
+++ b/resources/views/components/item-cart-order.blade.php
@@ -1,5 +1,9 @@
 @if($items)
     @foreach($items as $item)
+    @php
+        $prices = array_map(function($product){ return ($product['price'] - (($product['price'] * $product['discount']) / 100)) * $product['quantity']; },json_decode($item['products'],true));
+        $prices = array_reduce($prices, function($carry, $item) { return $carry += $item; });
+    @endphp
     <div id="cart-saved-{{ $item['id'] }}" class="cartsave bg-grey-200 pr-2v pl-2v">
         <div class="cartsave-name">
             <div class="flex justify-between">
@@ -31,8 +35,14 @@
                             <p class="no-m text-navy">{{ $product['name'] }}</p>
                             @if(isset($product['discount']) && $product['discount'] !== 0)
                                 @if(floatval($product['basic_selling_price']))
-                                    <p class="no-m">{{ __('Prix catalogue') }} : <span class="text-navy line-through">{{
-                                        $product['basic_selling_price'] }} € HT</span>
+                                    <p class="no-m">{{ __('Prix catalogue') }} :
+                                        <span class="text-navy line-through">
+                                            @if(floatval($product['price']))
+                                                {{ $product['price'] }}
+                                            @else
+                                                {{ $product['basic_selling_price'] }}
+                                            @endif € HT
+                                        </span>
                                     </p>
                                     <p class="no-m">{{ __('Votre prix') }} : <span class="text-navy">{{
                                         number_format(\App\Models\ECommerceCommon::priceWithDiscount($product['basic_selling_price'], $product['discount']), 2) }} € HT</span>
@@ -41,8 +51,14 @@
                             @else
                                 @isset($product['basic_selling_price'])
                                     @if(floatval($product['basic_selling_price']))
-                                        <p class="no-m">{{ __('Prix unitaire') }} : <span class="text-navy">{{
-                                            $product['basic_selling_price'] }} € HT</span>
+                                        <p class="no-m">{{ __('Prix unitaire') }} :
+                                            <span class="text-navy">
+                                                @if(floatval($product['price']))
+                                                    {{ $product['price'] }}
+                                                @else
+                                                    {{ $product['basic_selling_price'] }}
+                                                @endif € HT
+                                            </span>
                                         </p>
                                     @endif
                                 @endisset
@@ -83,8 +99,10 @@
                 </div>
                 @if($item['total'])
                     <div class="text-right pb-6">
-                        <p class="no-m">{{ __('Montant Total') }}</p>
-                        <p class="no-m">{{ $item['total'] }}€ TTC</p>
+                        <p class="no-m">{{ __('Frais de port') }} : {{ $prices < 1000 ? 20 : 0 }}€</p>
+                        <p class="no-m">{{ __('Total HT') }} : {{ $prices += ($prices < 1000 ? 20 : 0) }}€</p>
+                        <p class="no-m">{{ __('Montant TVA') }} : {{ $prices * 0.2 }}€</p>
+                        <p class="no-m">{{ __('Total TTC') }} : {{ $item['total'] }}€</p>
                     </div>
                 @endif
             </div>

diff --git a/resources/views/components/item-cart.blade.php b/resources/views/components/item-cart.blade.php
index 0edf71e4c54dcebed44bf498d6f7d26addfe0fa2..2ba11d4add011ac38c9eb43280cebbdf826c11d9 100644 (file)
--- a/resources/views/components/item-cart.blade.php
+++ b/resources/views/components/item-cart.blade.php
@@ -1,5 +1,9 @@
 @if($items)
 @foreach($items as $item)
+    @php
+        $prices = array_map(function($product){ return ($product['price'] - (($product['price'] * $product['discount']) / 100)) * $product['quantity']; },json_decode($item['products'],true));
+        $prices = array_reduce($prices, function($carry, $item) { return $carry += $item; });
+    @endphp
     <div id="cart-saved-{{ $item['id'] }}" class="cartsave bg-grey-200 pr-2v pl-2v">
         <div class="cartsave-name">
             <div>
@@ -80,8 +84,10 @@
             <div class="<?php echo $page !== 'order' ?: 'flex justify-between' ?>">
                 @if($item['total'])
                     <div class="text-right pb-6">
-                        <p class="no-m">{{ __('Montant Total') }}</p>
-                        <p class="no-m">{{ $item['total'] }}€ TTC</p>
+                        <p class="no-m">{{ __('Frais de port') }} : {{ $prices < 1000 ? 20 : 0 }}€</p>
+                        <p class="no-m">{{ __('Total HT') }} : {{ $prices += ($prices < 1000 ? 20 : 0) }}€</p>
+                        <p class="no-m">{{ __('Montant TVA') }} : {{ $prices * 0.2 }}€</p>
+                        <p class="no-m">{{ __('Total TTC') }} : {{ $item['total'] }}€</p>
                     </div>
                 @endif
             </div>