Jingga/oms-ClientManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-ClientManagement.git synced 2026-01-25 22:28:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-05-09 16:07:43 +00:00
parent b1aed5cbda
commit 993b066638
8 changed files with 33 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Controller/ApiController.php
View File

@ -31,21 +31,19 @@ use Modules\ClientManagement\Models\ClientAttributeTypeL11nMapper;
use Modules\ClientManagement\Models\ClientAttributeTypeMapper;
use Modules\ClientManagement\Models\ClientAttributeValueL11nMapper;
use Modules\ClientManagement\Models\ClientAttributeValueMapper;
use Modules\ClientManagement\Models\ClientL11n;
use Modules\ClientManagement\Models\ClientL11nMapper;
use Modules\ClientManagement\Models\ClientL11nType;
use Modules\ClientManagement\Models\ClientL11nTypeMapper;
use Modules\ClientManagement\Models\ClientMapper;
use Modules\ClientManagement\Models\NullClient;
use Modules\ClientManagement\Models\NullClientL11nType;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\PathSettings;
use Modules\Organization\Models\UnitMapper;
use phpOMS\Api\EUVAT\EUVATVies;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\BaseStringL11nType;
use phpOMS\Localization\ISO3166CharEnum;
use phpOMS\Localization\ISO3166TwoEnum;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\NullBaseStringL11nType;
use phpOMS\Message\Http\HttpRequest;
use phpOMS\Message\Http\HttpResponse;
use phpOMS\Message\Http\RequestStatusCode;
@ -385,19 +383,19 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
*
* @return ClientL11n
* @return BaseStringL11n
*
* @since 1.0.0
*/
private function createClientL11nFromRequest(RequestAbstract $request) : ClientL11n
private function createClientL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$clientL11n = new ClientL11n();
$clientL11n->client = $request->getDataInt('client') ?? 0;
$clientL11n->type = new NullClientL11nType($request->getDataInt('type') ?? 0);
$clientL11n = new BaseStringL11n();
$clientL11n->ref = $request->getDataInt('client') ?? 0;
$clientL11n->type = new NullBaseStringL11nType($request->getDataInt('type') ?? 0);
$clientL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
);
$clientL11n->description = $request->getDataString('description') ?? '';
$clientL11n->content = $request->getDataString('description') ?? '';
return $clientL11n;
}
@ -456,13 +454,13 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
*
* @return ClientL11nType
* @return BaseStringL11nType
*
* @since 1.0.0
*/
private function createClientL11nTypeFromRequest(RequestAbstract $request) : ClientL11nType
private function createClientL11nTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
{
$clientL11nType = new ClientL11nType();
$clientL11nType = new BaseStringL11nType();
$clientL11nType->title = $request->getDataString('title') ?? '';
$clientL11nType->isRequired = (bool) ($request->getData('is_required') ?? false);

1
Models/Client.php
View File

@ -18,7 +18,6 @@ use Modules\Admin\Models\Account;
use Modules\Admin\Models\Address;
use Modules\Admin\Models\NullAddress;
use Modules\Editor\Models\EditorDoc;
use Modules\Media\Models\Media;
use Modules\Payment\Models\Payment;
use Modules\Profile\Models\ContactElement;
use Modules\Profile\Models\NullContactElement;

143
Models/ClientL11n.php
View File

@ -1,143 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\ClientManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\ClientManagement\Models;
use phpOMS\Localization\ISO639x1Enum;
/**
* Localization of the client class.
*
* @package Modules\ClientManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
class ClientL11n implements \JsonSerializable
{
/**
* Article ID.
*
* @var int
* @since 1.0.0
*/
public int $id = 0;
/**
* Client ID.
*
* @var int
* @since 1.0.0
*/
public int $client = 0;
/**
* Client ID.
*
* @var ClientL11nType
* @since 1.0.0
*/
public ClientL11nType $type;
/**
* Language.
*
* @var string
* @since 1.0.0
*/
protected string $language = ISO639x1Enum::_EN;
/**
* Title.
*
* @var string
* @since 1.0.0
*/
public string $description = '';
/**
* Constructor.
*
* @param ClientL11nType $type Client localization type
* @param string $description Description/content
* @param string $language Language
*
* @since 1.0.0
*/
public function __construct(ClientL11nType $type = null, string $description = '', string $language = ISO639x1Enum::_EN)
{
$this->type = $type ?? new ClientL11nType();
$this->description = $description;
$this->language = $language;
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* Get language
*
* @return string
*
* @since 1.0.0
*/
public function getLanguage() : string
{
return $this->language;
}
/**
* Set language
*
* @param string $language Language
*
* @return void
*
* @since 1.0.0
*/
public function setLanguage(string $language) : void
{
$this->language = $language;
}
/**
* {@inheritdoc}
*/
public function toArray() : array
{
return [
'id' => $this->id,
'description' => $this->description,
'client' => $this->client,
'language' => $this->language,
];
}
/**
* {@inheritdoc}
*/
public function jsonSerialize() : mixed
{
return $this->toArray();
}
}

15
Models/ClientL11nMapper.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace Modules\ClientManagement\Models;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\Localization\BaseStringL11n;
/**
* Client mapper class.
@ -24,7 +25,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
* @link https://jingga.app
* @since 1.0.0
*
* @template T of ClientL11n
* @template T of BaseStringL11n
* @extends DataMapperFactory<T>
*/
final class ClientL11nMapper extends DataMapperFactory
@ -37,8 +38,8 @@ final class ClientL11nMapper extends DataMapperFactory
*/
public const COLUMNS = [
'clientmgmt_client_l11n_id' => ['name' => 'clientmgmt_client_l11n_id', 'type' => 'int', 'internal' => 'id'],
'clientmgmt_client_l11n_description' => ['name' => 'clientmgmt_client_l11n_description', 'type' => 'string', 'internal' => 'description', 'autocomplete' => true],
'clientmgmt_client_l11n_client' => ['name' => 'clientmgmt_client_l11n_client', 'type' => 'int', 'internal' => 'client'],
'clientmgmt_client_l11n_description' => ['name' => 'clientmgmt_client_l11n_description', 'type' => 'string', 'internal' => 'content', 'autocomplete' => true],
'clientmgmt_client_l11n_client' => ['name' => 'clientmgmt_client_l11n_client', 'type' => 'int', 'internal' => 'ref'],
'clientmgmt_client_l11n_lang' => ['name' => 'clientmgmt_client_l11n_lang', 'type' => 'string', 'internal' => 'language'],
'clientmgmt_client_l11n_typeref' => ['name' => 'clientmgmt_client_l11n_typeref', 'type' => 'int', 'internal' => 'type'],
];
@ -71,4 +72,12 @@ final class ClientL11nMapper extends DataMapperFactory
* @since 1.0.0
*/
public const PRIMARYFIELD = 'clientmgmt_client_l11n_id';
/**
* Model to use by the mapper.
*
* @var class-string<T>
* @since 1.0.0
*/
public const MODEL = BaseStringL11n::class;
}

93
Models/ClientL11nType.php
View File

@ -1,93 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\ClientManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\ClientManagement\Models;
/**
* Client class.
*
* @package Modules\ClientManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
class ClientL11nType implements \JsonSerializable
{
/**
* Article ID.
*
* @var int
* @since 1.0.0
*/
public int $id = 0;
/**
* Identifier for the l11n type.
*
* @var string
* @since 1.0.0
*/
public string $title = '';
/**
* Is the l11n type required for an item?
*
* @var bool
* @since 1.0.0
*/
public bool $isRequired = false;
/**
* Constructor.
*
* @param string $title Title
*
* @since 1.0.0
*/
public function __construct(string $title = '')
{
$this->title = $title;
}
/**
* Get id
*
* @return int
*
* @since 1.0.0
*/
public function getId() : int
{
return $this->id;
}
/**
* {@inheritdoc}
*/
public function toArray() : array
{
return [
'id' => $this->id,
'title' => $this->title,
];
}
/**
* {@inheritdoc}
*/
public function jsonSerialize() : mixed
{
return $this->toArray();
}
}

11
Models/ClientL11nTypeMapper.php
View File

@ -15,6 +15,7 @@ declare(strict_types=1);
namespace Modules\ClientManagement\Models;
use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
use phpOMS\Localization\BaseStringL11nType;
/**
* Client mapper class.
@ -24,7 +25,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory;
* @link https://jingga.app
* @since 1.0.0
*
* @template T of ClientL11nType
* @template T of BaseStringL11nType
* @extends DataMapperFactory<T>
*/
final class ClientL11nTypeMapper extends DataMapperFactory
@ -56,4 +57,12 @@ final class ClientL11nTypeMapper extends DataMapperFactory
* @since 1.0.0
*/
public const PRIMARYFIELD = 'clientmgmt_client_l11n_type_id';
/**
* Model to use by the mapper.
*
* @var class-string<T>
* @since 1.0.0
*/
public const MODEL = BaseStringL11nType::class;
}

47
Models/NullClientL11n.php
View File

@ -1,47 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\ClientManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\ClientManagement\Models;
/**
* Null model
*
* @package Modules\ClientManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
final class NullClientL11n extends ClientL11n
{
/**
* Constructor
*
* @param int $id Model id
*
* @since 1.0.0
*/
public function __construct(int $id = 0)
{
$this->id = $id;
parent::__construct();
}
/**
* {@inheritdoc}
*/
public function jsonSerialize() : mixed
{
return ['id' => $this->id];
}
}

46
Models/NullClientL11nType.php
View File

@ -1,46 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\ClientManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\ClientManagement\Models;
/**
* Null model
*
* @package Modules\ClientManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
final class NullClientL11nType extends ClientL11nType
{
/**
* Constructor
*
* @param int $id Model id
*
* @since 1.0.0
*/
public function __construct(int $id = 0)
{
$this->id = $id;
}
/**
* {@inheritdoc}
*/
public function jsonSerialize() : mixed
{
return ['id' => $this->id];
}
}