From 8007a63c3d01be9168c8d86fc620ad08d8762541 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Tue, 9 May 2023 16:07:43 +0000 Subject: [PATCH] fixes --- Controller/ApiController.php | 23 +++-- Models/NullSupplierL11n.php | 47 ---------- Models/NullSupplierL11nType.php | 46 ---------- Models/Supplier.php | 2 - Models/SupplierL11n.php | 143 ------------------------------ Models/SupplierL11nMapper.php | 15 +++- Models/SupplierL11nType.php | 93 ------------------- Models/SupplierL11nTypeMapper.php | 11 ++- 8 files changed, 33 insertions(+), 347 deletions(-) delete mode 100755 Models/NullSupplierL11n.php delete mode 100755 Models/NullSupplierL11nType.php delete mode 100755 Models/SupplierL11n.php delete mode 100755 Models/SupplierL11nType.php diff --git a/Controller/ApiController.php b/Controller/ApiController.php index ec41b73..4663dcb 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -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); diff --git a/Models/NullSupplierL11n.php b/Models/NullSupplierL11n.php deleted file mode 100755 index 0ce6261..0000000 --- a/Models/NullSupplierL11n.php +++ /dev/null @@ -1,47 +0,0 @@ -id = $id; - parent::__construct(); - } - - /** - * {@inheritdoc} - */ - public function jsonSerialize() : mixed - { - return ['id' => $this->id]; - } -} diff --git a/Models/NullSupplierL11nType.php b/Models/NullSupplierL11nType.php deleted file mode 100755 index b083c51..0000000 --- a/Models/NullSupplierL11nType.php +++ /dev/null @@ -1,46 +0,0 @@ -id = $id; - } - - /** - * {@inheritdoc} - */ - public function jsonSerialize() : mixed - { - return ['id' => $this->id]; - } -} diff --git a/Models/Supplier.php b/Models/Supplier.php index 48c04e4..0722931 100755 --- a/Models/Supplier.php +++ b/Models/Supplier.php @@ -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; diff --git a/Models/SupplierL11n.php b/Models/SupplierL11n.php deleted file mode 100755 index d431874..0000000 --- a/Models/SupplierL11n.php +++ /dev/null @@ -1,143 +0,0 @@ -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(); - } -} diff --git a/Models/SupplierL11nMapper.php b/Models/SupplierL11nMapper.php index b13e835..060b2cf 100755 --- a/Models/SupplierL11nMapper.php +++ b/Models/SupplierL11nMapper.php @@ -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 */ 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 + * @since 1.0.0 + */ + public const MODEL = BaseStringL11n::class; } diff --git a/Models/SupplierL11nType.php b/Models/SupplierL11nType.php deleted file mode 100755 index 7a43861..0000000 --- a/Models/SupplierL11nType.php +++ /dev/null @@ -1,93 +0,0 @@ -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(); - } -} diff --git a/Models/SupplierL11nTypeMapper.php b/Models/SupplierL11nTypeMapper.php index dcd7fff..0f69254 100755 --- a/Models/SupplierL11nTypeMapper.php +++ b/Models/SupplierL11nTypeMapper.php @@ -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 */ 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 + * @since 1.0.0 + */ + public const MODEL = BaseStringL11nType::class; }