diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 6117181..07f873d 100644 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -64,13 +64,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemCreate($request))) { $response->set('item_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $item = $this->createItemFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $item, ItemMapper::class, 'item', $request->getOrigin()); + $this->createModel($request->header->account, $item, ItemMapper::class, 'item', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Item', 'Item successfully created', $item); } @@ -86,7 +86,7 @@ final class ApiController extends Controller private function createItemFromRequest(RequestAbstract $request) : Item { $item = new Item(); - $item->setNumber($request->getData('number') ?? ''); + $item->number = $request->getData('number') ?? ''; return $item; } @@ -127,13 +127,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemAttributeCreate($request))) { $response->set('attribute_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $attribute = $this->createItemAttributeFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $attribute, ItemAttributeMapper::class, 'attribute', $request->getOrigin()); + $this->createModel($request->header->account, $attribute, ItemAttributeMapper::class, 'attribute', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Attribute', 'Attribute successfully created', $attribute); } @@ -195,13 +195,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemAttributeTypeL11nCreate($request))) { $response->set('attr_type_l11n_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $attrL11n = $this->createItemAttributeTypeL11nFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $attrL11n, ItemAttributeTypeL11nMapper::class, 'attr_type_l11n', $request->getOrigin()); + $this->createModel($request->header->account, $attrL11n, ItemAttributeTypeL11nMapper::class, 'attr_type_l11n', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Attribute type localization', 'Attribute type localization successfully created', $attrL11n); } @@ -221,7 +221,7 @@ final class ApiController extends Controller $attrL11n->setLanguage((string) ( $request->getData('language') ?? $request->getLanguage() )); - $attrL11n->setTitle((string) ($request->getData('title') ?? '')); + $attrL11n->title = (string) ($request->getData('title') ?? ''); return $attrL11n; } @@ -264,21 +264,21 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemAttributeTypeCreate($request))) { $response->set('attr_type_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $attrType = $this->createItemAttributeTypeFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $attrType, ItemAttributeTypeMapper::class, 'attr_type', $request->getOrigin()); + $this->createModel($request->header->account, $attrType, ItemAttributeTypeMapper::class, 'attr_type', $request->getOrigin()); - $l11nRequest = new HttpRequest($request->getUri()); + $l11nRequest = new HttpRequest($request->uri); $l11nRequest->setData('type', $attrType->getId()); $l11nRequest->setData('title', $request->getData('title')); $l11nRequest->setData('language', $request->getData('language')); $l11nAttributeType = $this->createItemAttributeTypeL11nFromRequest($l11nRequest); - $this->createModel($request->getHeader()->getAccount(), $l11nAttributeType, ItemAttributeTypeL11nMapper::class, 'attr_type_l11n_create', $request->getOrigin()); + $this->createModel($request->header->account, $l11nAttributeType, ItemAttributeTypeL11nMapper::class, 'attr_type_l11n_create', $request->getOrigin()); $attrType->setL11n($l11nAttributeType); @@ -297,7 +297,7 @@ final class ApiController extends Controller private function createItemAttributeTypeFromRequest(RequestAbstract $request) : ItemAttributeType { $attrType = new ItemAttributeType(); - $attrType->setName((string) ($request->getData('name') ?? '')); + $attrType->setL11n((string) ($request->getData('name') ?? '')); $attrType->setFields((int) ($request->getData('fields') ?? 0)); $attrType->setCustom((bool) ($request->getData('custom') ?? false)); @@ -342,17 +342,17 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemAttributeValueCreate($request))) { $response->set('attr_value_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $attrValue = $this->createItemAttributeValueFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $attrValue, ItemAttributeValueMapper::class, 'attr_value', $request->getOrigin()); + $this->createModel($request->header->account, $attrValue, ItemAttributeValueMapper::class, 'attr_value', $request->getOrigin()); if ($attrValue->isDefault()) { $this->createModelRelation( - $request->getHeader()->getAccount(), + $request->header->account, (int) $request->getData('attributetype'), $attrValue->getId(), ItemAttributeTypeMapper::class, 'defaults', '', $request->getOrigin() @@ -394,7 +394,7 @@ final class ApiController extends Controller } if ($request->hasData('country')) { - $attrValue->setCountry((string) ($request->getData('country') ?? $request->getHeader()->getL11n()->getCountry())); + $attrValue->setCountry((string) ($request->getData('country') ?? $request->header->l11n->getCountry())); } return $attrValue; @@ -438,13 +438,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemL11nTypeCreate($request))) { $response->set('item_l11n_type_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $itemL11nType = $this->createItemL11nTypeFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $itemL11nType, ItemL11nTypeMapper::class, 'item_l11n_type', $request->getOrigin()); + $this->createModel($request->header->account, $itemL11nType, ItemL11nTypeMapper::class, 'item_l11n_type', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Item localization type', 'Item localization type successfully created', $itemL11nType); } @@ -460,7 +460,7 @@ final class ApiController extends Controller private function createItemL11nTypeFromRequest(RequestAbstract $request) : ItemL11nType { $itemL11nType = new ItemL11nType(); - $itemL11nType->setTitle((string) ($request->getData('title') ?? '')); + $itemL11nType->title = (string) ($request->getData('title') ?? ''); return $itemL11nType; } @@ -501,13 +501,13 @@ final class ApiController extends Controller { if (!empty($val = $this->validateItemL11nCreate($request))) { $response->set('item_l11n_create', new FormValidation($val)); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } $itemL11n = $this->createItemL11nFromRequest($request); - $this->createModel($request->getHeader()->getAccount(), $itemL11n, ItemL11nMapper::class, 'item_l11n', $request->getOrigin()); + $this->createModel($request->header->account, $itemL11n, ItemL11nMapper::class, 'item_l11n', $request->getOrigin()); $this->fillJsonResponse($request, $response, NotificationLevel::OK, 'Item localization', 'Item localization successfully created', $itemL11n); } @@ -528,7 +528,7 @@ final class ApiController extends Controller $itemL11n->setLanguage((string) ( $request->getData('language') ?? $request->getLanguage() )); - $itemL11n->setDescription((string) ($request->getData('description') ?? '')); + $itemL11n->description = (string) ($request->getData('description') ?? ''); return $itemL11n; } @@ -574,7 +574,7 @@ final class ApiController extends Controller if (empty($uploadedFiles)) { $this->fillJsonResponse($request, $response, NotificationLevel::ERROR, 'Item', 'Invalid item image', $uploadedFiles); - $response->getHeader()->setStatusCode(RequestStatusCode::R_400); + $response->header->status = RequestStatusCode::R_400; return; } @@ -582,7 +582,7 @@ final class ApiController extends Controller $uploaded = $this->app->moduleManager->get('Media')->uploadFiles( $request->getData('name') ?? '', $uploadedFiles, - $request->getHeader()->getAccount(), + $request->header->account, 'Modules/Media/Files/Modules/ItemManagement/' . ($request->getData('item') ?? '0'), '/Modules/ItemManagement/' . ($request->getData('item') ?? '0'), $request->getData('type') ?? '', @@ -592,7 +592,7 @@ final class ApiController extends Controller ); $this->createModelRelation( - $request->getHeader()->getAccount(), + $request->header->account, (int) $request->getData('item'), \reset($uploaded)->getId(), ItemMapper::class, 'files', '', $request->getOrigin() diff --git a/Models/Item.php b/Models/Item.php index e0d1450..df3823f 100644 --- a/Models/Item.php +++ b/Models/Item.php @@ -41,7 +41,7 @@ class Item * @var string * @since 1.0.0 */ - private string $number = ''; + public string $number = ''; private $successor = 0; @@ -83,7 +83,7 @@ class Item * @var \DateTimeImmutable * @since 1.0.0 */ - private \DateTimeImmutable $createdAt; + public \DateTimeImmutable $createdAt; private $info = ''; @@ -109,18 +109,6 @@ class Item return $this->id; } - /** - * Get created at date time - * - * @return \DateTimeImmutable - * - * @since 1.0.0 - */ - public function getCreatedAt() : \DateTimeImmutable - { - return $this->createdAt; - } - /** * Set the successor item * @@ -145,32 +133,6 @@ class Item return $this->successor; } - /** - * Get the item number - * - * @return string - * - * @since 1.0.0 - */ - public function getNumber() : string - { - return $this->number; - } - - /** - * Set the item number - * - * @param string $number Number - * - * @return void - * - * @since 1.0.0 - */ - public function setNumber(string $number) : void - { - $this->number = $number; - } - /** * Add item l11n * @@ -197,7 +159,7 @@ class Item public function getL11n(string $type) : ItemL11n { foreach ($this->l11n as $l11n) { - if ($l11n->getType()->getTitle() === $type) { + if ($l11n->getType()->title === $type) { return $l11n; } } @@ -231,7 +193,7 @@ class Item public function getFileByType(string $type) : Media { foreach ($this->files as $file) { - if ($file->getType() === $type) { + if ($file->type === $type) { return $file; } } @@ -252,7 +214,7 @@ class Item { $files = []; foreach ($this->files as $file) { - if ($file->getType() === $type) { + if ($file->type === $type) { $files[] = $file; } } diff --git a/Models/ItemAttributeType.php b/Models/ItemAttributeType.php index 59878fc..d144e47 100644 --- a/Models/ItemAttributeType.php +++ b/Models/ItemAttributeType.php @@ -82,7 +82,7 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface */ public function __construct(string $name = '') { - $this->name = $name; + $this->setL11n($name); } /** @@ -97,20 +97,6 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface return $this->id; } - /** - * Set name - * - * @param string $name Name - * - * @return void - * - * @since 1.0.0 - */ - public function setName(string $name) : void - { - $this->name = $name; - } - /** * Set l11n * @@ -126,10 +112,10 @@ class ItemAttributeType implements \JsonSerializable, ArrayableInterface if ($l11n instanceof ItemAttributeTypeL11n) { $this->l11n = $l11n; } elseif ($this->l11n instanceof ItemAttributeTypeL11n && \is_string($l11n)) { - $this->l11n->setl11n($l11n); + $this->l11n->title = $l11n; } elseif (\is_string($l11n)) { $this->l11n = new ItemAttributeTypeL11n(); - $this->l11n->setl11n($l11n); + $this->l11n->title = $l11n; $this->l11n->setLanguage($lang); } } diff --git a/Models/ItemAttributeTypeL11n.php b/Models/ItemAttributeTypeL11n.php index 28ff05b..d498251 100644 --- a/Models/ItemAttributeTypeL11n.php +++ b/Models/ItemAttributeTypeL11n.php @@ -57,7 +57,7 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface * @var string * @since 1.0.0 */ - private string $title = ''; + public string $title = ''; /** * Constructor. @@ -99,18 +99,6 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface return $this->type; } - /** - * Get attribute title - * - * @return string - * - * @since 1.0.0 - */ - public function getTitle() : string - { - return $this->title; - } - /** * Set type. * @@ -139,20 +127,6 @@ class ItemAttributeTypeL11n implements \JsonSerializable, ArrayableInterface $this->language = $language; } - /** - * Set title - * - * @param string $title Title - * - * @return void - * - * @since 1.0.0 - */ - public function setTitle(string $title) : void - { - $this->title = $title; - } - /** * {@inheritdoc} */ diff --git a/Models/ItemL11n.php b/Models/ItemL11n.php index 956f881..e42c36b 100644 --- a/Models/ItemL11n.php +++ b/Models/ItemL11n.php @@ -65,7 +65,7 @@ class ItemL11n implements \JsonSerializable, ArrayableInterface * @var string * @since 1.0.0 */ - private string $description = ''; + public string $description = ''; /** * Constructor. @@ -173,32 +173,6 @@ class ItemL11n implements \JsonSerializable, ArrayableInterface $this->language = $language; } - /** - * Get item description. - * - * @return string - * - * @since 1.0.0 - */ - public function getDescription() : string - { - return $this->description; - } - - /** - * Set description - * - * @param string $description Description - * - * @return void - * - * @since 1.0.0 - */ - public function setDescription(string $description) : void - { - $this->description = $description; - } - /** * {@inheritdoc} */ diff --git a/Models/ItemL11nType.php b/Models/ItemL11nType.php index 6a8f7cf..8f21211 100644 --- a/Models/ItemL11nType.php +++ b/Models/ItemL11nType.php @@ -40,7 +40,7 @@ class ItemL11nType implements \JsonSerializable, ArrayableInterface * @var string * @since 1.0.0 */ - protected string $title = ''; + public string $title = ''; /** * Constructor. @@ -66,32 +66,6 @@ class ItemL11nType implements \JsonSerializable, ArrayableInterface return $this->id; } - /** - * Get title - * - * @return string - * - * @since 1.0.0 - */ - public function getTitle() : string - { - return $this->title; - } - - /** - * Set title - * - * @param string $title title - * - * @return void - * - * @since 1.0.0 - */ - public function setTitle(string $title) : void - { - $this->title = $title; - } - /** * {@inheritdoc} */ diff --git a/Theme/Backend/item-create.tpl.php b/Theme/Backend/item-create.tpl.php index ceaa381..2ef27c0 100644 --- a/Theme/Backend/item-create.tpl.php +++ b/Theme/Backend/item-create.tpl.php @@ -37,7 +37,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
@@ -93,7 +93,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-2' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-2' ? ' checked' : ''; ?>>

getHtml('Property'); ?>

@@ -211,7 +211,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-4' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-4' ? ' checked' : ''; ?>>

getHtml('Sales'); ?>

@@ -289,7 +289,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-5' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-5' ? ' checked' : ''; ?>>

getHtml('Purchase'); ?>

@@ -388,7 +388,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-6' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-6' ? ' checked' : ''; ?>>

getHtml('Accounting'); ?>

@@ -409,7 +409,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-7' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-7' ? ' checked' : ''; ?>>

getHtml('Production'); ?>

@@ -439,7 +439,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-8' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-8' ? ' checked' : ''; ?>>

getHtml('StockList'); ?>

@@ -457,7 +457,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-9' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-9' ? ' checked' : ''; ?>>

getHtml('QM'); ?>

@@ -470,7 +470,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-10' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-10' ? ' checked' : ''; ?>>

getHtml('Packaging'); ?>

@@ -502,7 +502,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-11' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-11' ? ' checked' : ''; ?>>

getHtml('Media'); ?>

@@ -518,7 +518,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-12' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-12' ? ' checked' : ''; ?>>

getHtml('Stock'); ?>

@@ -555,7 +555,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-13' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-13' ? ' checked' : ''; ?>>

getHtml('Disposal'); ?>

@@ -568,7 +568,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-14' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-14' ? ' checked' : ''; ?>>

getHtml('Files'); ?>

@@ -584,7 +584,7 @@ echo $this->getData('nav')->render(); ?>
- request->getUri()->getFragment() === 'c-tab-15' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-15' ? ' checked' : ''; ?>>
l11nManager, $this->request, $this->response); @@ -608,8 +608,8 @@ echo $this->getData('nav')->render(); ?> printHtml($this->request->getOrigin()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> + printHtml($this->request->header->account); ?> + printHtml($this->request->header->account); ?> Creating item printHtml((new \DateTime('now'))->format('Y-m-d H:i:s')); ?> diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php index b80f0ce..74e7446 100644 --- a/Theme/Backend/sales-item-list.tpl.php +++ b/Theme/Backend/sales-item-list.tpl.php @@ -62,10 +62,10 @@ echo $this->getData('nav')->render(); ?> src="getPath()); ?>"> - printHtml($value->getNumber()); ?> - printHtml($value->getL11n('name1')->getDescription()); ?> - printHtml($value->getL11n('name2')->getDescription()); ?> - printHtml($value->getL11n('name3')->getDescription()); ?> + printHtml($value->number); ?> + printHtml($value->getL11n('name1')->description); ?> + printHtml($value->getL11n('name2')->description); ?> + printHtml($value->getL11n('name3')->description); ?> diff --git a/Theme/Backend/sales-item-profile.tpl.php b/Theme/Backend/sales-item-profile.tpl.php index 2e4cfe2..6649b87 100644 --- a/Theme/Backend/sales-item-profile.tpl.php +++ b/Theme/Backend/sales-item-profile.tpl.php @@ -47,7 +47,7 @@ echo $this->getData('nav')->render();
- request->getUri()->getFragment() === 'c-tab-1' ? ' checked' : ''; ?>> + request->uri->fragment === 'c-tab-1' ? ' checked' : ''; ?>>
@@ -56,13 +56,13 @@ echo $this->getData('nav')->render();
-
+
-
+
-
+
-
+
@@ -258,7 +258,7 @@ echo $this->getData('nav')->render(); printHtml($value->getId()); ?> - printHtml($value->getName()); ?> + printHtml($value->name); ?> @@ -335,7 +335,7 @@ echo $this->getData('nav')->render(); printHtml($value->getId()); ?> - printHtml($value->getName()); ?> + printHtml($value->name); ?> @@ -414,7 +414,7 @@ echo $this->getData('nav')->render(); printHtml($value->getId()); ?> - printHtml($value->getName()); ?> + printHtml($value->name); ?> @@ -544,7 +544,7 @@ echo $this->getData('nav')->render(); printHtml($value->getId()); ?> - printHtml($value->getName()); ?> + printHtml($value->name); ?> @@ -712,8 +712,8 @@ echo $this->getData('nav')->render(); printHtml($this->request->getOrigin()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> - printHtml($this->request->getHeader()->getAccount()); ?> + printHtml($this->request->header->account); ?> + printHtml($this->request->header->account); ?> Creating item printHtml((new \DateTime('now'))->format('Y-m-d H:i:s')); ?> diff --git a/Theme/Backend/stock-list.tpl.php b/Theme/Backend/stock-list.tpl.php index 1b14c76..c700b34 100644 --- a/Theme/Backend/stock-list.tpl.php +++ b/Theme/Backend/stock-list.tpl.php @@ -42,8 +42,8 @@ echo $this->getData('nav')->render(); ?> $url = \phpOMS\Uri\UriFactory::build('{/prefix}business/department/profile?{?}&id=' . $value->getId()); ?> printHtml($value->getId()); ?> - printHtml($value->getName()); ?> - printHtml($value->getParent()); ?> + printHtml($value->name); ?> + printHtml($value->parent); ?> printHtml($value->getUnit()); ?> diff --git a/tests/Models/ItemMapperTest.php b/tests/Models/ItemMapperTest.php index c838be9..8b1905b 100644 --- a/tests/Models/ItemMapperTest.php +++ b/tests/Models/ItemMapperTest.php @@ -29,7 +29,7 @@ class ItemMapperTest extends \PHPUnit\Framework\TestCase public function testCR() : void { $item = new Item(); - $item->setNumber('123456789'); + $item->number = '123456789'; $id = ItemMapper::create($item); self::assertGreaterThan(0, $item->getId()); @@ -45,7 +45,7 @@ class ItemMapperTest extends \PHPUnit\Framework\TestCase { for ($i = 0; $i < 100; ++$i) { $item = new Item(); - $item->setNumber((string) \mt_rand(100000, 999999)); + $item->number = (string) \mt_rand(100000, 999999); ItemMapper::create($item); }