From 902f38e395797935a9d876616bc410e229990f44 Mon Sep 17 00:00:00 2001
From: Luca Haid <luca.haid@xinon.eu>
Date: Thu, 14 Nov 2024 10:13:15 +0000
Subject: [PATCH] Feature/improve warehouse shipping note

---
 Layout/default/menu.php                              | 2 +-
 public/js/pages/WarehouseArticle/WarehouseArticle.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Layout/default/menu.php b/Layout/default/menu.php
index 7ce18b19d..3c776a07a 100644
--- a/Layout/default/menu.php
+++ b/Layout/default/menu.php
@@ -157,7 +157,7 @@
 
                         <?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseDistributor")?>"><i class="far fa-fw fa-cogs text-info"></i> Administration</a></li><?php endif; ?>
 
-                        <li class="has-sub-submenu font-weight-bold"><a>E-Stmk Shop</a></li>
+                        <?php if($me->can("WarehouseAdmin") || $me->can("WarehouseEShop")): ?><li class="has-sub-submenu font-weight-bold"><a>E-Stmk Shop</a></li><?php endif; ?>
                         <?php if($me->can("WarehouseEShop")): ?><li><a href="<?=self::getUrl("WarehouseEShop")?>"><i class="far fa-fw fa-shopping-cart text-info"></i> E-Shop</a></li><?php endif; ?>
                         <?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseEShopOrder")?>"><i class="far fa-fw fa-shopping-basket text-info"></i> E-Shop Bestellungen</a></li><?php endif; ?>
                         <?php if($me->can("WarehouseAdmin")): ?><li><a href="<?=self::getUrl("WarehouseArticlePacket")?>"><i class="far fa-fw fa-box text-info"></i> Artikel-Pakete</a></li><?php endif; ?>
diff --git a/public/js/pages/WarehouseArticle/WarehouseArticle.js b/public/js/pages/WarehouseArticle/WarehouseArticle.js
index d5c631190..cf7c9d29c 100644
--- a/public/js/pages/WarehouseArticle/WarehouseArticle.js
+++ b/public/js/pages/WarehouseArticle/WarehouseArticle.js
@@ -272,7 +272,7 @@ Vue.component('warehouse-article', {
 
                     </tt-table-crud>
 
-                    <tt-expandable-shopping-cart :cart-items="shoppingCart" @submitOrder="prepareOrder"/>
+                    <tt-expandable-shopping-cart v-if="window.TT_CONFIG['WAREHOUSE_ADMIN'] === true" :cart-items="shoppingCart" @submitOrder="prepareOrder"/>
                     <tt-modal :show.sync="addShoppingCartModal" title="Artikel zur Bestellung hinzufügen" :delete="false" @submit="addToShoppingCart"
                               @close="addShoppingCartModal = false">
                       <tt-input v-model="addShoppingCartModalCount" placeholder="Menge" type="number" sm></tt-input>