Jingga/oms-SupplierManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-SupplierManagement.git synced 2026-02-08 13:18:40 +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 095369dfec
commit 8007a63c3d
8 changed files with 33 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Controller/ApiController.php
View File

@ -23,20 +23,19 @@ use Modules\Attribute\Models\NullAttributeType;
use Modules\Attribute\Models\NullAttributeValue;
use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\PathSettings;
use Modules\SupplierManagement\Models\NullSupplierL11nType;
use Modules\SupplierManagement\Models\Supplier;
use Modules\SupplierManagement\Models\SupplierAttributeMapper;
use Modules\SupplierManagement\Models\SupplierAttributeTypeL11nMapper;
use Modules\SupplierManagement\Models\SupplierAttributeTypeMapper;
use Modules\SupplierManagement\Models\SupplierAttributeValueL11nMapper;
use Modules\SupplierManagement\Models\SupplierAttributeValueMapper;
use Modules\SupplierManagement\Models\SupplierL11n;
use Modules\SupplierManagement\Models\SupplierL11nMapper;
use Modules\SupplierManagement\Models\SupplierL11nType;
use Modules\SupplierManagement\Models\SupplierL11nTypeMapper;
use Modules\SupplierManagement\Models\SupplierMapper;
use phpOMS\Localization\BaseStringL11n;
use phpOMS\Localization\BaseStringL11nType;
use phpOMS\Localization\ISO639x1Enum;
use phpOMS\Localization\NullBaseStringL11nType;
use phpOMS\Message\Http\RequestStatusCode;
use phpOMS\Message\NotificationLevel;
use phpOMS\Message\RequestAbstract;
@ -165,19 +164,19 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
*
* @return SupplierL11n
* @return BaseStringL11n
*
* @since 1.0.0
*/
private function createSupplierL11nFromRequest(RequestAbstract $request) : SupplierL11n
private function createSupplierL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$supplierL11n = new SupplierL11n();
$supplierL11n->supplier = $request->getDataInt('supplier') ?? 0;
$supplierL11n->type = new NullSupplierL11nType($request->getDataInt('type') ?? 0);
$supplierL11n = new BaseStringL11n();
$supplierL11n->ref = $request->getDataInt('supplier') ?? 0;
$supplierL11n->type = new NullBaseStringL11nType($request->getDataInt('type') ?? 0);
$supplierL11n->setLanguage(
$request->getDataString('language') ?? $request->getLanguage()
);
$supplierL11n->description = $request->getDataString('description') ?? '';
$supplierL11n->content = $request->getDataString('description') ?? '';
return $supplierL11n;
}
@ -236,13 +235,13 @@ final class ApiController extends Controller
*
* @param RequestAbstract $request Request
*
* @return SupplierL11nType
* @return BaseStringL11nType
*
* @since 1.0.0
*/
private function createSupplierL11nTypeFromRequest(RequestAbstract $request) : SupplierL11nType
private function createSupplierL11nTypeFromRequest(RequestAbstract $request) : BaseStringL11nType
{
$supplierL11nType = new SupplierL11nType();
$supplierL11nType = new BaseStringL11nType();
$supplierL11nType->title = $request->getDataString('title') ?? '';
$supplierL11nType->isRequired = (bool) ($request->getData('is_required') ?? false);

47
Models/NullSupplierL11n.php
View File

@ -1,47 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\SupplierManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\SupplierManagement\Models;
/**
* Null model
*
* @package Modules\SupplierManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
final class NullSupplierL11n extends SupplierL11n
{
/**
* 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/NullSupplierL11nType.php
View File

@ -1,46 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\SupplierManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\SupplierManagement\Models;
/**
* Null model
*
* @package Modules\SupplierManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
final class NullSupplierL11nType extends SupplierL11nType
{
/**
* 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];
}
}

2
Models/Supplier.php
View File

@ -18,8 +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\Media\Models\NullMedia;
use Modules\Payment\Models\Payment;
use Modules\Profile\Models\ContactElement;
use Modules\Profile\Models\NullContactElement;

143
Models/SupplierL11n.php
View File

@ -1,143 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\SupplierManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\SupplierManagement\Models;
use phpOMS\Localization\ISO639x1Enum;
/**
* Localization of the supplier class.
*
* @package Modules\SupplierManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
class SupplierL11n implements \JsonSerializable
{
/**
* Article ID.
*
* @var int
* @since 1.0.0
*/
public int $id = 0;
/**
* Supplier ID.
*
* @var int
* @since 1.0.0
*/
public int $supplier = 0;
/**
* Supplier ID.
*
* @var SupplierL11nType
* @since 1.0.0
*/
public SupplierL11nType $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 SupplierL11nType $type Supplier localization type
* @param string $description Description/content
* @param string $language Language
*
* @since 1.0.0
*/
public function __construct(SupplierL11nType $type = null, string $description = '', string $language = ISO639x1Enum::_EN)
{
$this->type = $type ?? new SupplierL11nType();
$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,
'supplier' => $this->supplier,
'language' => $this->language,
];
}
/**
* {@inheritdoc}
*/
public function jsonSerialize() : mixed
{
return $this->toArray();
}
}

15
Models/SupplierL11nMapper.php
View File

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

93
Models/SupplierL11nType.php
View File

@ -1,93 +0,0 @@
<?php
/**
* Karaka
*
* PHP Version 8.1
*
* @package Modules\SupplierManagement\Models
* @copyright Dennis Eichhorn
* @license OMS License 2.0
* @version 1.0.0
* @link https://jingga.app
*/
declare(strict_types=1);
namespace Modules\SupplierManagement\Models;
/**
* Supplier class.
*
* @package Modules\SupplierManagement\Models
* @license OMS License 2.0
* @link https://jingga.app
* @since 1.0.0
*/
class SupplierL11nType 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/SupplierL11nTypeMapper.php
View File

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