wip #5788 @0:10 affichage dynamique des tarifs selon le changement de remise, réactiv...

diff --git a/resources/js/app.js b/resources/js/app.js
index 64470036ea133a09e2bad94611ed52489cdc7883..e84987495617fb65100e2cd381d391f4b892b572 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -93,7 +93,7 @@ const app = new Vue({
         this.getUser()
 
         eventBus.$on('send-id', data => {
-            this.getDiscount(data)
+            this.updateCart(data)
         })
     },
 
@@ -146,7 +146,7 @@ const app = new Vue({
         },
 
         cartItemHasPriceCount() {
-            return this.items.length ? this.items.filter(n => n.price !== "" && !isNaN(n.price)).length : 0
+            return this.items.length ? this.items.filter(n => n.price !== "" && !isNaN(n.price) && n.price > 0 ).length: 0
         },
 
         total() {
@@ -585,7 +585,6 @@ const app = new Vue({
                     if (response.data.needs_update) {
                         root.items = response.data.cart_data;
                     }
-                    console.log(root.items)
                 })
                 .catch(function (error) {
                     }

diff --git a/resources/js/components/CartItem.vue b/resources/js/components/CartItem.vue
index eda3b2b99bbf7697152c9e38614efba8e2ff33ed..f53ef364a729a319ea7199e7c33dc75e3475987e 100644 (file)
--- a/resources/js/components/CartItem.vue
+++ b/resources/js/components/CartItem.vue
@@ -15,10 +15,10 @@
                 <span class="mr-2">Quantité</span>
                 <number-input v-model="item.quantity" :min="1" inline center controls></number-input>
             </div>
-            <div v-if="!isNaN(parseFloat(item.price))" :class="{ 'line-through' : item.discount > 0 }">
+            <div v-if="!isNaN(parseFloat(item.price)) && parseFloat(item.price) > 0" :class="{ 'line-through' : item.discount > 0 }">
                 <span class="text-navy">{{ Number.parseFloat(price).toFixed(2) }}<span>€ HT</span></span>
             </div>
-            <div v-if="item.discount > 0">
+            <div v-if="item.discount > 0 && parseFloat(item.price) > 0">
                 <span class="text-navy">{{ Number.parseFloat(priceDiscount).toFixed(2) }}€ HT</span>
             </div>
             <a href="#" class="cart-delete-item text-red" @click.prevent="deleteItem">

diff --git a/resources/views/components/item-cart.blade.php b/resources/views/components/item-cart.blade.php
index 510fbbce4758faf2c802f5927d1d15aa6726ee08..229372be73b79eef78c6bef8a5030489d28b658b 100644 (file)
--- a/resources/views/components/item-cart.blade.php
+++ b/resources/views/components/item-cart.blade.php
@@ -1,25 +1,12 @@
 @foreach($items as $item)
     <div id="cart-saved-{{ $item['id'] }}" class="cartsave bg-grey-200 pr-2v pl-2v">
         <div class="cartsave-name">
-            @if($page === "savedcart")
-                <div>
-                    <input id="cart-name-{{ $item['id'] }}" class="readonly" value="{{ $item['name'] }}" readonly />
-                </div>
-                <a href="#" data-input="{{ $item['id'] }}" class="inline-block animated-underline" data-defaulttext="{{ __('Editer le nom du panier') }}" data-edittext="{{ __('Sauvegarder le nom du panier') }}" @click.prevent.self="toggleName">
-                    {{ __('Editer le nom du panier') }}
-                </a>
-            @else
-                <div class="flex justify-between">
-                    <div>
-                        <p class="no-m">{{ __('Date de commande') }}</p>
-                        <p class="no-m text-navy">{{ \Carbon\Carbon::parse($item['created_at'])->isoFormat("D/MM/Y") }}</p>
-                    </div>
-                    <div class="text-right">
-                        <p class="no-m">{{ __('Numéro de commande') }}</p>
-                        <p class="no-m text-navy">N°{{ $item['id'] }}</p>
-                    </div>
-                </div>
-            @endif
+            <div>
+                <input id="cart-name-{{ $item['id'] }}" class="readonly" value="{{ $item['name'] }}" readonly />
+            </div>
+            <a href="#" data-input="{{ $item['id'] }}" class="inline-block animated-underline" data-defaulttext="{{ __('Editer le nom du panier') }}" data-edittext="{{ __('Sauvegarder le nom du panier') }}" @click.prevent.self="toggleName">
+                {{ __('Editer le nom du panier') }}
+            </a>
         </div>
         <div class="cartsave-products">
             @foreach(json_decode($item['products'], true) as $key => $product)
@@ -53,7 +40,7 @@
                         <div class="product-price">
                             @if(floatval($product['price']))
                                 @php($price = $product['price'] - (($product['price'] * $product['discount']) / 100))
-                                <p class="no-m">{{ number_format($product['price'] * $product['quantity'], 2) }}€ HT</p>
+                                <p class="no-m">{{ number_format($price * $product['quantity'], 2) }}€ HT</p>
                             @else
                                 <p class="text-navy">
                                     N/A
@@ -69,17 +56,6 @@
         </div>
         <div class="cartsave-footer <?php echo $item['total'] ? 'pt-6' : 'pt-12' ?>">
             <div class="<?php echo $page !== 'order' ?: 'flex justify-between' ?>">
-                @if($page === "order")
-                    <div>
-                        <p class="no-m">{{ __('Statut') }}</p>
-                        <p class="no-m text-navy">
-                            {{ \App\Models\Command::getOptionValue($item['status']) }}
-                            @if($item['complete_status'])
-                                &#183;&nbsp;{{ $item['complete_status'] }}
-                            @endif
-                        </p>
-                    </div>
-                @endif
                 @if($item['total'])
                     <div class="text-right pb-6">
                         <p class="no-m">{{ __('Montant Total') }}</p>
@@ -88,23 +64,21 @@
                 @endif
             </div>
             <div class="flex justify-between items-center">
-                @if($page === "savedcart")
-                    <button class="flex items-center" data-id="{{ $item['id'] }}" @click.stop="removeSavedCart">
-                        @svg('icon-trash')
-                        <span class="ml-3">{{ __('Supprimer ce panier') }}</span>
-                    </button>
+                <button class="flex items-center" data-id="{{ $item['id'] }}" @click.stop="removeSavedCart">
+                    @svg('icon-trash')
+                    <span class="ml-3">{{ __('Supprimer ce panier') }}</span>
+                </button>
 
-                    <div class="flex items-center">
-                        <a href="#" data-id="{{ $item['id'] }}" class="animated-underline mr-10 xs:mr-0" @click.self.prevent="savedCartToCurrent">
-                            {{ __('Modifier ce panier') }}
-                        </a>
-                        @isset($item['total'])
-                            <a href="#" class="btn" data-id="{{ $item['id'] }}" @click.self.prevent="savedCartToCurrent">{{ __('Passer commande') }}</a>
-                        @else
-                            <a href="" class="btn">{{ __('Demander un devis') }}</a>
-                        @endisset
-                    </div>
-                @endif
+                <div class="flex items-center">
+                    <a href="#" data-id="{{ $item['id'] }}" class="animated-underline mr-10 xs:mr-0" @click.self.prevent="savedCartToCurrent">
+                        {{ __('Modifier ce panier') }}
+                    </a>
+                    @isset($item['total'])
+                        <a href="#" class="btn" data-id="{{ $item['id'] }}" @click.self.prevent="savedCartToCurrent">{{ __('Passer commande') }}</a>
+                    @else
+                        <a href="" class="btn">{{ __('Demander un devis') }}</a>
+                    @endisset
+                </div>
             </div>
         </div>
     </div>