From 5dd9b331dee537e594c101a62d543d90c4b24358 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Wed, 31 May 2023 12:03:53 +0000 Subject: [PATCH] fix getters/setters --- Controller/ApiController.php | 4 ++-- Controller/Controller.php | 4 ++-- Models/Expense.php | 5 +++-- Models/ExpenseElement.php | 5 +++-- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index cf3d0c6..0327628 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -243,7 +243,7 @@ final class ApiController extends Controller public function createExpenseElementTypeFromRequest(RequestAbstract $request) : BaseStringL11nType { $type = new BaseStringL11nType(); - $type->name = $request->getDataString('name') ?? ''; + $type->title = $request->getDataString('name') ?? ''; $type->setL11n($request->getDataString('title') ?? '', $request->getDataString('language') ?? ISO639x1Enum::_EN); return $type; @@ -443,7 +443,7 @@ final class ApiController extends Controller $element = $this->createExpenseElementFromRequest($request); $this->createModel($request->header->account, $element, ExpenseElementMapper::class, 'expense_element', $request->getOrigin()); - if ($request->hasFiles()) { + if (!empty($request->files)) { $request->setData('element', $element->id, true); $this->apiMediaAddToExpenseElement($request, $response, $data); diff --git a/Controller/Controller.php b/Controller/Controller.php index 4187ec5..5ebed1e 100755 --- a/Controller/Controller.php +++ b/Controller/Controller.php @@ -64,7 +64,7 @@ class Controller extends ModuleAbstract * @var string[] * @since 1.0.0 */ - protected static array $providing = []; + public static array $providing = []; /** * Dependencies. @@ -72,5 +72,5 @@ class Controller extends ModuleAbstract * @var string[] * @since 1.0.0 */ - protected static array $dependencies = []; + public static array $dependencies = []; } diff --git a/Models/Expense.php b/Models/Expense.php index 7774575..7d2269a 100644 --- a/Models/Expense.php +++ b/Models/Expense.php @@ -15,6 +15,7 @@ declare(strict_types=1); namespace Modules\BusinessExpenses\Models; use Modules\Admin\Models\Account; +use phpOMS\Localization\BaseStringL11nType; use phpOMS\Localization\ISO3166TwoEnum; use phpOMS\Stdlib\Base\FloatInt; @@ -34,7 +35,7 @@ class Expense public int $status = ExpenseStatus::DRAFT; - public ExpenseType $type; + public BaseStringL11nType $type; public string $description = ''; @@ -68,7 +69,7 @@ class Expense public function __construct() { - $this->type = new ExpenseType(); + $this->type = new BaseStringL11nType(); $this->start = new \DateTime('now'); $this->end = new \DateTime('now'); $this->createdAt = new \DateTimeImmutable('now'); diff --git a/Models/ExpenseElement.php b/Models/ExpenseElement.php index 7a4d377..968f06c 100644 --- a/Models/ExpenseElement.php +++ b/Models/ExpenseElement.php @@ -16,6 +16,7 @@ namespace Modules\BusinessExpenses\Models; use Modules\Admin\Models\Account; use Modules\SupplierManagement\Models\Supplier; +use phpOMS\Localization\BaseStringL11nType; use phpOMS\Localization\ISO3166TwoEnum; use phpOMS\Stdlib\Base\FloatInt; @@ -47,7 +48,7 @@ class ExpenseElement public FloatInt $quantity; - public ExpenseElementType $type; + public BaseStringL11nType $type; public ?Account $ref = null; @@ -65,7 +66,7 @@ class ExpenseElement public function __construct() { - $this->type = new ExpenseElementType(); + $this->type = new BaseStringL11nType(); $this->net = new FloatInt(); $this->taxR = new FloatInt(); $this->taxP = new FloatInt();