From d796969c8c504d53f2daa18c1a93176de2d74add Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:22 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Media.php | 4 +- Admin/Install/Navigation.install.json | 50 ++++---- Admin/Install/Navigation.php | 4 +- Admin/Installer.php | 8 +- Admin/Routes/Web/Api.php | 2 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 +- Admin/Uninstaller.php | 4 +- Admin/Updater.php | 4 +- Controller/ApiController.php | 114 +++++++++--------- Controller/BackendController.php | 4 +- Controller/Controller.php | 4 +- Models/AttributeValueType.php | 4 +- Models/Item.php | 4 +- Models/ItemAttribute.php | 4 +- Models/ItemAttributeMapper.php | 4 +- Models/ItemAttributeType.php | 6 +- Models/ItemAttributeTypeL11nMapper.php | 4 +- Models/ItemAttributeTypeMapper.php | 4 +- Models/ItemAttributeValue.php | 6 +- Models/ItemAttributeValueL11nMapper.php | 4 +- Models/ItemAttributeValueMapper.php | 4 +- Models/ItemL11n.php | 4 +- Models/ItemL11nMapper.php | 4 +- Models/ItemL11nType.php | 4 +- Models/ItemL11nTypeMapper.php | 4 +- Models/ItemMapper.php | 4 +- Models/ItemPrice.php | 4 +- Models/ItemPriceStatus.php | 4 +- Models/ItemRelation.php | 4 +- Models/ItemRelationMapper.php | 4 +- Models/ItemRelationType.php | 4 +- Models/ItemRelationTypeMapper.php | 4 +- Models/ItemStatus.php | 4 +- Models/NullItem.php | 4 +- Models/NullItemAttribute.php | 4 +- Models/NullItemAttributeType.php | 4 +- Models/NullItemAttributeValue.php | 4 +- Models/NullItemL11n.php | 4 +- Models/NullItemL11nType.php | 4 +- Models/NullItemRelation.php | 4 +- Models/NullItemRelationType.php | 4 +- Models/PermissionCategory.php | 4 +- Models/StockManagementType.php | 4 +- Theme/Backend/Lang/Navigation.ar.lang.php | 2 +- Theme/Backend/Lang/Navigation.cs.lang.php | 2 +- Theme/Backend/Lang/Navigation.da.lang.php | 2 +- Theme/Backend/Lang/Navigation.de.lang.php | 2 +- Theme/Backend/Lang/Navigation.el.lang.php | 2 +- Theme/Backend/Lang/Navigation.en.lang.php | 2 +- Theme/Backend/Lang/Navigation.es.lang.php | 2 +- Theme/Backend/Lang/Navigation.fi.lang.php | 2 +- Theme/Backend/Lang/Navigation.fr.lang.php | 2 +- Theme/Backend/Lang/Navigation.hu.lang.php | 2 +- Theme/Backend/Lang/Navigation.it.lang.php | 2 +- Theme/Backend/Lang/Navigation.ja.lang.php | 2 +- Theme/Backend/Lang/Navigation.ko.lang.php | 2 +- Theme/Backend/Lang/Navigation.no.lang.php | 2 +- Theme/Backend/Lang/Navigation.pl.lang.php | 2 +- Theme/Backend/Lang/Navigation.pt.lang.php | 2 +- Theme/Backend/Lang/Navigation.ru.lang.php | 2 +- Theme/Backend/Lang/Navigation.sv.lang.php | 2 +- Theme/Backend/Lang/Navigation.th.lang.php | 2 +- Theme/Backend/Lang/Navigation.tr.lang.php | 2 +- Theme/Backend/Lang/Navigation.uk.lang.php | 2 +- Theme/Backend/Lang/Navigation.zh.lang.php | 2 +- Theme/Backend/Lang/ar.lang.php | 2 +- Theme/Backend/Lang/cs.lang.php | 2 +- Theme/Backend/Lang/da.lang.php | 2 +- Theme/Backend/Lang/de.lang.php | 2 +- Theme/Backend/Lang/el.lang.php | 2 +- Theme/Backend/Lang/en.lang.php | 2 +- Theme/Backend/Lang/es.lang.php | 2 +- Theme/Backend/Lang/fi.lang.php | 2 +- Theme/Backend/Lang/fr.lang.php | 2 +- Theme/Backend/Lang/hu.lang.php | 2 +- Theme/Backend/Lang/it.lang.php | 2 +- Theme/Backend/Lang/ja.lang.php | 2 +- Theme/Backend/Lang/ko.lang.php | 2 +- Theme/Backend/Lang/no.lang.php | 2 +- Theme/Backend/Lang/pl.lang.php | 2 +- Theme/Backend/Lang/pt.lang.php | 2 +- Theme/Backend/Lang/ru.lang.php | 2 +- Theme/Backend/Lang/sv.lang.php | 2 +- Theme/Backend/Lang/th.lang.php | 2 +- Theme/Backend/Lang/tr.lang.php | 2 +- Theme/Backend/Lang/uk.lang.php | 2 +- Theme/Backend/Lang/zh.lang.php | 2 +- Theme/Backend/attribute-type-list.tpl.php | 4 +- Theme/Backend/item-analysis.tpl.php | 2 +- Theme/Backend/item-create.tpl.php | 2 +- Theme/Backend/item-list.tpl.php | 4 +- Theme/Backend/item-profile.tpl.php | 22 ++-- Theme/Backend/purchase-item-list.tpl.php | 6 +- Theme/Backend/sales-item-list.tpl.php | 6 +- Theme/Backend/sales-item-profile.tpl.php | 24 ++-- Theme/Backend/stock-item-list.tpl.php | 4 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- .../Api/ApiControllerAttributeTrait.php | 2 +- .../Controller/Api/ApiControllerItemTrait.php | 2 +- tests/Controller/ApiControllerTest.php | 2 +- tests/Models/ItemAttributeTest.php | 2 +- tests/Models/ItemAttributeTypeTest.php | 2 +- tests/Models/ItemAttributeValueTest.php | 2 +- tests/Models/ItemL11nTest.php | 2 +- tests/Models/ItemL11nTypeTest.php | 2 +- tests/Models/ItemMapperTest.php | 2 +- tests/Models/ItemTest.php | 2 +- tests/Models/NullItemAttributeTest.php | 2 +- tests/Models/NullItemAttributeTypeTest.php | 2 +- tests/Models/NullItemAttributeValueTest.php | 2 +- tests/Models/NullItemL11nTest.php | 2 +- tests/Models/NullItemL11nTypeTest.php | 2 +- tests/Models/NullItemTest.php | 2 +- 115 files changed, 267 insertions(+), 269 deletions(-) diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php index 9691808..fec6bf3 100755 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Install/Navigation.install.json b/Admin/Install/Navigation.install.json index cb23dac..4f35b9c 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -19,7 +19,7 @@ "type": 2, "subtype": 1, "name": "Attributes", - "uri": "{/lang}/{/app}/item/attribute/type/list?{?}", + "uri": "{/base}/item/attribute/type/list?{?}", "target": "self", "icon": null, "order": 5, @@ -33,7 +33,7 @@ "type": 3, "subtype": 1, "name": "Types", - "uri": "{/lang}/{/app}/item/attribute/type/list?{?}", + "uri": "{/base}/item/attribute/type/list?{?}", "target": "self", "icon": null, "order": 5, @@ -48,7 +48,7 @@ "type": 3, "subtype": 1, "name": "Values", - "uri": "{/lang}/{/app}/item/attribute/value/list?{?}", + "uri": "{/base}/item/attribute/value/list?{?}", "target": "self", "icon": null, "order": 10, @@ -65,7 +65,7 @@ "type": 2, "subtype": 1, "name": "Items", - "uri": "{/lang}/{/app}/item/list", + "uri": "{/base}/item/list", "target": "self", "icon": null, "order": 10, @@ -79,7 +79,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/item/list", + "uri": "{/base}/item/list", "target": "self", "icon": null, "order": 1, @@ -93,7 +93,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/item/profile?{?}", + "uri": "{/base}/item/profile?{?}", "target": "self", "icon": null, "order": 1, @@ -110,7 +110,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/item/create?{?}", + "uri": "{/base}/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -129,7 +129,7 @@ "type": 2, "subtype": 1, "name": "Items", - "uri": "{/lang}/{/app}/sales/item/list", + "uri": "{/base}/sales/item/list", "target": "self", "icon": null, "order": 10, @@ -143,7 +143,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/sales/item/list", + "uri": "{/base}/sales/item/list", "target": "self", "icon": null, "order": 1, @@ -157,7 +157,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/sales/item/single?{?}", + "uri": "{/base}/sales/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -174,7 +174,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/sales/item/create?{?}", + "uri": "{/base}/sales/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -191,7 +191,7 @@ "type": 2, "subtype": 1, "name": "Items", - "uri": "{/lang}/{/app}/purchase/item/list", + "uri": "{/base}/purchase/item/list", "target": "self", "icon": null, "order": 10, @@ -205,7 +205,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/purchase/item/list", + "uri": "{/base}/purchase/item/list", "target": "self", "icon": null, "order": 1, @@ -219,7 +219,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/purchase/item/single?{?}", + "uri": "{/base}/purchase/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -236,7 +236,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/purchase/item/create?{?}", + "uri": "{/base}/purchase/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -253,7 +253,7 @@ "type": 2, "subtype": 1, "name": "Items", - "uri": "{/lang}/{/app}/warehouse/item/list", + "uri": "{/base}/warehouse/item/list", "target": "self", "icon": null, "order": 10, @@ -267,7 +267,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/warehouse/item/list", + "uri": "{/base}/warehouse/item/list", "target": "self", "icon": null, "order": 1, @@ -281,7 +281,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/warehouse/item/single?{?}", + "uri": "{/base}/warehouse/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -298,7 +298,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/warehouse/item/create?{?}", + "uri": "{/base}/warehouse/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -315,7 +315,7 @@ "type": 2, "subtype": 1, "name": "Items", - "uri": "{/lang}/{/app}/production/item/list", + "uri": "{/base}/production/item/list", "target": "self", "icon": null, "order": 5, @@ -329,7 +329,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/production/item/list", + "uri": "{/base}/production/item/list", "target": "self", "icon": null, "order": 1, @@ -343,7 +343,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/production/item/single?{?}", + "uri": "{/base}/production/item/single?{?}", "target": "self", "icon": null, "order": 1, @@ -360,7 +360,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/production/item/create?{?}", + "uri": "{/base}/production/item/create?{?}", "target": "self", "icon": null, "order": 5, @@ -377,7 +377,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/sales/analysis/item", + "uri": "{/base}/sales/analysis/item", "target": "self", "icon": null, "order": 10, @@ -392,7 +392,7 @@ "type": 3, "subtype": 1, "name": "Item", - "uri": "{/lang}/{/app}/purchase/analysis/item", + "uri": "{/base}/purchase/analysis/item", "target": "self", "icon": null, "order": 10, diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 497406d..f0f7161 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Admin\Install - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Installer.php b/Admin/Installer.php index 8c57e20..1012664 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\Admin * @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 phpOMS\Uri\HttpUri; * Installer class. * * @package Modules\ItemManagement\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -56,6 +56,7 @@ final class Installer extends InstallerAbstract return; } + /** @var array $attributes */ $attributes = \json_decode($fileContent, true); $attrTypes = self::createItemAttributeTypes($app, $attributes); $attrValues = self::createItemAttributeValues($app, $attrTypes, $attributes); @@ -66,6 +67,7 @@ final class Installer extends InstallerAbstract return; } + /** @var array $localizations */ $localizations = \json_decode($fileContent, true); $l11nTypes = self::createItemL11nTypes($app, $localizations); @@ -75,6 +77,7 @@ final class Installer extends InstallerAbstract return; } + /** @var array $relations */ $relations = \json_decode($fileContent, true); $l11nTypes = self::createItemRelationTypes($app, $relations); @@ -84,6 +87,7 @@ final class Installer extends InstallerAbstract return; } + /** @var array $items */ $items = \json_decode($fileContent, true); $itemArray = self::createItems($app, $items); } diff --git a/Admin/Routes/Web/Api.php b/Admin/Routes/Web/Api.php index 2f40a0d..cbd57e6 100644 --- a/Admin/Routes/Web/Api.php +++ b/Admin/Routes/Web/Api.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 */ diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index d374f3e..5a5b8bd 100755 --- a/Admin/Routes/Web/Backend.php +++ b/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 */ diff --git a/Admin/Status.php b/Admin/Status.php index efce85f..46a421f 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Uninstaller.php b/Admin/Uninstaller.php index b465b35..b967cec 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Updater.php b/Admin/Updater.php index a38f233..5ccb15e 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Controller/ApiController.php b/Controller/ApiController.php index eb939b3..7fb6848 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.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 */ @@ -62,7 +62,7 @@ use phpOMS\Uri\HttpUri; * ItemManagement class. * * @package Modules\ItemManagement - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -87,7 +87,7 @@ final class ApiController extends Controller ->with('type') ->where('type/title', ['name1', 'name2', 'name3'], 'IN') ->where('language', $request->getLanguage()) - ->where('description', '%' . ($request->getData('search') ?? '') . '%', 'LIKE') + ->where('description', '%' . ($request->getDataString('search') ?? '') . '%', 'LIKE') ->execute(); $items = []; @@ -172,13 +172,13 @@ final class ApiController extends Controller if ($this->app->moduleManager->isActive('Billing')) { $billing = $this->app->moduleManager->get('Billing'); - $internalRequest = new HttpRequest(new HttpUri('')); + $internalRequest = new HttpRequest(new HttpUri('')); $internalResponse = new HttpResponse(); $internalRequest->header->account = $request->header->account; $internalRequest->setData('name', 'base_price'); $internalRequest->setData('item', $item->getId()); - $internalRequest->setData('price', $request->getData('salesprice', 'int') ?? 0); + $internalRequest->setData('price', $request->getDataInt('salesprice') ?? 0); $billing->apiPriceCreate($internalRequest, $internalResponse); } @@ -265,13 +265,13 @@ final class ApiController extends Controller private function createItemFromRequest(RequestAbstract $request) : Item { $item = new Item(); - $item->number = (string) ($request->getData('number') ?? ''); - $item->salesPrice = new Money($request->getData('salesprice', 'int') ?? 0); - $item->purchasePrice = new Money($request->getData('purchaseprice', 'int') ?? 0); - $item->info = (string) ($request->getData('info') ?? ''); - $item->parent = $request->getData('parent', 'int'); - $item->unit = $request->getData('unit', 'int'); - $item->setStatus((int) ($request->getData('status') ?? ItemStatus::ACTIVE)); + $item->number = $request->getDataString('number') ?? ''; + $item->salesPrice = new Money($request->getDataInt('salesprice') ?? 0); + $item->purchasePrice = new Money($request->getDataInt('purchaseprice') ?? 0); + $item->info = $request->getDataString('info') ?? ''; + $item->parent = $request->getDataInt('parent'); + $item->unit = $request->getDataInt('unit'); + $item->setStatus($request->getDataInt('status') ?? ItemStatus::ACTIVE); return $item; } @@ -334,24 +334,17 @@ final class ApiController extends Controller private function createItemPriceFromRequest(RequestAbstract $request) : ItemPrice { $item = new ItemPrice(); - $item->currency = (string) ($request->getData('currency') ?? ''); - $item->price = new Money($request->getData('price', 'int') ?? 0); - $item->minQuantity = (int) ($request->getData('minquantity') ?? 0); - $item->relativeDiscount = (int) ($request->getData('relativediscount') ?? 0); - $item->absoluteDiscount = (int) ($request->getData('absolutediscount') ?? 0); - $item->relativeUnitDiscount = (int) ($request->getData('relativeunitdiscount') ?? 0); - $item->absoluteUnitDiscount = (int) ($request->getData('absoluteunitdiscount') ?? 0); - $item->promocode = (string) ($request->getData('promocode') ?? ''); - - $item->setStatus((int) ($request->getData('status') ?? ItemPriceStatus::ACTIVE)); - - $item->start = ($request->getData('start') === null) - ? null - : new \DateTime($request->getData('start')); - - $item->end = ($request->getData('end') === null) - ? null - : new \DateTime($request->getData('end')); + $item->currency = $request->getDataString('currency') ?? ''; + $item->price = new Money($request->getDataInt('price') ?? 0); + $item->minQuantity = $request->getDataInt('minquantity') ?? 0; + $item->relativeDiscount = $request->getDataInt('relativediscount') ?? 0; + $item->absoluteDiscount = $request->getDataInt('absolutediscount') ?? 0; + $item->relativeUnitDiscount = $request->getDataInt('relativeunitdiscount') ?? 0; + $item->absoluteUnitDiscount = $request->getDataInt('absoluteunitdiscount') ?? 0; + $item->promocode = $request->getDataString('promocode') ?? ''; + $item->start = $request->getDataDateTime('start'); + $item->end = $request->getDataDateTime('end'); + $item->setStatus($request->getDataInt('status') ?? ItemPriceStatus::ACTIVE); return $item; } @@ -420,7 +413,7 @@ final class ApiController extends Controller $attribute->item = (int) $request->getData('item'); $attribute->type = new NullItemAttributeType((int) $request->getData('type')); - if ($request->getData('value') !== null) { + if ($request->hasData('value')) { $attribute->value = new NullItemAttributeValue((int) $request->getData('value')); } else { $newRequest = clone $request; @@ -495,11 +488,11 @@ final class ApiController extends Controller private function createItemAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $attrL11n = new BaseStringL11n(); - $attrL11n->ref = (int) ($request->getData('type') ?? 0); - $attrL11n->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); - $attrL11n->content = (string) ($request->getData('title') ?? ''); + $attrL11n->ref = $request->getDataInt('type') ?? 0; + $attrL11n->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); + $attrL11n->content = $request->getDataString('title') ?? ''; return $attrL11n; } @@ -564,13 +557,13 @@ final class ApiController extends Controller */ private function createItemAttributeTypeFromRequest(RequestAbstract $request) : ItemAttributeType { - $attrType = new ItemAttributeType($request->getData('name') ?? ''); - $attrType->datatype = (int) ($request->getData('datatype') ?? 0); - $attrType->custom = (bool) ($request->getData('custom') ?? false); + $attrType = new ItemAttributeType($request->getDataString('name') ?? ''); + $attrType->datatype = $request->getDataInt('datatype') ?? 0; + $attrType->custom = $request->getDataBool('custom') ?? false; $attrType->isRequired = (bool) ($request->getData('is_required') ?? false); - $attrType->validationPattern = (string) ($request->getData('validation_pattern') ?? ''); - $attrType->setL11n((string) ($request->getData('title') ?? ''), $request->getData('language') ?? ISO639x1Enum::_EN); - $attrType->setFields((int) ($request->getData('fields') ?? 0)); + $attrType->validationPattern = $request->getDataString('validation_pattern') ?? ''; + $attrType->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); + $attrType->setFields($request->getDataInt('fields') ?? 0); return $attrType; } @@ -646,15 +639,15 @@ final class ApiController extends Controller { /** @var ItemAttributeType $type */ $type = ItemAttributeTypeMapper::get() - ->where('id', (int) ($request->getData('type') ?? 0)) + ->where('id', $request->getDataInt('type') ?? 0) ->execute(); $attrValue = new ItemAttributeValue(); - $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) { - $attrValue->setL11n($request->getData('title'), $request->getData('language') ?? ISO639x1Enum::_EN); + if ($request->hasData('title')) { + $attrValue->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); } return $attrValue; @@ -720,11 +713,11 @@ final class ApiController extends Controller private function createItemAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $attrL11n = new BaseStringL11n(); - $attrL11n->ref = (int) ($request->getData('value') ?? 0); - $attrL11n->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); - $attrL11n->content = (string) ($request->getData('title') ?? ''); + $attrL11n->ref = $request->getDataInt('value') ?? 0; + $attrL11n->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); + $attrL11n->content = $request->getDataString('title') ?? ''; return $attrL11n; } @@ -789,7 +782,7 @@ final class ApiController extends Controller private function createItemL11nTypeFromRequest(RequestAbstract $request) : ItemL11nType { $itemL11nType = new ItemL11nType(); - $itemL11nType->title = (string) ($request->getData('title') ?? ''); + $itemL11nType->title = $request->getDataString('title') ?? ''; $itemL11nType->isRequired = (bool) ($request->getData('is_required') ?? false); return $itemL11nType; @@ -853,7 +846,7 @@ final class ApiController extends Controller private function createItemRelationTypeFromRequest(RequestAbstract $request) : ItemRelationType { $itemRelationType = new ItemRelationType(); - $itemRelationType->title = (string) ($request->getData('title') ?? ''); + $itemRelationType->title = $request->getDataString('title') ?? ''; return $itemRelationType; } @@ -916,12 +909,12 @@ final class ApiController extends Controller private function createItemL11nFromRequest(RequestAbstract $request) : ItemL11n { $itemL11n = new ItemL11n(); - $itemL11n->item = (int) ($request->getData('item') ?? 0); - $itemL11n->type = new NullItemL11nType((int) ($request->getData('type') ?? 0)); - $itemL11n->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); - $itemL11n->description = (string) ($request->getData('description') ?? ''); + $itemL11n->item = $request->getDataInt('item') ?? 0; + $itemL11n->type = new NullItemL11nType($request->getDataInt('type') ?? 0); + $itemL11n->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); + $itemL11n->description = $request->getDataString('description') ?? ''; return $itemL11n; } @@ -979,6 +972,7 @@ final class ApiController extends Controller return; } + /** @var \Modules\ItemManagement\Models\Item $item */ $item = ItemMapper::get() ->where('id', (int) $request->getData('item')) ->execute(); @@ -1000,7 +994,7 @@ final class ApiController extends Controller $this->createModelRelation( $request->header->account, $file->getId(), - $request->getData('type', 'int'), + $request->getDataInt('type'), MediaMapper::class, 'types', '', diff --git a/Controller/BackendController.php b/Controller/BackendController.php index b1ea7f7..75a45c3 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.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 */ @@ -36,7 +36,7 @@ use phpOMS\Views\View; * ItemManagement controller class. * * @package Modules\ItemManagement - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 * @codeCoverageIgnore diff --git a/Controller/Controller.php b/Controller/Controller.php index a57629b..98d7283 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.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 */ @@ -20,7 +20,7 @@ use phpOMS\Module\ModuleAbstract; * ItemManagement controller class. * * @package Modules\ItemManagement - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/AttributeValueType.php b/Models/AttributeValueType.php index 20d0f1f..3b2c147 100755 --- a/Models/AttributeValueType.php +++ b/Models/AttributeValueType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Item.php b/Models/Item.php index bc480a6..3060634 100755 --- a/Models/Item.php +++ b/Models/Item.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\Money; * Item class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemAttribute.php b/Models/ItemAttribute.php index 821356a..ed64347 100755 --- a/Models/ItemAttribute.php +++ b/Models/ItemAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Item class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemAttributeMapper.php b/Models/ItemAttributeMapper.php index b215a20..1b1e718 100755 --- a/Models/ItemAttributeMapper.php +++ b/Models/ItemAttributeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemAttributeType.php b/Models/ItemAttributeType.php index 503fd2d..556adb8 100755 --- a/Models/ItemAttributeType.php +++ b/Models/ItemAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item Attribute Type class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -143,7 +143,7 @@ class ItemAttributeType 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(); diff --git a/Models/ItemAttributeTypeL11nMapper.php b/Models/ItemAttributeTypeL11nMapper.php index 4b40682..4743663 100755 --- a/Models/ItemAttributeTypeL11nMapper.php +++ b/Models/ItemAttributeTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemAttributeTypeMapper.php b/Models/ItemAttributeTypeMapper.php index 59cac09..0955469 100755 --- a/Models/ItemAttributeTypeMapper.php +++ b/Models/ItemAttributeTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemAttributeValue.php b/Models/ItemAttributeValue.php index 8a53438..de0a449 100755 --- a/Models/ItemAttributeValue.php +++ b/Models/ItemAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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/item is defined in the ItemAttribute class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -135,7 +135,7 @@ class ItemAttributeValue 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(); diff --git a/Models/ItemAttributeValueL11nMapper.php b/Models/ItemAttributeValueL11nMapper.php index cc778f9..b09e4f8 100755 --- a/Models/ItemAttributeValueL11nMapper.php +++ b/Models/ItemAttributeValueL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemAttributeValueMapper.php b/Models/ItemAttributeValueMapper.php index 9b6fcae..fc39316 100755 --- a/Models/ItemAttributeValueMapper.php +++ b/Models/ItemAttributeValueMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemL11n.php b/Models/ItemL11n.php index 1972faa..343558d 100644 --- a/Models/ItemL11n.php +++ b/Models/ItemL11n.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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 item class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemL11nMapper.php b/Models/ItemL11nMapper.php index 6ec57d5..903edb2 100755 --- a/Models/ItemL11nMapper.php +++ b/Models/ItemL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemL11nType.php b/Models/ItemL11nType.php index 4dc63e4..ffecb3a 100755 --- a/Models/ItemL11nType.php +++ b/Models/ItemL11nType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Item class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemL11nTypeMapper.php b/Models/ItemL11nTypeMapper.php index 31e7259..1ccd824 100755 --- a/Models/ItemL11nTypeMapper.php +++ b/Models/ItemL11nTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemMapper.php b/Models/ItemMapper.php index 8245a5c..9b6ed63 100755 --- a/Models/ItemMapper.php +++ b/Models/ItemMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -22,7 +22,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemPrice.php b/Models/ItemPrice.php index 4b5e005..2633e2f 100755 --- a/Models/ItemPrice.php +++ b/Models/ItemPrice.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\Stdlib\Base\Exception\InvalidEnumValue; * Account class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemPriceStatus.php b/Models/ItemPriceStatus.php index ef99d42..e6c941d 100755 --- a/Models/ItemPriceStatus.php +++ b/Models/ItemPriceStatus.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item status enum. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemRelation.php b/Models/ItemRelation.php index 9baa8e5..b23869a 100644 --- a/Models/ItemRelation.php +++ b/Models/ItemRelation.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Item relation * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemRelationMapper.php b/Models/ItemRelationMapper.php index a0485e2..22a5764 100644 --- a/Models/ItemRelationMapper.php +++ b/Models/ItemRelationMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemRelationType.php b/Models/ItemRelationType.php index 6bd52c4..f02a33a 100644 --- a/Models/ItemRelationType.php +++ b/Models/ItemRelationType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Item relation type. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemRelationTypeMapper.php b/Models/ItemRelationTypeMapper.php index 9a3b7bd..88020ac 100644 --- a/Models/ItemRelationTypeMapper.php +++ b/Models/ItemRelationTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item mapper class. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/ItemStatus.php b/Models/ItemStatus.php index 2e2a0ce..1fa4ed3 100755 --- a/Models/ItemStatus.php +++ b/Models/ItemStatus.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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; * Item status enum. * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItem.php b/Models/NullItem.php index 00b35f8..761f2f8 100755 --- a/Models/NullItem.php +++ b/Models/NullItem.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemAttribute.php b/Models/NullItemAttribute.php index c1eaac8..5dd0b38 100755 --- a/Models/NullItemAttribute.php +++ b/Models/NullItemAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemAttributeType.php b/Models/NullItemAttributeType.php index 5b1e6e0..71469f2 100755 --- a/Models/NullItemAttributeType.php +++ b/Models/NullItemAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemAttributeValue.php b/Models/NullItemAttributeValue.php index b7fd2df..2eea8ae 100755 --- a/Models/NullItemAttributeValue.php +++ b/Models/NullItemAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemL11n.php b/Models/NullItemL11n.php index af09731..f26756b 100755 --- a/Models/NullItemL11n.php +++ b/Models/NullItemL11n.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemL11nType.php b/Models/NullItemL11nType.php index 3dbca96..7f33d90 100755 --- a/Models/NullItemL11nType.php +++ b/Models/NullItemL11nType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemRelation.php b/Models/NullItemRelation.php index f0acde9..1e68129 100644 --- a/Models/NullItemRelation.php +++ b/Models/NullItemRelation.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullItemRelationType.php b/Models/NullItemRelationType.php index 15b6b4d..13d06ea 100644 --- a/Models/NullItemRelationType.php +++ b/Models/NullItemRelationType.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models; * Null model * * @package Modules\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/PermissionCategory.php b/Models/PermissionCategory.php index 284d111..dc44b75 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\ItemManagement\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\ItemManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/StockManagementType.php b/Models/StockManagementType.php index 7f31f14..ce191cf 100755 --- a/Models/StockManagementType.php +++ b/Models/StockManagementType.php @@ -6,7 +6,7 @@ * * @package Model * @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; * Default settings enum. * * @package Model - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Theme/Backend/Lang/Navigation.ar.lang.php b/Theme/Backend/Lang/Navigation.ar.lang.php index 6289441..1849022 100755 --- a/Theme/Backend/Lang/Navigation.ar.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.cs.lang.php b/Theme/Backend/Lang/Navigation.cs.lang.php index f729587..c0eb7c5 100755 --- a/Theme/Backend/Lang/Navigation.cs.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.da.lang.php b/Theme/Backend/Lang/Navigation.da.lang.php index 7f8013a..f2b7ae1 100755 --- a/Theme/Backend/Lang/Navigation.da.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.de.lang.php b/Theme/Backend/Lang/Navigation.de.lang.php index d0f63be..1640b7a 100755 --- a/Theme/Backend/Lang/Navigation.de.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.el.lang.php b/Theme/Backend/Lang/Navigation.el.lang.php index a7f7930..4f8de96 100755 --- a/Theme/Backend/Lang/Navigation.el.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.en.lang.php b/Theme/Backend/Lang/Navigation.en.lang.php index c3a973c..d7d52ab 100755 --- a/Theme/Backend/Lang/Navigation.en.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.es.lang.php b/Theme/Backend/Lang/Navigation.es.lang.php index e6123e8..2c6b3a0 100755 --- a/Theme/Backend/Lang/Navigation.es.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.fi.lang.php b/Theme/Backend/Lang/Navigation.fi.lang.php index d54f3b5..073481b 100755 --- a/Theme/Backend/Lang/Navigation.fi.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.fr.lang.php b/Theme/Backend/Lang/Navigation.fr.lang.php index a221ad9..fbee59f 100755 --- a/Theme/Backend/Lang/Navigation.fr.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.hu.lang.php b/Theme/Backend/Lang/Navigation.hu.lang.php index 91fe20e..efa5ca6 100755 --- a/Theme/Backend/Lang/Navigation.hu.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.it.lang.php b/Theme/Backend/Lang/Navigation.it.lang.php index 7d9c2fe..3fea2c1 100755 --- a/Theme/Backend/Lang/Navigation.it.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.ja.lang.php b/Theme/Backend/Lang/Navigation.ja.lang.php index 4b9d16b..93a57a2 100755 --- a/Theme/Backend/Lang/Navigation.ja.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.ko.lang.php b/Theme/Backend/Lang/Navigation.ko.lang.php index bdb7a7e..9bc7fde 100755 --- a/Theme/Backend/Lang/Navigation.ko.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.no.lang.php b/Theme/Backend/Lang/Navigation.no.lang.php index c505bcc..b57e688 100755 --- a/Theme/Backend/Lang/Navigation.no.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.pl.lang.php b/Theme/Backend/Lang/Navigation.pl.lang.php index 3756de4..add1625 100755 --- a/Theme/Backend/Lang/Navigation.pl.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.pt.lang.php b/Theme/Backend/Lang/Navigation.pt.lang.php index 2b00eab..db4d1b0 100755 --- a/Theme/Backend/Lang/Navigation.pt.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.ru.lang.php b/Theme/Backend/Lang/Navigation.ru.lang.php index d904b63..46a8947 100755 --- a/Theme/Backend/Lang/Navigation.ru.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.sv.lang.php b/Theme/Backend/Lang/Navigation.sv.lang.php index e01296a..b882179 100755 --- a/Theme/Backend/Lang/Navigation.sv.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.th.lang.php b/Theme/Backend/Lang/Navigation.th.lang.php index db43a49..04ccd34 100755 --- a/Theme/Backend/Lang/Navigation.th.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.tr.lang.php b/Theme/Backend/Lang/Navigation.tr.lang.php index d354119..f267a1b 100755 --- a/Theme/Backend/Lang/Navigation.tr.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.uk.lang.php b/Theme/Backend/Lang/Navigation.uk.lang.php index 7c6e76f..fb602b7 100755 --- a/Theme/Backend/Lang/Navigation.uk.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/Navigation.zh.lang.php b/Theme/Backend/Lang/Navigation.zh.lang.php index 14897f9..ba2bead 100755 --- a/Theme/Backend/Lang/Navigation.zh.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/ar.lang.php b/Theme/Backend/Lang/ar.lang.php index 4bc71ca..f8599d8 100755 --- a/Theme/Backend/Lang/ar.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/cs.lang.php b/Theme/Backend/Lang/cs.lang.php index 5fad555..4e33fd7 100755 --- a/Theme/Backend/Lang/cs.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/da.lang.php b/Theme/Backend/Lang/da.lang.php index a8841da..e8693ad 100755 --- a/Theme/Backend/Lang/da.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/de.lang.php b/Theme/Backend/Lang/de.lang.php index 34309ff..ee8462a 100755 --- a/Theme/Backend/Lang/de.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/el.lang.php b/Theme/Backend/Lang/el.lang.php index eccd587..5363a6c 100755 --- a/Theme/Backend/Lang/el.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/en.lang.php b/Theme/Backend/Lang/en.lang.php index 601b5fe..93167cc 100755 --- a/Theme/Backend/Lang/en.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/es.lang.php b/Theme/Backend/Lang/es.lang.php index 7752068..03a61c1 100755 --- a/Theme/Backend/Lang/es.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/fi.lang.php b/Theme/Backend/Lang/fi.lang.php index 0acdd7a..b686c90 100755 --- a/Theme/Backend/Lang/fi.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/fr.lang.php b/Theme/Backend/Lang/fr.lang.php index 56870b5..049e0b8 100755 --- a/Theme/Backend/Lang/fr.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/hu.lang.php b/Theme/Backend/Lang/hu.lang.php index 6510584..cba736b 100755 --- a/Theme/Backend/Lang/hu.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/it.lang.php b/Theme/Backend/Lang/it.lang.php index 9ef4219..b37850a 100755 --- a/Theme/Backend/Lang/it.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/ja.lang.php b/Theme/Backend/Lang/ja.lang.php index 7939647..b33f10e 100755 --- a/Theme/Backend/Lang/ja.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/ko.lang.php b/Theme/Backend/Lang/ko.lang.php index db82a62..0381ee3 100755 --- a/Theme/Backend/Lang/ko.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/no.lang.php b/Theme/Backend/Lang/no.lang.php index 9925dcd..ea58ff0 100755 --- a/Theme/Backend/Lang/no.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/pl.lang.php b/Theme/Backend/Lang/pl.lang.php index 3ec7c53..b83b769 100755 --- a/Theme/Backend/Lang/pl.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/pt.lang.php b/Theme/Backend/Lang/pt.lang.php index eb2f0d2..a0252a1 100755 --- a/Theme/Backend/Lang/pt.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/ru.lang.php b/Theme/Backend/Lang/ru.lang.php index 8d031c2..2c41c5c 100755 --- a/Theme/Backend/Lang/ru.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/sv.lang.php b/Theme/Backend/Lang/sv.lang.php index 1f9579f..afdcd47 100755 --- a/Theme/Backend/Lang/sv.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/th.lang.php b/Theme/Backend/Lang/th.lang.php index 054a64a..3415064 100755 --- a/Theme/Backend/Lang/th.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/tr.lang.php b/Theme/Backend/Lang/tr.lang.php index 5165df5..7fbc392 100755 --- a/Theme/Backend/Lang/tr.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/uk.lang.php b/Theme/Backend/Lang/uk.lang.php index 4cb2790..e69fc6a 100755 --- a/Theme/Backend/Lang/uk.lang.php +++ b/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 */ diff --git a/Theme/Backend/Lang/zh.lang.php b/Theme/Backend/Lang/zh.lang.php index e116f88..8ceee38 100755 --- a/Theme/Backend/Lang/zh.lang.php +++ b/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 */ diff --git a/Theme/Backend/attribute-type-list.tpl.php b/Theme/Backend/attribute-type-list.tpl.php index f29e532..e912690 100755 --- a/Theme/Backend/attribute-type-list.tpl.php +++ b/Theme/Backend/attribute-type-list.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 */ @@ -55,7 +55,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/item/attribute/type?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/item/attribute/type?{?}&id=' . $value->getId()); ?> getId(); ?> diff --git a/Theme/Backend/item-analysis.tpl.php b/Theme/Backend/item-analysis.tpl.php index 04e34bd..32f2ac4 100755 --- a/Theme/Backend/item-analysis.tpl.php +++ b/Theme/Backend/item-analysis.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 */ diff --git a/Theme/Backend/item-create.tpl.php b/Theme/Backend/item-create.tpl.php index ae2a391..f5ff3ff 100755 --- a/Theme/Backend/item-create.tpl.php +++ b/Theme/Backend/item-create.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 */ diff --git a/Theme/Backend/item-list.tpl.php b/Theme/Backend/item-list.tpl.php index cda26db..83aeafe 100755 --- a/Theme/Backend/item-list.tpl.php +++ b/Theme/Backend/item-list.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 */ @@ -129,7 +129,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/item/profile?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/item/profile?{?}&id=' . $value->getId()); $image = $value->getFileByTypeName('item_profile_image'); ?> diff --git a/Theme/Backend/item-profile.tpl.php b/Theme/Backend/item-profile.tpl.php index 0ecab52..35a6d05 100644 --- a/Theme/Backend/item-profile.tpl.php +++ b/Theme/Backend/item-profile.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 */ @@ -173,7 +173,7 @@ echo $this->getData('nav')->render(); getHtml('CreatedAt'); ?> getId()); + $url = UriFactory::build('{/base}/editor/single?{?}&id=' . $note->getId()); ?> printHtml($note->title); ?> @@ -196,7 +196,7 @@ echo $this->getData('nav')->render(); getHtml('CreatedAt'); ?> getId()); + $url = UriFactory::build('{/base}/media/single?{?}&id=' . $file->getId()); ?> printHtml($file->name); ?> @@ -226,12 +226,12 @@ echo $this->getData('nav')->render(); getId()); + $url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->getId()); ?> printHtml($invoice->getNumber()); ?> printHtml($invoice->type->getL11n()); ?> - printHtml($invoice->billTo); ?> + printHtml($invoice->billTo); ?> printHtml($invoice->netSales->getCurrency()); ?> printHtml($invoice->createdAt->format('Y-m-d')); ?> @@ -254,7 +254,7 @@ echo $this->getData('nav')->render(); getHtml('Net'); ?> getId()); + $url = UriFactory::build('{/base}/sales/client/profile?id=' . $client->getId()); ?> printHtml($client->number); ?> @@ -472,7 +472,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -550,7 +550,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -632,7 +632,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -763,7 +763,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -934,7 +934,7 @@ echo $this->getData('nav')->render(); getId()); + $url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->getId()); ?> getNumber(); ?> diff --git a/Theme/Backend/purchase-item-list.tpl.php b/Theme/Backend/purchase-item-list.tpl.php index 2e0cb39..51c9b84 100755 --- a/Theme/Backend/purchase-item-list.tpl.php +++ b/Theme/Backend/purchase-item-list.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 */ @@ -127,14 +127,14 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/purchase/item/profile?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/purchase/item/profile?{?}&id=' . $value->getId()); $image = $value->getFileByType('backend_image'); ?> <?= $this->getHtml('IMG_alt_item'); ?> + UriFactory::build('{/base}/' . $image->getPath()); ?>"> printHtml($value->number); ?> printHtml($value->getL11n('name1')->description); ?> printHtml($value->getL11n('name2')->description); ?> diff --git a/Theme/Backend/sales-item-list.tpl.php b/Theme/Backend/sales-item-list.tpl.php index 87aaa5a..caa44de 100755 --- a/Theme/Backend/sales-item-list.tpl.php +++ b/Theme/Backend/sales-item-list.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 */ @@ -129,14 +129,14 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/sales/item/profile?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/sales/item/profile?{?}&id=' . $value->getId()); $image = $value->getFileByTypeName('item_profile_image'); ?> <?= $this->getHtml('IMG_alt_item'); ?> + UriFactory::build('{/base}/' . $image->getPath()); ?>"> printHtml($value->number); ?> printHtml($value->getL11n('name1')->description); ?> printHtml($value->getL11n('name2')->description); ?> diff --git a/Theme/Backend/sales-item-profile.tpl.php b/Theme/Backend/sales-item-profile.tpl.php index e57b0ef..8d77460 100755 --- a/Theme/Backend/sales-item-profile.tpl.php +++ b/Theme/Backend/sales-item-profile.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 */ @@ -92,7 +92,7 @@ echo $this->getData('nav')->render();
<?= $this->printHtml($image->name); ?> + src="getPath()); ?>">
@@ -171,7 +171,7 @@ echo $this->getData('nav')->render(); getHtml('CreatedAt'); ?> getId()); + $url = UriFactory::build('{/base}/editor/single?{?}&id=' . $note->getId()); ?> printHtml($note->title); ?> @@ -194,7 +194,7 @@ echo $this->getData('nav')->render(); getHtml('CreatedAt'); ?> getId()); + $url = UriFactory::build('{/base}/media/single?{?}&id=' . $file->getId()); ?> printHtml($file->name); ?> @@ -224,12 +224,12 @@ echo $this->getData('nav')->render(); getId()); + $url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->getId()); ?> printHtml($invoice->getNumber()); ?> printHtml($invoice->type->getL11n()); ?> - printHtml($invoice->billTo); ?> + printHtml($invoice->billTo); ?> printHtml($invoice->netSales->getCurrency()); ?> printHtml($invoice->createdAt->format('Y-m-d')); ?> @@ -252,7 +252,7 @@ echo $this->getData('nav')->render(); getHtml('Net'); ?> getId()); + $url = UriFactory::build('{/base}/sales/client/profile?id=' . $client->getId()); ?> printHtml($client->number); ?> @@ -470,7 +470,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -548,7 +548,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -630,7 +630,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -761,7 +761,7 @@ echo $this->getData('nav')->render(); $value) : ++$c; - $url = UriFactory::build('{/lang}/{/app}/admin/group/settings?{?}&id=' . $value->getId()); ?> + $url = UriFactory::build('{/base}/admin/group/settings?{?}&id=' . $value->getId()); ?> getId(); ?> @@ -932,7 +932,7 @@ echo $this->getData('nav')->render(); getId()); + $url = UriFactory::build('{/base}/sales/bill?{?}&id=' . $invoice->getId()); ?> getNumber(); ?> diff --git a/Theme/Backend/stock-item-list.tpl.php b/Theme/Backend/stock-item-list.tpl.php index c78f812..b4419cb 100755 --- a/Theme/Backend/stock-item-list.tpl.php +++ b/Theme/Backend/stock-item-list.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 */ @@ -117,7 +117,7 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/item/profile?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/item/profile?{?}&id=' . $value->getId()); $image = $value->getFileByTypeName('item_profile_image'); ?> diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index e096733..1529139 100755 --- a/tests/Admin/AdminTest.php +++ b/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 */ diff --git a/tests/Autoloader.php b/tests/Autoloader.php index d032623..d08f1b7 100755 --- a/tests/Autoloader.php +++ b/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 */ diff --git a/tests/Controller/Api/ApiControllerAttributeTrait.php b/tests/Controller/Api/ApiControllerAttributeTrait.php index b91d1db..ba3e1ff 100755 --- a/tests/Controller/Api/ApiControllerAttributeTrait.php +++ b/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 */ diff --git a/tests/Controller/Api/ApiControllerItemTrait.php b/tests/Controller/Api/ApiControllerItemTrait.php index d6fdaaa..7383c39 100755 --- a/tests/Controller/Api/ApiControllerItemTrait.php +++ b/tests/Controller/Api/ApiControllerItemTrait.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 */ diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 3e35be0..0c1e859 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/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 */ diff --git a/tests/Models/ItemAttributeTest.php b/tests/Models/ItemAttributeTest.php index 87c282e..07eccc9 100755 --- a/tests/Models/ItemAttributeTest.php +++ b/tests/Models/ItemAttributeTest.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 */ diff --git a/tests/Models/ItemAttributeTypeTest.php b/tests/Models/ItemAttributeTypeTest.php index 0a13851..b003884 100755 --- a/tests/Models/ItemAttributeTypeTest.php +++ b/tests/Models/ItemAttributeTypeTest.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 */ diff --git a/tests/Models/ItemAttributeValueTest.php b/tests/Models/ItemAttributeValueTest.php index 2b65d55..71a0958 100755 --- a/tests/Models/ItemAttributeValueTest.php +++ b/tests/Models/ItemAttributeValueTest.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 */ diff --git a/tests/Models/ItemL11nTest.php b/tests/Models/ItemL11nTest.php index d349e92..4a94b62 100755 --- a/tests/Models/ItemL11nTest.php +++ b/tests/Models/ItemL11nTest.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 */ diff --git a/tests/Models/ItemL11nTypeTest.php b/tests/Models/ItemL11nTypeTest.php index 060dc10..563199b 100755 --- a/tests/Models/ItemL11nTypeTest.php +++ b/tests/Models/ItemL11nTypeTest.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 */ diff --git a/tests/Models/ItemMapperTest.php b/tests/Models/ItemMapperTest.php index ec5dc1f..3032348 100755 --- a/tests/Models/ItemMapperTest.php +++ b/tests/Models/ItemMapperTest.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 */ diff --git a/tests/Models/ItemTest.php b/tests/Models/ItemTest.php index 135ade0..1270c0f 100755 --- a/tests/Models/ItemTest.php +++ b/tests/Models/ItemTest.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 */ diff --git a/tests/Models/NullItemAttributeTest.php b/tests/Models/NullItemAttributeTest.php index 2b0f703..605b15a 100755 --- a/tests/Models/NullItemAttributeTest.php +++ b/tests/Models/NullItemAttributeTest.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 */ diff --git a/tests/Models/NullItemAttributeTypeTest.php b/tests/Models/NullItemAttributeTypeTest.php index 22c599c..9ef0b14 100755 --- a/tests/Models/NullItemAttributeTypeTest.php +++ b/tests/Models/NullItemAttributeTypeTest.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 */ diff --git a/tests/Models/NullItemAttributeValueTest.php b/tests/Models/NullItemAttributeValueTest.php index b6c1974..3408195 100755 --- a/tests/Models/NullItemAttributeValueTest.php +++ b/tests/Models/NullItemAttributeValueTest.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 */ diff --git a/tests/Models/NullItemL11nTest.php b/tests/Models/NullItemL11nTest.php index fc09fa2..ae3bc40 100755 --- a/tests/Models/NullItemL11nTest.php +++ b/tests/Models/NullItemL11nTest.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 */ diff --git a/tests/Models/NullItemL11nTypeTest.php b/tests/Models/NullItemL11nTypeTest.php index af7734d..07f798d 100755 --- a/tests/Models/NullItemL11nTypeTest.php +++ b/tests/Models/NullItemL11nTypeTest.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 */ diff --git a/tests/Models/NullItemTest.php b/tests/Models/NullItemTest.php index 8058d8b..0fd86b5 100755 --- a/tests/Models/NullItemTest.php +++ b/tests/Models/NullItemTest.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 */