From bb421239d2fd7c8d70813e7b7f11d47b069ca41b Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 24 Mar 2023 16:20:25 +0100 Subject: [PATCH] registration fixes --- Admin/Install/Media.php | 4 +- Admin/Install/Navigation.install.json | 14 ++-- Admin/Install/Navigation.php | 4 +- Admin/Installer.php | 4 +- Admin/Routes/Web/Backend.php | 2 +- Admin/Status.php | 4 +- Admin/Uninstaller.php | 4 +- Admin/Updater.php | 4 +- Controller/ApiController.php | 78 +++++++++---------- Controller/BackendController.php | 4 +- Controller/Controller.php | 4 +- Models/AttributeValueType.php | 4 +- Models/NullSupplier.php | 4 +- Models/NullSupplierAttribute.php | 4 +- Models/NullSupplierAttributeType.php | 4 +- Models/NullSupplierAttributeValue.php | 4 +- Models/NullSupplierL11n.php | 4 +- Models/NullSupplierL11nType.php | 4 +- Models/PermissionCategory.php | 4 +- Models/Supplier.php | 47 ++++++++++- Models/SupplierAttribute.php | 4 +- Models/SupplierAttributeMapper.php | 4 +- Models/SupplierAttributeType.php | 6 +- Models/SupplierAttributeTypeL11nMapper.php | 4 +- Models/SupplierAttributeTypeMapper.php | 4 +- Models/SupplierAttributeValue.php | 6 +- Models/SupplierAttributeValueL11nMapper.php | 4 +- Models/SupplierAttributeValueMapper.php | 4 +- Models/SupplierL11n.php | 4 +- Models/SupplierL11nMapper.php | 4 +- Models/SupplierL11nType.php | 4 +- Models/SupplierL11nTypeMapper.php | 4 +- Models/SupplierMapper.php | 4 +- Models/SupplierStatus.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/supplier-create.tpl.php | 2 +- Theme/Backend/supplier-list.tpl.php | 6 +- Theme/Backend/supplier-profile.tpl.php | 8 +- tests/Admin/AdminTest.php | 2 +- tests/Autoloader.php | 4 +- .../Api/ApiControllerAttributeTrait.php | 2 +- .../Api/ApiControllerSupplierTrait.php | 2 +- tests/Controller/ApiControllerTest.php | 2 +- tests/Models/NullSupplierAttributeTest.php | 2 +- .../Models/NullSupplierAttributeTypeTest.php | 2 +- .../Models/NullSupplierAttributeValueTest.php | 2 +- tests/Models/NullSupplierTest.php | 2 +- tests/Models/SupplierAttributeTest.php | 2 +- tests/Models/SupplierAttributeTypeTest.php | 2 +- tests/Models/SupplierAttributeValueTest.php | 2 +- tests/Models/SupplierTest.php | 2 +- 94 files changed, 220 insertions(+), 177 deletions(-) diff --git a/Admin/Install/Media.php b/Admin/Install/Media.php index e8b0f12..67de18c 100755 --- a/Admin/Install/Media.php +++ b/Admin/Install/Media.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\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 f6a461b..f54bb3e 100755 --- a/Admin/Install/Navigation.install.json +++ b/Admin/Install/Navigation.install.json @@ -5,7 +5,7 @@ "type": 2, "subtype": 1, "name": "Suppliers", - "uri": "{/lang}/{/app}/purchase/supplier/list", + "uri": "{/base}/purchase/supplier/list", "target": "self", "icon": null, "order": 1, @@ -19,7 +19,7 @@ "type": 3, "subtype": 1, "name": "List", - "uri": "{/lang}/{/app}/purchase/supplier/list", + "uri": "{/base}/purchase/supplier/list", "target": "self", "icon": null, "order": 1, @@ -34,7 +34,7 @@ "type": 3, "subtype": 1, "name": "Create", - "uri": "{/lang}/{/app}/purchase/supplier/create?{?}", + "uri": "{/base}/purchase/supplier/create?{?}", "target": "self", "icon": null, "order": 5, @@ -51,7 +51,7 @@ "type": 2, "subtype": 1, "name": "Attributes", - "uri": "{/lang}/{/app}/purchase/supplier/attribute/type/list?{?}", + "uri": "{/base}/purchase/supplier/attribute/type/list?{?}", "target": "self", "icon": null, "order": 5, @@ -65,7 +65,7 @@ "type": 3, "subtype": 1, "name": "Types", - "uri": "{/lang}/{/app}/purchase/supplier/attribute/type/list?{?}", + "uri": "{/base}/purchase/supplier/attribute/type/list?{?}", "target": "self", "icon": null, "order": 15, @@ -80,7 +80,7 @@ "type": 3, "subtype": 1, "name": "Values", - "uri": "{/lang}/{/app}/purchase/supplier/attribute/value/list?{?}", + "uri": "{/base}/purchase/supplier/attribute/value/list?{?}", "target": "self", "icon": null, "order": 15, @@ -97,7 +97,7 @@ "type": 3, "subtype": 1, "name": "Supplier", - "uri": "{/lang}/{/app}/purchase/analysis/supplier?{?}", + "uri": "{/base}/purchase/analysis/supplier?{?}", "target": "self", "icon": null, "order": 15, diff --git a/Admin/Install/Navigation.php b/Admin/Install/Navigation.php index 6050b32..09f9262 100755 --- a/Admin/Install/Navigation.php +++ b/Admin/Install/Navigation.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\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 b7e88a9..1998e67 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\Admin * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -26,7 +26,7 @@ use phpOMS\Uri\HttpUri; * Installer class. * * @package Modules\SupplierManagement\Admin - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Admin/Routes/Web/Backend.php b/Admin/Routes/Web/Backend.php index 91dbc0e..bcf5085 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 308aaad..6f62422 100755 --- a/Admin/Status.php +++ b/Admin/Status.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\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 e16a25e..66d53ac 100755 --- a/Admin/Uninstaller.php +++ b/Admin/Uninstaller.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\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 3d7a5c6..8368c4f 100755 --- a/Admin/Updater.php +++ b/Admin/Updater.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\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 2694872..91ae538 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -49,7 +49,7 @@ use phpOMS\Model\Message\FormValidation; * SupplierManagement class. * * @package Modules\SupplierManagement - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -94,22 +94,22 @@ final class ApiController extends Controller private function createSupplierFromRequest(RequestAbstract $request) : Supplier { $account = new Account(); - $account->name1 = (string) ($request->getData('name1') ?? ''); - $account->name2 = (string) ($request->getData('name2') ?? ''); + $account->name1 = $request->getDataString('name1') ?? ''; + $account->name2 = $request->getDataString('name2') ?? ''; $supplier = new Supplier(); - $supplier->number = (string) ($request->getData('number') ?? ''); + $supplier->number = $request->getDataString('number') ?? ''; $supplier->account = $account; $addr = new Address(); - $addr->address = (string) ($request->getData('address') ?? ''); - $addr->postal = (string) ($request->getData('postal') ?? ''); - $addr->city = (string) ($request->getData('city') ?? ''); - $addr->state = (string) ($request->getData('state') ?? ''); - $addr->setCountry((string) ($request->getData('country') ?? '')); + $addr->address = $request->getDataString('address') ?? ''; + $addr->postal = $request->getDataString('postal') ?? ''; + $addr->city = $request->getDataString('city') ?? ''; + $addr->state = $request->getDataString('state') ?? ''; + $addr->setCountry($request->getDataString('country') ?? ''); $supplier->mainAddress = $addr; - $supplier->unit = $request->getData('unit', 'int'); + $supplier->unit = $request->getDataInt('unit'); return $supplier; } @@ -174,12 +174,12 @@ final class ApiController extends Controller private function createSupplierL11nFromRequest(RequestAbstract $request) : SupplierL11n { $supplierL11n = new SupplierL11n(); - $supplierL11n->supplier = (int) ($request->getData('supplier') ?? 0); - $supplierL11n->type = new NullSupplierL11nType((int) ($request->getData('type') ?? 0)); - $supplierL11n->setLanguage((string) ( - $request->getData('language') ?? $request->getLanguage() - )); - $supplierL11n->description = (string) ($request->getData('description') ?? ''); + $supplierL11n->supplier = $request->getDataInt('supplier') ?? 0; + $supplierL11n->type = new NullSupplierL11nType($request->getDataInt('type') ?? 0); + $supplierL11n->setLanguage( + $request->getDataString('language') ?? $request->getLanguage() + ); + $supplierL11n->description = $request->getDataString('description') ?? ''; return $supplierL11n; } @@ -245,7 +245,7 @@ final class ApiController extends Controller private function createSupplierL11nTypeFromRequest(RequestAbstract $request) : SupplierL11nType { $supplierL11nType = new SupplierL11nType(); - $supplierL11nType->title = (string) ($request->getData('title') ?? ''); + $supplierL11nType->title = $request->getDataString('title') ?? ''; $supplierL11nType->isRequired = (bool) ($request->getData('is_required') ?? false); return $supplierL11nType; @@ -377,11 +377,11 @@ final class ApiController extends Controller private function createSupplierAttributeTypeL11nFromRequest(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; } @@ -446,13 +446,13 @@ final class ApiController extends Controller */ private function createSupplierAttributeTypeFromRequest(RequestAbstract $request) : SupplierAttributeType { - $attrType = new SupplierAttributeType($request->getData('name') ?? ''); - $attrType->datatype = (int) ($request->getData('datatype') ?? 0); - $attrType->custom = (bool) ($request->getData('custom') ?? false); + $attrType = new SupplierAttributeType($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; } @@ -528,15 +528,15 @@ final class ApiController extends Controller { /** @var SupplierAttributeType $type */ $type = SupplierAttributeTypeMapper::get() - ->where('id', (int) ($request->getData('type') ?? 0)) + ->where('id', $request->getDataInt('type') ?? 0) ->execute(); $attrValue = new SupplierAttributeValue(); - $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; @@ -602,11 +602,11 @@ final class ApiController extends Controller private function createSupplierAttributeValueL11nFromRequest(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; } @@ -671,7 +671,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 c7298ec..c323491 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -31,7 +31,7 @@ use phpOMS\Views\View; * SupplierManagement controller class. * * @package Modules\SupplierManagement - * @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 5ba6fed..ac5b416 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement * @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; * SupplierManagement controller class. * * @package Modules\SupplierManagement - * @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 17fe51c..4cf8585 100755 --- a/Models/AttributeValueType.php +++ b/Models/AttributeValueType.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSupplier.php b/Models/NullSupplier.php index 8eac294..d15685a 100755 --- a/Models/NullSupplier.php +++ b/Models/NullSupplier.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Null model * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSupplierAttribute.php b/Models/NullSupplierAttribute.php index 2079c1e..067e55c 100755 --- a/Models/NullSupplierAttribute.php +++ b/Models/NullSupplierAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Null model * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSupplierAttributeType.php b/Models/NullSupplierAttributeType.php index d0729a2..aea8f7f 100755 --- a/Models/NullSupplierAttributeType.php +++ b/Models/NullSupplierAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Null model * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSupplierAttributeValue.php b/Models/NullSupplierAttributeValue.php index fcc4cca..215b031 100755 --- a/Models/NullSupplierAttributeValue.php +++ b/Models/NullSupplierAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Null model * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSupplierL11n.php b/Models/NullSupplierL11n.php index 480c2b5..0ce6261 100755 --- a/Models/NullSupplierL11n.php +++ b/Models/NullSupplierL11n.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Null model * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/NullSupplierL11nType.php b/Models/NullSupplierL11nType.php index f0643c3..b083c51 100755 --- a/Models/NullSupplierL11nType.php +++ b/Models/NullSupplierL11nType.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Null model * * @package Modules\SupplierManagement\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 3cd4dc6..aa22a39 100755 --- a/Models/PermissionCategory.php +++ b/Models/PermissionCategory.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/Supplier.php b/Models/Supplier.php index 487a215..e6544dd 100755 --- a/Models/Supplier.php +++ b/Models/Supplier.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -23,12 +23,13 @@ use Modules\Media\Models\NullMedia; use Modules\Profile\Models\ContactElement; use Modules\Profile\Models\NullContactElement; use Modules\Profile\Models\Profile; +use Modules\Payment\Models\Payment; /** * Supplier class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -88,6 +89,14 @@ class Supplier private array $partners = []; + /** + * Payments. + * + * @var Payment[] + * @since 1.0.0 + */ + private array $payments = []; + /** * Unit * @@ -146,6 +155,40 @@ class Supplier $this->status = $status; } + /** + * Get payments + * + * @return Payment[] + * + * @since 1.0.0 + */ + public function getPayments() : array + { + return $this->payments; + } + + /** + * Get payments + * + * @param int $type Payment type + * + * @return array + * + * @since 1.0.0 + */ + public function getPaymentsByType(int $type) : array + { + $payments = []; + + foreach ($this->payments as $payment) { + if ($payment->getType() === $type) { + $payments[] = $payment; + } + } + + return $payments; + } + /** * Get supplier type. * diff --git a/Models/SupplierAttribute.php b/Models/SupplierAttribute.php index 05a4d58..ae6065f 100755 --- a/Models/SupplierAttribute.php +++ b/Models/SupplierAttribute.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Supplier class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierAttributeMapper.php b/Models/SupplierAttributeMapper.php index 0cefa30..f0be5a3 100755 --- a/Models/SupplierAttributeMapper.php +++ b/Models/SupplierAttributeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierAttributeType.php b/Models/SupplierAttributeType.php index 9b15f04..bba62c4 100755 --- a/Models/SupplierAttributeType.php +++ b/Models/SupplierAttributeType.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier Attribute Type class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -135,7 +135,7 @@ class SupplierAttributeType 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/SupplierAttributeTypeL11nMapper.php b/Models/SupplierAttributeTypeL11nMapper.php index 39c251b..4910a43 100755 --- a/Models/SupplierAttributeTypeL11nMapper.php +++ b/Models/SupplierAttributeTypeL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierAttributeTypeMapper.php b/Models/SupplierAttributeTypeMapper.php index 3972812..701a9f7 100755 --- a/Models/SupplierAttributeTypeMapper.php +++ b/Models/SupplierAttributeTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierAttributeValue.php b/Models/SupplierAttributeValue.php index 1eaa978..d683282 100755 --- a/Models/SupplierAttributeValue.php +++ b/Models/SupplierAttributeValue.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -24,7 +24,7 @@ use phpOMS\Localization\ISO639x1Enum; * The relation with the type/supplier is defined in the SupplierAttribute class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ @@ -136,7 +136,7 @@ class SupplierAttributeValue 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/SupplierAttributeValueL11nMapper.php b/Models/SupplierAttributeValueL11nMapper.php index 8f4e3f1..a5d8d0a 100644 --- a/Models/SupplierAttributeValueL11nMapper.php +++ b/Models/SupplierAttributeValueL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierAttributeValueMapper.php b/Models/SupplierAttributeValueMapper.php index 43a4750..75de6d0 100755 --- a/Models/SupplierAttributeValueMapper.php +++ b/Models/SupplierAttributeValueMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierL11n.php b/Models/SupplierL11n.php index fa6d293..d1e3793 100755 --- a/Models/SupplierL11n.php +++ b/Models/SupplierL11n.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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 supplier class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierL11nMapper.php b/Models/SupplierL11nMapper.php index 2ec83ef..2538334 100755 --- a/Models/SupplierL11nMapper.php +++ b/Models/SupplierL11nMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierL11nType.php b/Models/SupplierL11nType.php index 9662500..0acd1f9 100755 --- a/Models/SupplierL11nType.php +++ b/Models/SupplierL11nType.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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\SupplierManagement\Models; * Supplier class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierL11nTypeMapper.php b/Models/SupplierL11nTypeMapper.php index c5649f9..57767c1 100755 --- a/Models/SupplierL11nTypeMapper.php +++ b/Models/SupplierL11nTypeMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierMapper.php b/Models/SupplierMapper.php index e2463c5..3697384 100755 --- a/Models/SupplierMapper.php +++ b/Models/SupplierMapper.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\Models * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -25,7 +25,7 @@ use phpOMS\DataStorage\Database\Mapper\DataMapperFactory; * Supplier mapper class. * * @package Modules\SupplierManagement\Models - * @license OMS License 1.0 + * @license OMS License 2.0 * @link https://jingga.app * @since 1.0.0 */ diff --git a/Models/SupplierStatus.php b/Models/SupplierStatus.php index c48949d..302b638 100755 --- a/Models/SupplierStatus.php +++ b/Models/SupplierStatus.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement\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; * Supplier status enum. * * @package Modules\SupplierManagement\Models - * @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 b0c3da7..9bb3de8 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 7d1a6aa..48d7dc2 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 f253d5d..62be8aa 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 5dd005f..a6bab64 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 87d3f27..bc663c4 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 fc24c88..77e0864 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 378a453..a37f0fa 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 7abe84b..4270256 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 8c0533e..d769144 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 9f807d8..cacb64e 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 3b081a5..ea6cda7 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 3a4fe9d..e75ad35 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 893b8ad..c6335e7 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 da30a4f..21dc4ba 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 fc15b95..0cc7cef 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 a778bf8..889a515 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 c8fca8f..9082652 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 afaf1d7..73d5a2e 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 3055839..7c6a450 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 748148a..db1d45d 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 9fc78b9..3accee3 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 98878c7..a950b47 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 57f2cab..21e329f 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 15cd689..6d639de 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 c79831d..414bed8 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 e9bcc71..dcbe800 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 ffb11a9..c9852ce 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 7afcfa7..4348293 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 7d1c27f..bc295d2 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 c5a522d..57eeb25 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 f221709..48769ae 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 d7ceb41..81141af 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 c10f1e1..8b84a93 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 aa35ffe..8e0b7c1 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 447353e..ec8dc43 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 85f15ca..38f8bc0 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 ca5decb..b6f553b 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 71258d5..2f16bbe 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 ff2b45f..2af4b84 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 b2efac9..0fce486 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 4f98fa9..142005f 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 0af32a1..d367f54 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 9c428ad..6f70bd7 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 6afcd77..20c8c7c 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/supplier-create.tpl.php b/Theme/Backend/supplier-create.tpl.php index cef2c61..e422c1b 100755 --- a/Theme/Backend/supplier-create.tpl.php +++ b/Theme/Backend/supplier-create.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement * @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/supplier-list.tpl.php b/Theme/Backend/supplier-list.tpl.php index cdd1584..e77d4a4 100755 --- a/Theme/Backend/supplier-list.tpl.php +++ b/Theme/Backend/supplier-list.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -103,13 +103,13 @@ echo $this->getData('nav')->render(); ?> $value) : ++$count; - $url = UriFactory::build('{/lang}/{/app}/purchase/supplier/profile?{?}&id=' . $value->getId()); + $url = UriFactory::build('{/base}/purchase/supplier/profile?{?}&id=' . $value->getId()); $image = $value->getFileByTypeName('supplier_profile_image'); ?> <?= $this->getHtml('IMG_alt_supplier'); ?> + UriFactory::build('{/base}/' . $image->getPath()); ?>"> printHtml($value->number); ?> printHtml($value->profile->account->name1); ?> printHtml($value->profile->account->name2); ?> printHtml($value->mainAddress->city); ?> diff --git a/Theme/Backend/supplier-profile.tpl.php b/Theme/Backend/supplier-profile.tpl.php index 2d77a5f..768d642 100755 --- a/Theme/Backend/supplier-profile.tpl.php +++ b/Theme/Backend/supplier-profile.tpl.php @@ -6,7 +6,7 @@ * * @package Modules\SupplierManagement * @copyright Dennis Eichhorn - * @license OMS License 1.0 + * @license OMS License 2.0 * @version 1.0.0 * @link https://jingga.app */ @@ -239,7 +239,7 @@ echo $this->getData('nav')->render(); getHtml('CreatedAt'); ?> getId()); + $url = UriFactory::build('{/base}/editor/single?{?}&id=' . $note->getId()); ?> title; ?> @@ -262,7 +262,7 @@ echo $this->getData('nav')->render(); getHtml('CreatedAt'); ?> getId()); + $url = UriFactory::build('{/base}/media/single?{?}&id=' . $file->getId()); ?> name; ?> @@ -292,7 +292,7 @@ echo $this->getData('nav')->render(); getId()); + $url = UriFactory::build('{/base}/purchase/bill?{?}&id=' . $invoice->getId()); ?> getNumber(); ?> diff --git a/tests/Admin/AdminTest.php b/tests/Admin/AdminTest.php index cfdd51f..914dd3b 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 57ce7a0..c0b09aa 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/ApiControllerSupplierTrait.php b/tests/Controller/Api/ApiControllerSupplierTrait.php index c1aeebf..92845d5 100755 --- a/tests/Controller/Api/ApiControllerSupplierTrait.php +++ b/tests/Controller/Api/ApiControllerSupplierTrait.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 8d8a800..5db8ed6 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/NullSupplierAttributeTest.php b/tests/Models/NullSupplierAttributeTest.php index 76c36f4..b2431e9 100755 --- a/tests/Models/NullSupplierAttributeTest.php +++ b/tests/Models/NullSupplierAttributeTest.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/NullSupplierAttributeTypeTest.php b/tests/Models/NullSupplierAttributeTypeTest.php index bf7b1f1..904e275 100755 --- a/tests/Models/NullSupplierAttributeTypeTest.php +++ b/tests/Models/NullSupplierAttributeTypeTest.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/NullSupplierAttributeValueTest.php b/tests/Models/NullSupplierAttributeValueTest.php index 577eea8..a28cb7c 100755 --- a/tests/Models/NullSupplierAttributeValueTest.php +++ b/tests/Models/NullSupplierAttributeValueTest.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/NullSupplierTest.php b/tests/Models/NullSupplierTest.php index 4269a8e..17d778b 100755 --- a/tests/Models/NullSupplierTest.php +++ b/tests/Models/NullSupplierTest.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/SupplierAttributeTest.php b/tests/Models/SupplierAttributeTest.php index 2ce6135..e6c2783 100755 --- a/tests/Models/SupplierAttributeTest.php +++ b/tests/Models/SupplierAttributeTest.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/SupplierAttributeTypeTest.php b/tests/Models/SupplierAttributeTypeTest.php index e0f1740..738eb65 100755 --- a/tests/Models/SupplierAttributeTypeTest.php +++ b/tests/Models/SupplierAttributeTypeTest.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/SupplierAttributeValueTest.php b/tests/Models/SupplierAttributeValueTest.php index f51d89b..a015d10 100755 --- a/tests/Models/SupplierAttributeValueTest.php +++ b/tests/Models/SupplierAttributeValueTest.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/SupplierTest.php b/tests/Models/SupplierTest.php index 91daf9c..54e7bcd 100755 --- a/tests/Models/SupplierTest.php +++ b/tests/Models/SupplierTest.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 */