From 1fc860715f61b022334db33a994b125a2760a270 Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Fri, 22 Apr 2022 02:32:53 +0200
Subject: [PATCH] fixes

---
 app/Http/Controllers/Shop/BasketController.php       |  2 +-
 app/Repositories/Shop/Offers.php                     |  2 +-
 resources/views/Shop/Baskets/basket.blade.php        |  6 ++++++
 resources/views/Shop/Tags/partials/filter.blade.php  |  3 +++
 .../views/Shop/layout/partials/megamenu.blade.php    | 12 ++++++++++--
 5 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/Shop/BasketController.php b/app/Http/Controllers/Shop/BasketController.php
index 7e7655f4..f2276eb8 100644
--- a/app/Http/Controllers/Shop/BasketController.php
+++ b/app/Http/Controllers/Shop/BasketController.php
@@ -18,7 +18,7 @@ class BasketController extends Controller
         $offer_id = $request->input('offer_id');
         $quantity = $request->input('quantity');
         $price = Offers::getPrice($offer_id, $quantity)->price_taxed;
-        return $quantity * $price;
+        return number_format($quantity * $price, 2);
     }
 
     public function addBasket(Request $request)
diff --git a/app/Repositories/Shop/Offers.php b/app/Repositories/Shop/Offers.php
index 980b681a..9be59e1c 100644
--- a/app/Repositories/Shop/Offers.php
+++ b/app/Repositories/Shop/Offers.php
@@ -40,7 +40,7 @@ class Offers
     {
         $sale_channel_id = $sale_channel_id ? $sale_channel_id : SaleChannels::getDefaultID();
         $offer = Offer::withPriceBySaleChannelByQuantity($sale_channel_id, $quantity)->find($id);
-        return $offer->price_lists->first()->price_list_values->first();
+        return number_format($offer->price_lists->first()->price_list_values->first(),2);
     }
 
     public static function getBasket()
diff --git a/resources/views/Shop/Baskets/basket.blade.php b/resources/views/Shop/Baskets/basket.blade.php
index 95da0626..a745341b 100644
--- a/resources/views/Shop/Baskets/basket.blade.php
+++ b/resources/views/Shop/Baskets/basket.blade.php
@@ -34,6 +34,7 @@
 							Tarif appliqué
 						</div>
 						<div class="col-6">
+							{{ $sale_channel['name'] ?? '' }}
 						</div>
 					</div>
 					<div class="row m-3">
@@ -61,6 +62,11 @@
 							<span id="basket-total-shipped"></span> €
 						</div>
 					</div>
+					<div class="row m-3">
+						<div class="col-12 text-center">
+							<a href="" class="btn btn-green-dark">COMMANDER</a>
+						</div>
+					</div>
 				@endcomponent
 			</div>
 		</div>
diff --git a/resources/views/Shop/Tags/partials/filter.blade.php b/resources/views/Shop/Tags/partials/filter.blade.php
index 626862d8..829db31a 100644
--- a/resources/views/Shop/Tags/partials/filter.blade.php
+++ b/resources/views/Shop/Tags/partials/filter.blade.php
@@ -27,10 +27,13 @@
     </section>
 </aside>
 
+@include('load.layout.chevron')
+
 @push('js')
     <script>
         $('#filters').click(function() {
             $('#sidebar').toggleClass('d-none');
         })
+        initChevron();
     </script>
 @endpush
\ No newline at end of file
diff --git a/resources/views/Shop/layout/partials/megamenu.blade.php b/resources/views/Shop/layout/partials/megamenu.blade.php
index 9ca384cb..792774c5 100644
--- a/resources/views/Shop/layout/partials/megamenu.blade.php
+++ b/resources/views/Shop/layout/partials/megamenu.blade.php
@@ -16,7 +16,11 @@
         </div>
         <div class="col mb-4">
             @for ($i = round(count($category['children']) / 3); $i < round(2 * count($category['children']) / 3); $i++)
-                <strong>{{ $category['children'][$i]['name'] }}</strong><br>
+                <strong>
+                    <a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $category['children'][$i]['id']]) }}">
+                        {{ $category['children'][$i]['name'] }}
+                    </a>
+                </strong><br>
                 @foreach ($category['children'][$i]['children'] ?? [] as $leaf)
                     <a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
                         {{ $leaf['name'] }}
@@ -26,7 +30,11 @@
         </div>
         <div class="col mb-4">
             @for ($i = round(2 * count($category['children']) / 3); $i < count($category['children']); $i++)
-                <strong>{{ $category['children'][$i]['name'] }}</strong><br>
+                <strong>
+                    <a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $category['children'][$i]['id']]) }}">
+                        {{ $category['children'][$i]['name'] }}
+                    </a>
+                </strong><br>
                 @foreach ($category['children'][$i]['children'] ?? [] as $leaf)
                     <a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
                         {{ $leaf['name'] }}