new: make all forms have a cancel/save button on the top also

app/Repositories/Shop/Articles.php

@@ -178,10 +178,18 @@ class Articles
         $articles = self::getArticlesWithOffers($options);
         $searchOrder = $options['ids'] ?? false ? array_flip($options['ids']->toArray()) : false;
         foreach ($articles as $article) {
+            // Skip articles without an offer/tariff/price list for the resolved sale channel
+            if (!isset($article->offers[0]) || ! $article->offers[0]->tariff) {
+                continue;
+            }
+
             $price_lists = $article->offers[0]->tariff->price_lists->toArray();
             if (! count($price_lists)) {
                 continue;
             }
+            if (empty($price_lists[0]['price_list_values'][0] ?? null)) {
+                continue;
+            }
             if (! is_array($data[$article->name] ?? false)) {
                 $data[$article->name] = self::getDataForSale($article);
                 if ($searchOrder) {

resources/shop/css/main.css

@@ -112,3 +112,17 @@ body {
 .bg-darker {
 	background-color: rgba(0,0,0,0.05)!important;
 }
+
+/* Header action buttons aligned with page title */
+.content-header .form-buttons {
+    margin-left: 12px;
+}
+
+.content-header .form-buttons .btn {
+    height: 32px;
+    display: inline-flex;
+    align-items: center;
+    padding-top: 4px;
+    padding-bottom: 4px;
+    line-height: 1.1;
+}

resources/shop/css/site.css

@@ -311,6 +311,52 @@ div.megamenu ul.megamenu li.megamenu.level1
 }
 
 
+.category-title {
+	font-size: 2em;
+}
+
+.category-description {
+	font-size: 1.2em;
+}
+
+.breadcrumb-title {
+	font-size: 1.6em;
+}
+
+.breadcrumb-current {
+	font-size: 1em;
+}
+
+@media (max-width: 767.98px){
+	.category-title {
+		font-size: 1.5em;
+	}
+	.category-description {
+		font-size: 1.05em;
+	}
+	.breadcrumb-title {
+		font-size: 1.4em;
+	}
+	.breadcrumb-current {
+		font-size: 0.95em;
+	}
+}
+
+@media (max-width: 575.98px){
+	.category-title {
+		font-size: 1.35em;
+	}
+	.category-description {
+		font-size: 0.95em;
+	}
+	.breadcrumb-title {
+		font-size: 1.2em;
+	}
+	.breadcrumb-current {
+		font-size: 0.9em;
+	}
+}
+
 @font-face {
     font-family: 'noto_sanscondensed';
     src: url('/fonts/notosans-condensed/notosans-condensed-webfont.eot');
@@ -375,4 +421,13 @@ div.megamenu ul.megamenu li.megamenu.level1
 	#navbarContentMobile .dropdown-menu .shadow {
 		box-shadow: none !important;
 	}
+
+	.category-card .card-body {
+		font-size: 0.75rem;
+	}
+
+	/* Supprimer les grandes marges du container en affichage mobile/tablette */
+	.container {
+		max-width: 100%;
+	}
 }

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

@@ -1,8 +1,6 @@
-<h1 style="font-size: 1.5em;">
+<h1 class="breadcrumb-title">
 	@foreach($breadcrumb ?? [] as $parent)
-		<a href="{{ route('Shop.Categories.show', ['id' => $parent['id']]) }}" style="text-decoration: none; color: inherit;">{{ $parent['name'] }}</a> /
+		<a href="{{ route('Shop.Categories.show', ['id' => $parent['id']]) }}" class="breadcrumb-link">{{ $parent['name'] }}</a> /
 	@endforeach
-	<span style="font-size: 1.4em;">
+	<span class="breadcrumb-current">{{ $category['name'] }}</span>
-		{{ $category['name'] }}
-	</span>
 </h1>

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

@@ -1,7 +1,7 @@
 <div class="row">
 	<div class="col-8">
-		<h1 style="font-size: 2em;">{{ $category['name'] }}</h1>
+		<h1 class="category-title">{{ $category['name'] }}</h1>
-		<h3 style="font-size: 1.2em;">{!! $category['description'] !!}</h3>
+		<h3 class="category-description">{!! $category['description'] !!}</h3>
 	</div>
 	<div class="col-4">
 		@include('Shop.layout.partials.category_add')
@@ -12,4 +12,4 @@
 	<div class="col-12">
 		@include('Shop.layout.partials.category_articles')
 	</div>
-</div>
+</div>

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

@@ -1,7 +1,7 @@
-<div class="row">
+<div class="row mx-n1">
 	@if ($articles ?? false)
 		@foreach ($articles as $product_name => $article)
-			<div class="col-lg-3 col-xs-12 mb-3">
+			<div class="category-card col-6 col-md-4 col-lg-3 mb-2 px-1">
 				@include('Shop.Articles.partials.article')
 			</div>
 		@endforeach
@@ -46,4 +46,3 @@
         });
 	</script>
 @endpush
-

resources/views/components/save.blade.php

@@ -1,7 +1,23 @@
+@php
+    $cancelUrl = $cancel_url ?? $cancelUrl ?? null;
+@endphp
+
+@push('header-actions')
+    <div class="form-buttons d-flex align-items-center ml-3">
+        @include('components.form.buttons.button-cancel', [
+            'class' => 'btn-sm mr-2',
+            'url' => $cancelUrl,
+        ])
+        @include('components.form.buttons.button-save', [
+            'class' => 'btn-sm',
+        ])
+    </div>
+@endpush
+
 <div class="row pt-0 pb-3">
 	<div class="col-12">
 		<div class="text-right form-buttons">
-			@include('components.form.buttons.button-cancel')
+			@include('components.form.buttons.button-cancel', ['url' => $cancelUrl])
 			@include('components.form.buttons.button-save')
 		</div>
 	</div>

resources/views/layout/contentheader.blade.php

@@ -1,13 +1,16 @@
 <div class="content-header pt-2 pb-1">
     <div class="container-fluid">
-        <div class="row mb-2 align-items-end">
+        <div class="row mb-2 align-items-center">
             <div class="col-sm-6">
-                <h1 class="m-0 text-dark">
+                <div class="d-flex align-items-center flex-wrap">
-                    {{ $title ?? null}}
+                    <h1 class="m-0 text-dark d-flex align-items-center">
-                    @isset($subtitle)
+                        {{ $title ?? null}}
-                        <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>
+                        @isset($subtitle)
-                    @endisset
+                            <small class="font-weight-light ml-1 text-md">{{ $subtitle }}</small>
-                </h1>
+                        @endisset
+                    </h1>
+                    @stack('header-actions')
+                </div>
             </div>
             <div class="col-sm-6">
                 <ol class="breadcrumb float-sm-right text-sm">