wait #5788 @0:15 correctifs frais de port, envoi de devis

diff --git a/app/Http/Controllers/AjaxController.php b/app/Http/Controllers/AjaxController.php
index 8896aa355110551f6fb66d58040d823c41f4f8d0..0877576ae9ac942a8c660fd5f560fdaa30bf64c0 100644 (file)
--- a/app/Http/Controllers/AjaxController.php
+++ b/app/Http/Controllers/AjaxController.php
@@ -274,6 +274,7 @@ class AjaxController extends CubistFrontController
     public function request_quote(Request $request, $save = null, $action = "quote")
     {
         $page = Page::find($request['page'])->getPageData();
+
         // Array of product IDs => quantity
         $cartData = json_decode($request->input('cart_data'), true);
 
@@ -317,7 +318,7 @@ class AjaxController extends CubistFrontController
                 'reference' => $cartData_[$index]['ref'],
                 'name' => $products[$id]['name'],
                 'quantity' => $_data,
-                'price' => ECommerceCommon::priceWithDiscount($price, $discount)."€" ?? 0
+                'price' => isset($price) ? ECommerceCommon::priceWithDiscount($price, $discount)."€" : 0
             ];
 
             $productsMessage[] = 'Référence : ' . $cartData_[$index]['ref'] . "\n";
@@ -335,7 +336,7 @@ class AjaxController extends CubistFrontController
                 $labelPriceDiscount = 'Prix unitaire HT (avec options et remise) : ';
             }
 
-            $productsMessage[$indexMessage] .= $labelPrice.$price . "€ \n";
+            $productsMessage[$indexMessage] .= isset($price) ? $labelPrice.$price . "€ \n" : "";
             if($discount) {
                 $productsMessage[$indexMessage] .= $labelPriceDiscount.$priceDiscount. "€ \n";
             }
@@ -348,11 +349,11 @@ class AjaxController extends CubistFrontController
 
         if($action === "order") {
             $totalHT = array_reduce($prices, function($carry, $item) { return $carry + $item; });
-            $totalHT += ($totalHT > 1000) ? 20 : 0;
+            $totalHT += ($totalHT < 1000) ? 20 : 0;
             $tva = ECommerceCommon::tva($totalHT);
             $totalTTC = ECommerceCommon::totalTTC($totalHT);
 
-            $productsMessage[$indexMessage] .= "Frais de ports : ".($totalHT > 1000 ? 20 : 0)."€\n";
+            $productsMessage[$indexMessage] .= "Frais de ports : ".($totalHT < 1000 ? 20 : 0)."€\n";
             $productsMessage[$indexMessage] .= "Total HT : $totalHT"."€\n";
             $productsMessage[$indexMessage] .= "Montant TVA : $tva"."€\n";
             $productsMessage[$indexMessage] .= "Total TTC : $totalTTC"."€\n";
@@ -377,7 +378,6 @@ class AjaxController extends CubistFrontController
         unset($data['cart_data']);
 
         $validatedData['subject'] = $data['company'];
-        $validatedData['id'] = $save->id;
 
         if($action === "quote") {
             $quote = new QuoteRequest($data);
@@ -388,6 +388,9 @@ class AjaxController extends CubistFrontController
             $linkTo = 'Voir la commande en ligne : ' . url('/admin/order/' . $save->id . "/edit \n");
         }
 
+        $validatedData['id'] = $save ? $save->id : $quote->id;
+
+
         $this->_sendMail($validatedData, $page, [implode("\r\n", $productsMessage), '', $linkTo], "Nouvelle commande");
     }
 

diff --git a/resources/js/app.js b/resources/js/app.js
index 69921c8e2b5d5b7fc01892f9d1eb1f1a71f7b699..46cd964c726f76dc4223634547ceab42e0fe79f2 100644 (file)
--- a/resources/js/app.js
+++ b/resources/js/app.js
@@ -154,7 +154,7 @@ const app = new Vue({
             let prices = this.items.length ? this.items.map(item => (item.price - ((item.price * item.discount) / 100)) * item.quantity) : false
 
             prices = prices ? Number.parseFloat(prices.reduce((init, current) => init + current)) : 0
-            prices += (prices > 1000) ? 20 : 0
+            prices += (prices < 1000) ? 20 : 0
 
             return prices.toFixed(2)
         },

diff --git a/resources/views/pages/order.blade.php b/resources/views/pages/order.blade.php
index 1bfc45e73babae766ff5413691bd223677cecb65..46bb1f537d39dcee7e07b59d1dda84284b765c2c 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€' }}</span>
                         </div>
                         <div class="cart-total">
                             <p class="text-2xl text-navy">{{ __('Total HT') }} : <span v-cloak>@{{ total }}</span>€</p>