mirror of
https://github.com/Karaka-Management/oms-ClientManagement.git
synced 2026-01-11 15:28:41 +00:00
bug fixes
This commit is contained in:
parent
d45c1fc432
commit
dc0f668ab3
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -13,4 +13,7 @@
|
|||
declare(strict_types=1);
|
||||
|
||||
return ['Navigation' => [
|
||||
'Client' => 'Client',
|
||||
'Region' => 'Region',
|
||||
'SalesRep' => 'SalesRep',
|
||||
]];
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user