MOD EV3-381 Navigátor panel - termékcsoportok part2

app/Http/Controllers/OrderController.php

@@ -890,6 +890,16 @@ public function getOrderData(?int $orderId = null, ?Order $Order = null): array
             $orderData['changedItems'] = $this->getChangedItems($Order);
         }
 
+        if ($Order->orderFlag == 'storno' && $Order->rel_id) {
+            $originalOrder = OrderArchive::find($Order->rel_id);
+            if (! $originalOrder) {
+                $originalOrder = Order::find($Order->rel_id);
+            }
+            if ($originalOrder) {
+                $orderData['originalHumanId'] = $originalOrder->humanId;
+            }
+        }
+
         if ($Order->orderType == 'weekly') {
             $orderData['items'] = $this->getOrderItemsFromOrderData(null, $Order);
             if (is_array($orderData['items']['weekDayItems'])) {

public/mix-manifest.json

@@ -1,9 +1,9 @@
 {
     "/js/app.js": "/js/app.js?id=788435874adbbf8e5ddc27cc9d18e00e",
-    "/js/admin.js": "/js/admin.js?id=63aa33642e8f8f48a97c8a7bb91ce5d8",
+    "/js/admin.js": "/js/admin.js?id=da1f7342a72ee4c621609fcc25b78c02",
-    "/js/module.js": "/js/module.js?id=29a456e6546fb80088a21e164cdfca82",
+    "/js/module.js": "/js/module.js?id=58dac9ddfc516935ae2981fd46a26688",
     "/js/components.js": "/js/components.js?id=34668cee8ac371c98657beffcff579b8",
-    "/css/app.css": "/css/app.css?id=05445eb8fb6f79c539507896e268aa91",
+    "/css/app.css": "/css/app.css?id=366d6978f145ae9341959edd6e69bed7",
     "/fonts/vendor/bootstrap-icons/bootstrap-icons.woff2?92ea18a81d737146ff044ddb52010366": "/fonts/vendor/bootstrap-icons/bootstrap-icons.woff2?92ea18a81d737146ff044ddb52010366?id=9ad5aa740d7d5e6a0191b309b9b1986c",
     "/fonts/vendor/bootstrap-icons/bootstrap-icons.woff?1295669cd4e305c97f2cfc16d56614b8": "/fonts/vendor/bootstrap-icons/bootstrap-icons.woff?1295669cd4e305c97f2cfc16d56614b8?id=d1af9af6052c51b169be6c628ae99bb5",
     "/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot?23f19bb08961f37aaf692ff943823453": "/fonts/vendor/@fortawesome/fontawesome-free/webfa-brands-400.eot?23f19bb08961f37aaf692ff943823453?id=0868992b7c56298026b76b22c534eab9",

resources/js/moduleJs/order.js

@@ -1403,6 +1403,13 @@ solution before template
 
 
 
+        $('.sidebar-wrapper a.categoryItem.categoryParent').off('click');
+        $('.sidebar-wrapper a.categoryItem.categoryParent').on('click', function (e) {
+            e.preventDefault();
+            $(this).next('ul.subgroup-list').slideToggle(200);
+            $(this).toggleClass('open');
+        });
+
         $('.sidebar-wrapper .sidebar-menu .sidebar-dropdown .sidebar-submenu li a.categoryItem.clickable').off('click');
         $('.sidebar-wrapper .sidebar-menu .sidebar-dropdown .sidebar-submenu li a.categoryItem.clickable').on('click',
             function () {

resources/views/modules/order/invoice.blade.php

@@ -13,7 +13,7 @@
         <th colspan="9">
             <table style="width: 100%;" class="invoiceHeadTable">
                 <tr class="orderIdRow">
-                    <td colspan="2" >{{$humanId}}</td>
+                    <td colspan="2" >{{$humanId}}@if($orderFlag == 'storno' && !empty($originalHumanId)), a {{$originalHumanId}} stornója @endif</td>
                 </tr>
                 <tr>
                     <td style="width: 50%">

resources/views/modules/order/productSelectSidebar.blade.php

@@ -44,7 +44,7 @@
                         <span>Csoportok</span>
                         {{--<span class="badge badge-pill badge-warning">Új</span>--}}
                     </a>
-                    <div class="sidebar-submenu active" style="display: block;max-height: 220px; overflow: scroll;">
+                    <div class="sidebar-submenu active" style="display: block;">
                         <ul>
                             @if(count($productGroup)>0)
                             @include('modules.order.productSelectSidebarProductGroupPartial',$productGroup)
@@ -146,46 +146,51 @@
                     </a>
                 </li>
 
-                <li class="header-menu">
+                <li class="sidebar-dropdown extra-block active">
-                    <span>Extra</span>
+                    <a href="#">
-                </li>
+                        <i class="fa fa-ellipsis-h"></i>
-                <li >
+                        <span>Extra</span>
-                    <a href="#" class="sidebar favorites">
-                        <i class="far fa-star"></i>
-                        <span>Kedvencek</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="sidebar often">
-                        <i class="fa fa-calendar"></i>
-                        <span>Gyakran vásárolt</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="sidebar last">
-                        <i class="fa fa-clock"></i>
-                        <span>Utoljára vásárolt</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="sidebar weekly">
-                        <i class="fa fa-redo"></i>
-                        <span>Heti termékek</span>
-                    </a>
-                </li>
-                <li>
-                    <a href="#" class="sidebar krel">
-                        <i class="fas fa-sort-amount-down"></i>
-                        <span>REL termékek</span>
-                    </a>
-                </li>
-
-
-                <li>
-                    <a href="#" class="sidebar specialOffer">
-                        <i class="fa fa-percent"></i>
-                        <span>Akciós termékek</span>
                     </a>
+                    <div class="sidebar-submenu" style="display: block;">
+                        <ul>
+                            <li >
+                                <a href="#" class="sidebar favorites">
+                                    <i class="far fa-star"></i>
+                                    <span>Kedvencek</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="#" class="sidebar often">
+                                    <i class="fa fa-calendar"></i>
+                                    <span>Gyakran vásárolt</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="#" class="sidebar last">
+                                    <i class="fa fa-clock"></i>
+                                    <span>Utoljára vásárolt</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="#" class="sidebar weekly">
+                                    <i class="fa fa-redo"></i>
+                                    <span>Heti termékek</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="#" class="sidebar krel">
+                                    <i class="fas fa-sort-amount-down"></i>
+                                    <span>REL termékek</span>
+                                </a>
+                            </li>
+                            <li>
+                                <a href="#" class="sidebar specialOffer">
+                                    <i class="fa fa-percent"></i>
+                                    <span>Akciós termékek</span>
+                                </a>
+                            </li>
+                        </ul>
+                    </div>
                 </li>
 
 
@@ -343,8 +348,8 @@
 
     .sidebar-wrapper {
         width: 260px;
-        height: 100%;
+        height: calc(100% - 123px);
-        max-height: 100%;
+        max-height: calc(100% - 123px);
         position: fixed;
         top: 123px;
         left: -300px;
@@ -557,6 +562,22 @@
 
     }
 
+    .sidebar-wrapper .sidebar-menu .sidebar-dropdown .sidebar-submenu li a.categoryItem.categoryParent {
+        cursor: pointer;
+        position: relative;
+    }
+    .sidebar-wrapper .sidebar-menu .sidebar-dropdown .sidebar-submenu li a.categoryItem.categoryParent:after {
+        font-family: "Font Awesome 5 Free";
+        font-weight: 900;
+        content: "\f105"; /* jobbra mutató nyíl */
+        position: absolute;
+        right: 15px;
+        transition: transform 0.2s ease;
+    }
+    .sidebar-wrapper .sidebar-menu .sidebar-dropdown .sidebar-submenu li a.categoryItem.categoryParent.open:after {
+        transform: rotate(90deg); /* nyitott állapotban lefelé fordul */
+    }
+
     /*--------------------------side-footer------------------------------*/
 
     .sidebar-footer {
@@ -755,19 +776,44 @@
         color: #b8bfce;
     }
 
+    /*----- rugalmas magasság: a Csoportok tölti ki a szabad helyet -----*/
+    .sidebar-wrapper .sidebar-content {
+        display: flex;
+        flex-direction: column;
+    }
+    .sidebar-wrapper .sidebar-menu,
+    .sidebar-wrapper .sidebar-menu > ul {
+        display: flex;
+        flex-direction: column;
+        flex: 1 1 auto;
+        min-height: 0; /* flexben a görgetés feltétele */
+    }
+    /* a Csoportok li nőjjon, a többi (Kosár, Extra) megtartja a méretét */
+    .sidebar-wrapper .sidebar-menu .sidebar-dropdown.active:not(.extra-block) {
+        flex: 1 1 auto;
+        min-height: 0;
+        display: flex;
+        flex-direction: column;
+    }
+    .sidebar-wrapper .sidebar-menu .sidebar-dropdown.active:not(.extra-block) .sidebar-submenu {
+        flex: 1 1 auto;
+        min-height: 0;
+        overflow-y: auto;
+    }
+
 </style>
 
 
 <script>
     jQuery(function ($) {
 
-        $(".sidebar-dropdown > a").click(function() {
+        $(".sidebar-dropdown:not(.extra-block) > a").click(function() {
-            $(".sidebar-submenu").slideUp(200);
+            $(".sidebar-dropdown:not(.extra-block) .sidebar-submenu").slideUp(200);
             if ($(this).parent().hasClass("active")) {
-                $(".sidebar-dropdown").removeClass("active");
+                $(".sidebar-dropdown:not(.extra-block)").removeClass("active");
                 $(this).parent().removeClass("active");
             } else {
-                $(".sidebar-dropdown").removeClass("active");
+                $(".sidebar-dropdown:not(.extra-block)").removeClass("active");
                 $(this)
                     .next(".sidebar-submenu")
                     .slideDown(200);
@@ -777,6 +823,20 @@
             }
         });
 
+        // Az Extra blokk függetlenül nyitható/csukható, nem zárja be a Csoportokat
+        var extraCollapsed = localStorage.getItem("sidebarExtraCollapsed") === "1";
+        if (extraCollapsed) {
+            $(".extra-block").removeClass("active");
+            $(".extra-block > .sidebar-submenu").hide();
+        }
+        $(".extra-block > a").click(function(e) {
+            e.preventDefault();
+            var $li = $(this).parent();
+            $(this).next(".sidebar-submenu").slideToggle(200);
+            $li.toggleClass("active");
+            localStorage.setItem("sidebarExtraCollapsed", $li.hasClass("active") ? "0" : "1");
+        });
+
         $("#close-sidebar").click(function() {
             $(".page-wrapper").removeClass("toggled");
             $(".containerStepper").removeClass("activeSideBar");

resources/views/modules/order/productSelectSidebarProductGroupPartial.blade.php

@@ -5,8 +5,9 @@
 
     <li class="list-unstyled">
     @if(!$productGroup['isLeaf'])
-            <a class="categoryItem">{{$productGroup['name']}}</a>
+            @php($openByDefault = in_array($productGroup['name'], ['Food', 'NonFood'], true))
-            <ul>
+            <a class="categoryItem categoryParent{{ $openByDefault ? ' open' : '' }}">{{$productGroup['name']}}</a>
+            <ul class="subgroup-list" style="display:{{ $openByDefault ? 'block' : 'none' }};">
         @include('modules.order.productSelectSidebarProductGroupPartial',$productGroup)
             </ul>
     @else