From 7454411d27202cbedbc799bb7be19589db94abfe Mon Sep 17 00:00:00 2001
From: Ludovic CANDELLIER <ludovic.candellier@fundglobam.com>
Date: Tue, 14 Mar 2023 21:46:57 +0100
Subject: [PATCH] fix active hierarchy in menu and megamenu

---
 build/css/site.css                            |  4 +-
 .../views/Admin/Shop/Invoices/edit.blade.php  |  2 +-
 resources/views/Shop/Invoices/pdf.blade.php   | 40 +++++++++++++++++++
 .../Shop/layout/partials/header-nav.blade.php |  6 +--
 .../Shop/layout/partials/megamenu.blade.php   |  4 +-
 .../layout/partials/megamenu_leafs.blade.php  | 10 +++--
 .../Shop/layout/partials/sections.blade.php   |  7 ++--
 resources/views/Shop/layout/print.blade.php   | 16 ++++++++
 8 files changed, 74 insertions(+), 15 deletions(-)
 create mode 100644 resources/views/Shop/Invoices/pdf.blade.php
 create mode 100644 resources/views/Shop/layout/print.blade.php

diff --git a/build/css/site.css b/build/css/site.css
index 1c0d8591..8bea8338 100644
--- a/build/css/site.css
+++ b/build/css/site.css
@@ -201,7 +201,7 @@ div.megamenu ul.megamenu li.megamenu.level1
   cursor: pointer;
 }
 
-#navbarContent > ul > li:hover, #navbarContent > ul > li.show  
+#navbarContent > ul > li:hover, #navbarContent > ul > li.show, #navbarContent > ul > li.active  
 {
 	border-bottom: 3px solid #F2B90F!important;
 }
@@ -217,7 +217,7 @@ div.megamenu ul.megamenu li.megamenu.level1
 }
 
 
-.dropdown-menu a > div.w-100:hover
+.dropdown-menu a > div.w-100:hover, .dropdown-menu a > div.w-100.active
 {
 	color: #335012;
 	background-color: #F2B90F;
diff --git a/resources/views/Admin/Shop/Invoices/edit.blade.php b/resources/views/Admin/Shop/Invoices/edit.blade.php
index d398c826..b6076e76 100644
--- a/resources/views/Admin/Shop/Invoices/edit.blade.php
+++ b/resources/views/Admin/Shop/Invoices/edit.blade.php
@@ -40,7 +40,7 @@
 				<div class="col-6">
 					<div class="row mb-3">
 						<div class="col-6" style="font-size: 1.2em; font-weight: 500;">
-							Facture <br/>
+							Facture N° {{ $invoice['ref'] }}<br/>
 							du {{ Carbon\Carbon::parse($invoice['created_at'])->isoFormat('LLLL') }}
 						</div>
 						<div class="col-6">
diff --git a/resources/views/Shop/Invoices/pdf.blade.php b/resources/views/Shop/Invoices/pdf.blade.php
new file mode 100644
index 00000000..5918b736
--- /dev/null
+++ b/resources/views/Shop/Invoices/pdf.blade.php
@@ -0,0 +1,40 @@
+@extends('Shop.layout.print')
+
+@section('content')
+
+	<div class="row mb-3">
+		<div class="col-6">	
+			<h3>{{ $invoice['order']['customer']['last_name'] }} {{ $invoice['order']['customer']['first_name'] }}</h3>
+			<div class="row">
+				<div class="col-12">
+					<h6>
+						@if ($invoice['order']['address'])
+							{{ $invoice['order']['address']['address'] }}<br/>
+							@isset ($invoice['order']['address']['address2'])
+								{{ $invoice['order']['address']['address2'] }}<br/>
+							@endisset
+							{{ $invoice['order']['address']['zipcode'] }} {{ $invoice['order']['address']['city'] }}<br/>
+						@endif
+					</h6>
+				</div>
+			</div>
+		</div>
+		<div class="col-6">
+			<div class="row mb-3">
+				<div class="col-6" style="font-size: 1.2em; font-weight: 500;">
+					Facture N° {{ $invoice['ref'] }}<br/>
+						du {{ Carbon\Carbon::parse($invoice['created_at'])->isoFormat('LLLL') }}
+				</div>
+				<div class="col-6">
+						
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<div class="row mb-3">
+		<div class="col-12">
+			@include('Admin.Shop.Orders.partials.detail', ['detail_type' => 'facture', 'order' => $invoice['order']])
+		</div>
+	</div>
+@endsection
\ No newline at end of file
diff --git a/resources/views/Shop/layout/partials/header-nav.blade.php b/resources/views/Shop/layout/partials/header-nav.blade.php
index 0a4f9f76..ef62860f 100644
--- a/resources/views/Shop/layout/partials/header-nav.blade.php
+++ b/resources/views/Shop/layout/partials/header-nav.blade.php
@@ -1,15 +1,15 @@
 <div class="row bg-light">
 
-	<div class="col-5">
+	<div class="col-sm-6 col-lg-5">
 		<a href="/"><img src="/img/logo.png" height="52"></a>
 		<span class="green ml-3">Variétés Paysannes de la Semence à l'Assiette</span>
 	</div>
 
-	<div class="col-3 pt-2">	
+	<div class="col-sm-6 col-lg-3 pt-2">	
 		@include("Shop.layout.partials.search")
 	</div>
 
-	<div class="col-4 pt-2 text-right">
+	<div class="col-sm-12 col-lg-4 pt-2 text-right">
 		@include('Shop.layout.partials.header-catalog')
 		@include("Shop.layout.partials.header-profile")
 		@include("Shop.layout.partials.header-basket")
diff --git a/resources/views/Shop/layout/partials/megamenu.blade.php b/resources/views/Shop/layout/partials/megamenu.blade.php
index f203ad58..00e9e0e4 100644
--- a/resources/views/Shop/layout/partials/megamenu.blade.php
+++ b/resources/views/Shop/layout/partials/megamenu.blade.php
@@ -3,9 +3,9 @@
 @endphp 
 
 <div class="container p-0">
-    <div class="row m-0 shadow bg-white p-2 w-100">
+    <div class="row m-0 shadow bg-white p-2 w-100 @if ( in_array($menu['id'], [$category['id'], $category['parent_id']])) active @endif">
         <div class="col mb-4">
-            <a class="green-dark @if (($category['id'] ?? false) == $menu['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
+            <a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}">
                 <div class="w-100"><strong>Tous les articles</strong></div>
             </a>
             @for ($i = 0; $i < count($submenu[0]); $i++)
diff --git a/resources/views/Shop/layout/partials/megamenu_leafs.blade.php b/resources/views/Shop/layout/partials/megamenu_leafs.blade.php
index e435599d..eff696ff 100644
--- a/resources/views/Shop/layout/partials/megamenu_leafs.blade.php
+++ b/resources/views/Shop/layout/partials/megamenu_leafs.blade.php
@@ -1,8 +1,10 @@
-<a class="green-dark @if (($category['id'] ?? false) == $menu_children['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
-    <div class="w-100"><strong>{{ $menu_children['name'] }}</strong></div>
+<a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $menu_children['id']]) }}">
+    <div class="w-100 @if (in_array($menu_children['id'], [$category['id'], $category['parent_id']])) active @endif">
+        <strong>{{ $menu_children['name'] }}</strong>
+    </div>
 </a>
 @foreach ($menu_children['children'] ?? [] as $leaf)
-    <a class="green-dark @if (($category['id'] ?? false) == $leaf['id']) active @endif" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
-        <div class="w-100">{{ $leaf['name'] }}</div>
+    <a class="green-dark" href="{{ route('Shop.Categories.show', ['id' => $leaf['id']]) }}">
+        <div class="w-100 @if (($category['id'] ?? false) == $leaf['id']) active @endif">{{ $leaf['name'] }}</div>
     </a>
 @endforeach
diff --git a/resources/views/Shop/layout/partials/sections.blade.php b/resources/views/Shop/layout/partials/sections.blade.php
index 972dad49..2203a47d 100644
--- a/resources/views/Shop/layout/partials/sections.blade.php
+++ b/resources/views/Shop/layout/partials/sections.blade.php
@@ -4,16 +4,17 @@
 			<div class="collapse navbar-collapse" id="navbarContent">
 				<ul class="navbar-nav w-100">
 					@foreach ($categories as $menu)
-						<li class="nav-item dropdown megamenu p-2 col">
+						<li class="nav-item dropdown megamenu p-2 col 
+						@if (in_array($menu['id'], [$category['id'], $category['parent_id'], $category['parent']['parent_id'] ?? false])) active @endif">
 							@if ($menu['children'] ?? false)
-								<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle text-uppercase @if (($category['id'] ?? false) == $menu['id']) active @endif">
+								<a id="megamenu_{{ $menu['id'] }}" href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false" class="nav-link dropdown-toggle text-uppercase">
 									{{ $menu['name'] }}
 								</a>
 								<div aria-labelledby="megamenu_{{ $menu['id'] }}" class="dropdown-menu border-0 p-0 m-0">
 									@include('Shop.layout.partials.megamenu')
 								</div>
 							@else
-								<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link text-uppercase text-white @if (($category['id'] ?? false) == $menu['id']) active @endif">
+								<a href="{{ route('Shop.Categories.show', ['id' => $menu['id']]) }}" class="nav-link text-uppercase text-white">
 									{{ $menu['name'] }}
 								</a>
 							@endif
diff --git a/resources/views/Shop/layout/print.blade.php b/resources/views/Shop/layout/print.blade.php
new file mode 100644
index 00000000..28b64149
--- /dev/null
+++ b/resources/views/Shop/layout/print.blade.php
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="{{ App::getLocale() }}" dir="@lang('boilerplate::layout.direction')">
+<head>
+	<meta charset="utf-8">
+	<meta http-equiv="X-UA-Compatible" content="IE=edge">
+	<meta name="viewport" content="width=device-width, initial-scale=1">
+	<meta name="robots" content="noindex, nofollow">
+	<title>{{ $title ?? '' }} | {{ config('app.name') }}</title>
+    <link rel="preconnect" href="https://fonts.gstatic.com">
+	<link href="https://fonts.googleapis.com/css2?family=Source+Sans+Pro:ital,wght@0,300;0,400;0,700;1,400&display=swap" rel="stylesheet">
+	<link rel="stylesheet" href="/assets/css/main.min.css?{{ time() }}">
+</head>
+<body>
+	@yield('content')
+</body>
+</html>