From dc0f668ab30c41e701fb49eab388fc2ac692b66a Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sun, 4 Apr 2021 17:53:48 +0200
Subject: [PATCH] bug fixes

---
 Admin/Install/Navigation.install.json     | 6 +++---
 Models/ClientAttributeType.php            | 4 ++--
 Theme/Backend/Lang/Navigation.en.lang.php | 3 +++
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json
index dc20472..0de6a0b 100755
--- a/Admin/Install/Navigation.install.json
+++ b/Admin/Install/Navigation.install.json
@@ -54,7 +54,7 @@
         "uri": "{/prefix}sales/analysis/client?{?}",
         "target": "self",
         "icon": null,
-        "order": 1,
+        "order": 2,
         "from": "ClientManagement",
         "permission": { "permission": 2, "type": null, "element": null },
         "parent": 1001602001,
@@ -69,7 +69,7 @@
         "uri": "{/prefix}sales/analysis/region?{?}",
         "target": "self",
         "icon": null,
-        "order": 2,
+        "order": 3,
         "from": "ClientManagement",
         "permission": { "permission": 2, "type": null, "element": null },
         "parent": 1001602001,
@@ -84,7 +84,7 @@
         "uri": "{/prefix}sales/analysis/rep?{?}",
         "target": "self",
         "icon": null,
-        "order": 3,
+        "order": 4,
         "from": "ClientManagement",
         "permission": { "permission": 2, "type": null, "element": null },
         "parent": 1001602001,
diff --git a/Models/ClientAttributeType.php b/Models/ClientAttributeType.php
index 474f430..c2a1c8b 100755
--- a/Models/ClientAttributeType.php
+++ b/Models/ClientAttributeType.php
@@ -115,12 +115,12 @@ class ClientAttributeType implements \JsonSerializable, ArrayableInterface
     {
         if ($l11n instanceof ClientAttributeTypeL11n) {
             $this->l11n = $l11n;
-        } elseif ($this->l11n instanceof ClientAttributeTypeL11n && \is_string($l11n)) {
-            $this->l11n->title = $l11n;
         } elseif (\is_string($l11n)) {
             $this->l11n        = new ClientAttributeTypeL11n();
             $this->l11n->title = $l11n;
             $this->l11n->setLanguage($lang);
+        } elseif ($this->l11n instanceof ClientAttributeTypeL11n && \is_string($l11n)) {
+            $this->l11n->title = $l11n;
         }
     }
 
diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php
index 083e8d2..fd35029 100755
--- a/Theme/Backend/Lang/Navigation.en.lang.php
+++ b/Theme/Backend/Lang/Navigation.en.lang.php
@@ -13,4 +13,7 @@
 declare(strict_types=1);
 
 return ['Navigation' => [
+	'Client' => 'Client',
+	'Region' => 'Region',
+	'SalesRep' => 'SalesRep',
 ]];