diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index c4bc50d..d25052c 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -318,7 +318,7 @@ "uri": "{/prefix}sales/analysis/item", "target": "self", "icon": null, - "order": 4, + "order": 10, "from": "ItemManagement", "permission": { "permission": 2, "type": null, "element": null }, "parent": 1001602001, diff --git a/Models/ItemAttributeType.php b/Models/ItemAttributeType.php index fe1e935..70922df 100755 --- a/Models/ItemAttributeType.php +++ b/Models/ItemAttributeType.php @@ -115,12 +115,12 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface { if ($l11n instanceof ItemAttributeTypeL11n) { $this->l11n = $l11n; - } elseif ($this->l11n instanceof ItemAttributeTypeL11n && \is_string($l11n)) { - $this->l11n->title = $l11n; } elseif (\is_string($l11n)) { $this->l11n = new ItemAttributeTypeL11n(); $this->l11n->title = $l11n; $this->l11n->setLanguage($lang); + } elseif ($this->l11n instanceof ItemAttributeTypeL11n && \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 a20bad2..05d97f6 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/Theme/Backend/Lang/Navigation.en.lang.php @@ -13,6 +13,7 @@ declare(strict_types=1); return ['Navigation' => [ + 'Article' => 'Article', 'Analyze' => 'Analyze', 'Attributes' => 'Attributes', 'Types' => 'Types',