change registration or connection in order page, change filter on shelve page, add new api to get article_nature by product_type, css fixes

resources/views/Admin/Shop/Articles/partials/characteristics.blade.php

@@ -39,6 +39,7 @@
 				{{ Form::label('article_nature_id', __('shop.article_natures.name')) }}<br>
 				@include('components.form.select', [
 					'name' => 'article_nature_id',
+					'id_name' => 'article_nature_id',
 					'list' => $natures_options,
 					'value' => $article['article_nature_id'] ?? null,
 					'class' => 'select2',
@@ -155,12 +156,15 @@
 			switch (product_type) {
 				case 'App\\Models\\Botanic\\Specie':
 					var url = '{{ route('Admin.Botanic.Species.getSelect') }}';
+					var product_type = 1;
 					break;
 				case 'App\\Models\\Botanic\\Variety':
 					var url = '{{ route('Admin.Botanic.Varieties.getSelect') }}';
+					var product_type = 1;
 					break;
 				case 'App\\Models\\Shop\\Merchandise':
 					var url = '{{ route('Admin.Shop.Merchandises.getSelect') }}';
+					var product_type = 2;
 					break;
 			}
 			loadProducts(url);

resources/views/Shop/Baskets/basket.blade.php

@@ -38,6 +38,13 @@
 				</x-card>
 			</div>
 		</div>
+	@else
+		<div class="row">
+			<div class="col-8">
+				<h1>Panier</h1>
+				Votre panier est vide
+			</div>
+		</div>
 	@endif
 @endsection
 

resources/views/Shop/Customers/partials/registration.blade.php

@@ -15,16 +15,14 @@
     </div>
 </div>
 <div class="row">
-    <div class="col-12">
+    <div class="col-6">
         @include('components.form.input', [
             'name' => 'company',
             'value' => $customer['company'] ?? '',
             'label' => 'Société',
         ])
     </div>
-</div>
-<div class="row">
-    <div class="col-12">
+    <div class="col-6">
         @include('components.form.input', [
             'name' => 'tva',
             'value' => $customer['tva'] ?? '',

resources/views/Shop/Orders/order.blade.php

@@ -4,7 +4,7 @@
 
 @section('content')
 	<div class="row">
-		<div class="col-8">
+		<div class="@if ($basket['count']) col-8 @else col-12 @endif">
 			@if (!App\Repositories\Shop\Customers::isConnected())
 				<p>
 					<a href="#" id="customer" class="pr-5">Déja client ?</a>
@@ -39,11 +39,13 @@
 			{!! Form::close() !!}
 			
 		</div>
-		<div class="col-4">
-			<x-card class='shadow'>
-				@include('Shop.Baskets.partials.basketTotal')
-			</x-card>
-		</div>
+		@if ($basket['count'])
+			<div class="col-4">
+				<x-card class='shadow'>
+					@include('Shop.Baskets.partials.basketTotal')
+				</x-card>
+			</div>
+		@endif
 	</div>
 @endsection
 

resources/views/Shop/Shelves/partials/category_articles_rows.blade.php

@@ -1,7 +1,11 @@
 @if ($articles ?? false)
-	@foreach ($articles as $product_name => $article)
-		@include('Shop.Articles.partials.article_rows')
-	@endforeach
+	<div class="row">
+		<div class="col-12">
+			@foreach ($articles as $product_name => $article)
+				@include('Shop.Articles.partials.article_rows')
+			@endforeach
+		</div>
+	</div>
 @endif
 
 @push('js')

resources/views/Shop/auth/partials/register.blade.php

@@ -42,7 +42,7 @@
 
             <div class="row mbm">
                 <div class="col-xs-12 col-sm-12 col-md-12 col-lg-12 text-center">
-                    <button type="submit" class="btn btn-primary">
+                    <button type="submit" class="btn btn-green-dark">
                         {{ __('boilerplate::auth.register.register_button') }}
                     </button>
                 </div>

resources/views/Shop/layout/partials/header-profile.blade.php

@@ -25,7 +25,7 @@
 		</li>
 	@else
 		<li class="dropdown-item">
-			<a href="{{ route('Shop.login') }}" title="Identifiez-vous" rel="nofollow">
+			<a href="{{ route('Shop.Orders.order') }}" title="Identifiez-vous" rel="nofollow">
 				<span>Connexion</span>
 			</a>
 		</li>
@@ -34,5 +34,11 @@
 				<span>Creer votre compte</span>
 			</a>
 		</li>
+		<li class="dropdown-item">
+			<a href="https://www.jardinenvie.com/boutique/commander" title="Télécharger le catalogue" rel="nofollow">
+				<span>Télécharger le catalogue</span>
+			</a>
+		</li>
+
 	@endif
 </ul>