From bc509dcbf9c0afa604a4f7d14a6038f054485c43 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Fri, 11 Oct 2024 19:17:40 +0000 Subject: [PATCH] bug fixes --- Admin/Installer.php | 6 +++--- Controller/ApiController.php | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Admin/Installer.php b/Admin/Installer.php index 1f6ddb1..7abae19 100755 --- a/Admin/Installer.php +++ b/Admin/Installer.php @@ -82,7 +82,7 @@ final class Installer extends InstallerAbstract $request->header->account = 1; $request->setData('name', $type['name'] ?? ''); - $request->setData('title', \reset($type['l11n'])); + $request->setData('content', \reset($type['l11n'])); $request->setData('sign', $type['sign'] ?? -1); $request->setData('is_loan', $type['isLoan'] ?? false); @@ -108,9 +108,9 @@ final class Installer extends InstallerAbstract $request = new HttpRequest(); $request->header->account = 1; - $request->setData('title', $l11n); + $request->setData('content', $l11n); $request->setData('language', $language); - $request->setData('type', $costType[$type['name']]['id']); + $request->setData('ref', $costType[$type['name']]['id']); $module->apiLoanCostTypeL11nCreate($request, $response); } diff --git a/Controller/ApiController.php b/Controller/ApiController.php index ac964e9..659de1f 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -257,7 +257,7 @@ final class ApiController extends Controller private function validateCostTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) + if (($val['content'] = !$request->hasData('content')) || ($val['name'] = !$request->hasData('name')) ) { return $val; @@ -282,7 +282,7 @@ final class ApiController extends Controller $costType->sign = $request->getDataInt('sign') ?? -1; $costType->isLoan = $request->getDataBool('is_loan') ?? false; $costType->setL11n( - $request->getDataString('title') ?? '', + $request->getDataString('content') ?? '', ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ); @@ -328,8 +328,8 @@ final class ApiController extends Controller private function validateCostTypeL11nCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = !$request->hasData('title')) - || ($val['type'] = !$request->hasData('type')) + if (($val['content'] = !$request->hasData('content')) + || ($val['ref'] = !$request->hasData('ref')) ) { return $val; } @@ -349,9 +349,9 @@ final class ApiController extends Controller private function createCostTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n { $costL11n = new BaseStringL11n(); - $costL11n->ref = $request->getDataInt('type') ?? 0; + $costL11n->ref = $request->getDataInt('ref') ?? 0; $costL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language; - $costL11n->content = $request->getDataString('title') ?? ''; + $costL11n->content = $request->getDataString('content') ?? ''; return $costL11n; }