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/views/Shop/layout/partials/sections-menu-list.blade.php

@@ -0,0 +1,19 @@
+<ul class="navbar-nav w-100">
+    @foreach ($categories as $menu)
+        <li class="nav-item dropdown megamenu p-2 col 
+        @if (in_array($menu['id'], [$category['id'] ?? false, $category['parent_id'] ?? false, $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">
+                    {{ $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">
+                    {{ $menu['name'] }}
+                </a>
+            @endif
+        </li>
+    @endforeach
+</ul>

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">