registration fixes

Admin/Install/Media.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
  * Media class.
  *
  * @package Modules\ClientManagement\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Admin/Install/Navigation.install.json

@@ -5,7 +5,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Clients",
-        "uri": "{/lang}/{/app}/sales/client/list",
+        "uri": "{/base}/sales/client/list",
         "target": "self",
         "icon": null,
         "order": 1,
@@ -19,7 +19,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "List",
-                "uri": "{/lang}/{/app}/sales/client/list",
+                "uri": "{/base}/sales/client/list",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -34,7 +34,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Create",
-                "uri": "{/lang}/{/app}/sales/client/create?{?}",
+                "uri": "{/base}/sales/client/create?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 1,
@@ -51,7 +51,7 @@
         "type": 2,
         "subtype": 1,
         "name": "Attributes",
-        "uri": "{/lang}/{/app}/sales/client/attribute/type/list?{?}",
+        "uri": "{/base}/sales/client/attribute/type/list?{?}",
         "target": "self",
         "icon": null,
         "order": 5,
@@ -65,7 +65,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Types",
-                "uri": "{/lang}/{/app}/sales/client/attribute/type/list?{?}",
+                "uri": "{/base}/sales/client/attribute/type/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
@@ -80,7 +80,7 @@
                 "type": 3,
                 "subtype": 1,
                 "name": "Values",
-                "uri": "{/lang}/{/app}/sales/client/attribute/value/list?{?}",
+                "uri": "{/base}/sales/client/attribute/value/list?{?}",
                 "target": "self",
                 "icon": null,
                 "order": 15,
@@ -97,7 +97,7 @@
         "type": 3,
         "subtype": 1,
         "name": "Client",
-        "uri": "{/lang}/{/app}/sales/analysis/client?{?}",
+        "uri": "{/base}/sales/analysis/client?{?}",
         "target": "self",
         "icon": null,
         "order": 15,
@@ -112,7 +112,7 @@
         "type": 3,
         "subtype": 1,
         "name": "Region",
-        "uri": "{/lang}/{/app}/sales/analysis/region?{?}",
+        "uri": "{/base}/sales/analysis/region?{?}",
         "target": "self",
         "icon": null,
         "order": 20,
@@ -127,7 +127,7 @@
         "type": 3,
         "subtype": 1,
         "name": "SalesRep",
-        "uri": "{/lang}/{/app}/sales/analysis/rep?{?}",
+        "uri": "{/base}/sales/analysis/rep?{?}",
         "target": "self",
         "icon": null,
         "order": 25,

Admin/Install/Navigation.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Admin\Install
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Application\ApplicationAbstract;
  * Navigation class.
  *
  * @package Modules\ClientManagement\Admin\Install
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Admin/Installer.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -26,7 +26,7 @@ use phpOMS\Uri\HttpUri;
  * Installer class.
  *
  * @package Modules\ClientManagement\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Admin/Routes/Web/Backend.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Admin/Status.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\StatusAbstract;
  * Status class.
  *
  * @package Modules\ClientManagement\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Admin/Uninstaller.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UninstallerAbstract;
  * Uninstaller class.
  *
  * @package Modules\ClientManagement\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Admin/Updater.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Admin
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\UpdaterAbstract;
  * Updater class.
  *
  * @package Modules\ClientManagement\Admin
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Controller/ApiController.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -39,9 +39,7 @@ use Modules\ClientManagement\Models\NullClientL11nType;
 use Modules\Media\Models\MediaMapper;
 use Modules\Media\Models\PathSettings;
 use Modules\Organization\Models\UnitMapper;
-use Modules\Profile\Models\ContactElementMapper;
+use phpOMS\Api\EUVAT\EUVATVies;
-use Modules\Profile\Models\Profile;
-use phpOMS\Api\EUVAT\EUVATBffOnline;
 use phpOMS\Localization\BaseStringL11n;
 use phpOMS\Localization\ISO3166CharEnum;
 use phpOMS\Localization\ISO3166TwoEnum;
@@ -60,7 +58,7 @@ use phpOMS\Utils\StringUtils;
  * ClientManagement class.
  *
  * @package Modules\ClientManagement
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -93,7 +91,7 @@ final class ApiController extends Controller
 
         // Set VAT Id
         if ($request->hasData('vat_id')) {
-            /** @var \Modules\Admin\Models\Unit $unit */
+            /** @var \Modules\Organization\Models\Unit $unit */
             $unit = UnitMapper::get()
                 ->with('attributes')
                 ->execute();
@@ -101,7 +99,7 @@ final class ApiController extends Controller
             $validate = ['status' => -1];
 
             if (\in_array($client->mainAddress->getCountry(), ISO3166CharEnum::getRegion('eu'))) {
-                $validate = EUVATBffOnline::validateQualified(
+                $validate = EUVATVies::validateQualified(
                     $unit->getAttribute('vat_id')?->value->getValue() ?? '',
                     $request->getData('vat_id'),
                     $client->account->name1,
@@ -115,7 +113,7 @@ final class ApiController extends Controller
                 new NullAccount($request->header->account),
                 null,
                 (string) $validate['status'],
-                StringUtils::intHash(EUVATBffOnline::class),
+                StringUtils::intHash(EUVATVies::class),
                 'vat_validation',
                 self::NAME,
                 (string) $client->getId(),
@@ -125,11 +123,13 @@ final class ApiController extends Controller
 
             AuditMapper::create()->execute($audit);
 
-            if ($validate['status'] === 0) {
+            if ($validate['status'] === 0
+                && $validate['vat'] === true && $validate['name'] === true && $validate['city'] === true
+            ) {
                 /** @var \Modules\ClientManagement\Models\ClientAttributeType $type */
                 $type = ClientAttributeTypeMapper::get()->where('name', 'vat_id')->execute();
 
-                $internalRequest = new HttpRequest(new HttpUri(''));
+                $internalRequest  = new HttpRequest(new HttpUri(''));
                 $internalResponse = new HttpResponse();
 
                 $internalRequest->header->account = $request->header->account;
@@ -143,15 +143,15 @@ final class ApiController extends Controller
 
         // Find tax code
         if ($this->app->moduleManager->isActive('Billing')) {
-            /** @var \Modules\Admin\Models\Unit $unit */
+            /** @var \Modules\Organization\Models\Unit $unit */
             $unit = UnitMapper::get()->with('mainAddress')->where('id', $this->app->unitId)->execute();
 
             /** @var \Modules\ClientManagement\Models\ClientAttributeType $type */
             $type = ClientAttributeTypeMapper::get()->where('name', 'sales_tax_code')->execute();
 
-            $value = $this->app->moduleManager->get('Billing')->getClientTaxCode($client, $unit->mainAddress);
+            $value = $this->app->moduleManager->get('Billing', 'ApiTax')->getClientTaxCode($client, $unit->mainAddress);
 
-            $internalRequest = new HttpRequest(new HttpUri(''));
+            $internalRequest  = new HttpRequest(new HttpUri(''));
             $internalResponse = new HttpResponse();
 
             $internalRequest->header->account = $request->header->account;
@@ -179,25 +179,25 @@ final class ApiController extends Controller
         $account = null;
         if (!$request->hasData('account')) {
             $account        = new Account();
-            $account->name1 = (string) ($request->getData('name1') ?? '');
+            $account->name1 = $request->getDataString('name1') ?? '';
-            $account->name2 = (string) ($request->getData('name2') ?? '');
+            $account->name2 = $request->getDataString('name2') ?? '';
         } else {
             $account = new NullAccount((int) $request->getData('account'));
         }
 
         $client          = new Client();
-        $client->number  = (string) ($request->getData('number') ?? '');
+        $client->number  = $request->getDataString('number') ?? '';
         $client->account = $account;
 
         $addr          = new Address();
-        $addr->address = (string) ($request->getData('address') ?? '');
+        $addr->address = $request->getDataString('address') ?? '';
-        $addr->postal  = (string) ($request->getData('postal') ?? '');
+        $addr->postal  = $request->getDataString('postal') ?? '';
-        $addr->city    = (string) ($request->getData('city') ?? '');
+        $addr->city    = $request->getDataString('city') ?? '';
-        $addr->setCountry($request->getData('country') ?? ISO3166TwoEnum::_XXX);
+        $addr->setCountry($request->getDataString('country') ?? ISO3166TwoEnum::_XXX);
-        $addr->state         = (string) ($request->getData('state') ?? '');
+        $addr->state         = $request->getDataString('state') ?? '';
         $client->mainAddress = $addr;
 
-        $client->unit = $request->getData('unit', 'int');
+        $client->unit = $request->getDataInt('unit');
 
         return $client;
     }
@@ -262,12 +262,12 @@ final class ApiController extends Controller
     private function createClientL11nFromRequest(RequestAbstract $request) : ClientL11n
     {
         $clientL11n         = new ClientL11n();
-        $clientL11n->client = (int) ($request->getData('client') ?? 0);
+        $clientL11n->client = $request->getDataInt('client') ?? 0;
-        $clientL11n->type   = new NullClientL11nType((int) ($request->getData('type') ?? 0));
+        $clientL11n->type   = new NullClientL11nType($request->getDataInt('type') ?? 0);
-        $clientL11n->setLanguage((string) (
+        $clientL11n->setLanguage(
-            $request->getData('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->getLanguage()
-        ));
+        );
-        $clientL11n->description = (string) ($request->getData('description') ?? '');
+        $clientL11n->description = $request->getDataString('description') ?? '';
 
         return $clientL11n;
     }
@@ -333,7 +333,7 @@ final class ApiController extends Controller
     private function createClientL11nTypeFromRequest(RequestAbstract $request) : ClientL11nType
     {
         $clientL11nType             = new ClientL11nType();
-        $clientL11nType->title      = (string) ($request->getData('title') ?? '');
+        $clientL11nType->title      = $request->getDataString('title') ?? '';
         $clientL11nType->isRequired = (bool) ($request->getData('is_required') ?? false);
 
         return $clientL11nType;
@@ -400,7 +400,7 @@ final class ApiController extends Controller
         $attribute->client = (int) $request->getData('client');
         $attribute->type   = new NullClientAttributeType((int) $request->getData('type'));
 
-        if ($request->getData('value') !== null) {
+        if ($request->hasData('value')) {
             $attribute->value = new NullClientAttributeValue((int) $request->getData('value'));
         } else {
             $newRequest = clone $request;
@@ -475,11 +475,11 @@ final class ApiController extends Controller
     private function createClientAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $attrL11n      = new BaseStringL11n();
-        $attrL11n->ref = (int) ($request->getData('type') ?? 0);
+        $attrL11n->ref = $request->getDataInt('type') ?? 0;
-        $attrL11n->setLanguage((string) (
+        $attrL11n->setLanguage(
-            $request->getData('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->getLanguage()
-        ));
+        );
-        $attrL11n->content = (string) ($request->getData('title') ?? '');
+        $attrL11n->content = $request->getDataString('title') ?? '';
 
         return $attrL11n;
     }
@@ -544,13 +544,13 @@ final class ApiController extends Controller
      */
     private function createClientAttributeTypeFromRequest(RequestAbstract $request) : ClientAttributeType
     {
-        $attrType                    = new ClientAttributeType($request->getData('name') ?? '');
+        $attrType                    = new ClientAttributeType($request->getDataString('name') ?? '');
-        $attrType->datatype          = (int) ($request->getData('datatype') ?? 0);
+        $attrType->datatype          = $request->getDataInt('datatype') ?? 0;
-        $attrType->custom            = (bool) ($request->getData('custom') ?? false);
+        $attrType->custom            = $request->getDataBool('custom') ?? false;
         $attrType->isRequired        = (bool) ($request->getData('is_required') ?? false);
-        $attrType->validationPattern = (string) ($request->getData('validation_pattern') ?? '');
+        $attrType->validationPattern = $request->getDataString('validation_pattern') ?? '';
-        $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN);
+        $attrType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
-        $attrType->setFields((int) ($request->getData('fields') ?? 0));
+        $attrType->setFields($request->getDataInt('fields') ?? 0);
 
         return $attrType;
     }
@@ -626,15 +626,15 @@ final class ApiController extends Controller
     {
         /** @var ClientAttributeType $type */
         $type = ClientAttributeTypeMapper::get()
-            ->where('id', (int) ($request->getData('type') ?? 0))
+            ->where('id', $request->getDataInt('type') ?? 0)
             ->execute();
 
         $attrValue            = new ClientAttributeValue();
-        $attrValue->isDefault = (bool) ($request->getData('default') ?? false);
+        $attrValue->isDefault = $request->getDataBool('default') ?? false;
         $attrValue->setValue($request->getData('value'), $type->datatype);
 
-        if ($request->getData('title') !== null) {
+        if ($request->hasData('title')) {
-            $attrValue->setL11n($request->getData('title'), $request->getData('language') ?? ISO639x1Enum::_EN);
+            $attrValue->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN);
         }
 
         return $attrValue;
@@ -700,11 +700,11 @@ final class ApiController extends Controller
     private function createClientAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n
     {
         $attrL11n      = new BaseStringL11n();
-        $attrL11n->ref = (int) ($request->getData('value') ?? 0);
+        $attrL11n->ref = $request->getDataInt('value') ?? 0;
-        $attrL11n->setLanguage((string) (
+        $attrL11n->setLanguage(
-            $request->getData('language') ?? $request->getLanguage()
+            $request->getDataString('language') ?? $request->getLanguage()
-        ));
+        );
-        $attrL11n->content = (string) ($request->getData('title') ?? '');
+        $attrL11n->content = $request->getDataString('title') ?? '';
 
         return $attrL11n;
     }
@@ -769,7 +769,7 @@ final class ApiController extends Controller
                 $this->createModelRelation(
                     $request->header->account,
                     $file->getId(),
-                    $request->getData('type', 'int'),
+                    $request->getDataInt('type'),
                     MediaMapper::class,
                     'types',
                     '',

Controller/BackendController.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -33,7 +33,7 @@ use phpOMS\Views\View;
  * ClientManagement class.
  *
  * @package Modules\ClientManagement
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  * @codeCoverageIgnore

Controller/Controller.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract;
  * ClientManagement class.
  *
  * @package Modules\ClientManagement
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/AttributeValueType.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Attribute value type enum.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/Client.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -29,7 +29,7 @@ use Modules\Profile\Models\Profile;
  * Client class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientAttribute.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Client class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientAttributeMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientAttributeType.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\ISO639x1Enum;
  * Client Attribute Type class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -136,7 +136,7 @@ class ClientAttributeType implements \JsonSerializable
         if ($l11n instanceof BaseStringL11n) {
             $this->l11n = $l11n;
         } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) {
-            $this->l11n->content  = $l11n;
+            $this->l11n->content = $l11n;
             $this->l11n->setLanguage($lang);
         } else {
             $this->l11n          = new BaseStringL11n();

Models/ClientAttributeTypeL11nMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientAttributeTypeMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientAttributeValue.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -23,7 +23,7 @@ use phpOMS\Localization\ISO639x1Enum;
  * The relation with the type/client is defined in the ClientAttribute class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */
@@ -135,7 +135,7 @@ class ClientAttributeValue implements \JsonSerializable
         if ($l11n instanceof BaseStringL11n) {
             $this->l11n = $l11n;
         } elseif (isset($this->l11n) && $this->l11n instanceof BaseStringL11n) {
-            $this->l11n->content  = $l11n;
+            $this->l11n->content = $l11n;
             $this->l11n->setLanguage($lang);
         } else {
             $this->l11n          = new BaseStringL11n();

Models/ClientAttributeValueL11nMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -21,7 +21,7 @@ use phpOMS\Localization\BaseStringL11n;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientAttributeValueMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientL11n.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Localization\ISO639x1Enum;
  * Localization of the client class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientL11nMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientL11nType.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Client class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientL11nTypeMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientMapper.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -27,7 +27,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
  * Client mapper class.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/ClientStatus.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Client status enum.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/NullClient.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Null model
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/NullClientAttribute.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Null model
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/NullClientAttributeType.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Null model
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/NullClientAttributeValue.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Null model
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/NullClientL11n.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Null model
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/NullClientL11nType.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -18,7 +18,7 @@ namespace Modules\ClientManagement\Models;
  * Null model
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Models/PermissionCategory.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement\Models
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ use phpOMS\Stdlib\Base\Enum;
  * Permision state enum.
  *
  * @package Modules\ClientManagement\Models
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

Theme/Backend/Lang/Navigation.ar.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.cs.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.da.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.de.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.el.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.en.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.es.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.fi.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.fr.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.hu.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.it.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.ja.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.ko.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.no.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.pl.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.pt.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.ru.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.sv.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.th.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.tr.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.uk.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/Navigation.zh.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/ar.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/cs.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/da.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/de.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/el.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/en.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/es.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/fi.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/fr.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/hu.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/it.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/ja.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/ko.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/no.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/pl.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/pt.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/ru.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/sv.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/th.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/tr.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/uk.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/Lang/zh.lang.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Localization
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/client-analysis.tpl.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/client-create.tpl.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

Theme/Backend/client-list.tpl.php

@@ -7,7 +7,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -103,14 +103,14 @@ echo $this->getData('nav')->render(); ?>
                         </label>
                 <tbody>
                 <?php $count = 0; foreach ($clients as $key => $value) : ++$count;
-                 $url        = UriFactory::build('{/lang}/{/app}/sales/client/profile?{?}&id=' . $value->getId());
+                 $url        = UriFactory::build('{/base}/sales/client/profile?{?}&id=' . $value->getId());
                  $image      = $value->getFileByTypeName('client_profile_image');
                  ?>
                 <tr data-href="<?= $url; ?>">
                     <td><a href="<?= $url; ?>"><img alt="<?= $this->getHtml('IMG_alt_client'); ?>" width="30" loading="lazy" class="item-image"
                             src="<?= $image instanceof NullMedia ?
                                         UriFactory::build('Web/Backend/img/user_default_' . \mt_rand(1, 6) .'.png') :
-                                        UriFactory::build('{/lang}/{/app}/' . $image->getPath()); ?>"></a>
+                                        UriFactory::build('{/base}/' . $image->getPath()); ?>"></a>
                     <td data-label="<?= $this->getHtml('ID', '0', '0'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->number); ?></a>
                     <td data-label="<?= $this->getHtml('Name'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->profile->account->name1); ?> <?= $this->printHtml($value->profile->account->name2); ?></a>
                     <td data-label="<?= $this->getHtml('City'); ?>"><a href="<?= $url; ?>"><?= $this->printHtml($value->mainAddress->city); ?></a>

Theme/Backend/client-profile-bills.tpl.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\Billing
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -166,7 +166,7 @@ $bills = $this->getData('newestInvoices') ?? [];
                 /** @var \Modules\Billing\Models\Bill $value */
                 foreach ($bills as $key => $value) :
                     ++$count;
-                    $url = UriFactory::build('{/lang}/{/app}/sales/bill?{?}&id=' . $value->getId());
+                    $url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $value->getId());
                 ?>
                     <tr data-href="<?= $url; ?>">
                         <td><label class="checkbox" for="iBillSelect-<?= $key; ?>">

Theme/Backend/client-profile-items.tpl.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ItemManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -135,7 +135,7 @@ $items = $this->getData('items') ?? [];
                         }
 
                         ++$count;
-                        $url = UriFactory::build('{/lang}/{/app}/sales/item/profile?{?}&id=' . $value->getId());
+                        $url = UriFactory::build('{/base}/sales/item/profile?{?}&id=' . $value->getId());
                 ?>
                 <tr data-href="<?= $url; ?>">
                     <td><label class="checkbox" for="iSalesItemSelect-<?= $key; ?>">

Theme/Backend/client-profile.tpl.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules\ClientManagement
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -217,7 +217,7 @@ echo $this->getData('nav')->render();
                                         <td><?= $this->getHtml('CreatedAt'); ?>
                                     <tbody>
                                     <?php foreach ($notes as $note) :
-                                        $url = UriFactory::build('{/lang}/{/app}/editor/single?{?}&id=' . $note->getId());
+                                        $url = UriFactory::build('{/base}/editor/single?{?}&id=' . $note->getId());
                                         ?>
                                     <tr data-href="<?= $url; ?>">
                                         <td><a href="<?= $url; ?>"><?= $note->title; ?></a>
@@ -240,7 +240,7 @@ echo $this->getData('nav')->render();
                                         <td><?= $this->getHtml('CreatedAt'); ?>
                                     <tbody>
                                     <?php foreach ($files as $file) :
-                                        $url = UriFactory::build('{/lang}/{/app}/media/single?{?}&id=' . $file->getId());
+                                        $url = UriFactory::build('{/base}/media/single?{?}&id=' . $file->getId());
                                         ?>
                                     <tr data-href="<?= $url; ?>">
                                         <td><a href="<?= $url; ?>"><?= $file->name; ?></a>
@@ -269,7 +269,7 @@ echo $this->getData('nav')->render();
                                     <?php
                                     /** @var \Modules\Billing\Models\Bill $invoice */
                                     foreach ($newestInvoices as $invoice) :
-                                        $url = UriFactory::build('{/lang}/{/app}/sales/bill?{?}&id=' . $invoice->getId());
+                                        $url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->getId());
                                         ?>
                                     <tr data-href="<?= $url; ?>">
                                         <td><a href="<?= $url; ?>"><?= $invoice->getNumber(); ?></a>

tests/Admin/AdminTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Autoloader.php

@@ -6,7 +6,7 @@
  *
  * @package   Modules/tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */
@@ -20,7 +20,7 @@ namespace tests;
  * Autoloader class.
  *
  * @package tests
- * @license OMS License 1.0
+ * @license OMS License 2.0
  * @link    https://jingga.app
  * @since   1.0.0
  */

tests/Controller/Api/ApiControllerAttributeTrait.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Controller/Api/ApiControllerClientTrait.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Controller/ApiControllerTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/ClientAttributeTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/ClientAttributeTypeTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/ClientAttributeValueTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/ClientMapperTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/ClientTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/NullClientAttributeTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/NullClientAttributeTypeTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/NullClientAttributeValueTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */

tests/Models/NullClientTest.php

@@ -6,7 +6,7 @@
  *
  * @package   tests
  * @copyright Dennis Eichhorn
- * @license   OMS License 1.0
+ * @license   OMS License 2.0
  * @version   1.0.0
  * @link      https://jingga.app
  */