Jingga/oms-LoanManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-LoanManagement.git synced 2026-02-17 01:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fixes
Some checks failed
Image optimization / general_image_workflow (push) Has been cancelled
Details
CI / general_module_workflow_php (push) Has been cancelled
Details
CI / general_module_workflow_js (push) Has been cancelled
Details

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-10-11 19:17:40 +00:00
parent dc981a4f5d
commit bc509dcbf9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Installer.php
View File

@ -82,7 +82,7 @@ final class Installer extends InstallerAbstract
$request->header->account = 1; $request->header->account = 1;
$request->setData('name', $type['name'] ?? ''); $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('sign', $type['sign'] ?? -1);
$request->setData('is_loan', $type['isLoan'] ?? false); $request->setData('is_loan', $type['isLoan'] ?? false);
@ -108,9 +108,9 @@ final class Installer extends InstallerAbstract
$request = new HttpRequest(); $request = new HttpRequest();
$request->header->account = 1; $request->header->account = 1;
$request->setData('title', $l11n); $request->setData('content', $l11n);
$request->setData('language', $language); $request->setData('language', $language);
$request->setData('type', $costType[$type['name']]['id']); $request->setData('ref', $costType[$type['name']]['id']);
$module->apiLoanCostTypeL11nCreate($request, $response); $module->apiLoanCostTypeL11nCreate($request, $response);
} }

12
Controller/ApiController.php
View File

@ -257,7 +257,7 @@ final class ApiController extends Controller
private function validateCostTypeCreate(RequestAbstract $request) : array private function validateCostTypeCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = !$request->hasData('title')) if (($val['content'] = !$request->hasData('content'))
|| ($val['name'] = !$request->hasData('name')) || ($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
@ -282,7 +282,7 @@ final class ApiController extends Controller
$costType->sign = $request->getDataInt('sign') ?? -1; $costType->sign = $request->getDataInt('sign') ?? -1;
$costType->isLoan = $request->getDataBool('is_loan') ?? false; $costType->isLoan = $request->getDataBool('is_loan') ?? false;
$costType->setL11n( $costType->setL11n(
$request->getDataString('title') ?? '', $request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
); );
@ -328,8 +328,8 @@ final class ApiController extends Controller
private function validateCostTypeL11nCreate(RequestAbstract $request) : array private function validateCostTypeL11nCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = !$request->hasData('title')) if (($val['content'] = !$request->hasData('content'))
|| ($val['type'] = !$request->hasData('type')) || ($val['ref'] = !$request->hasData('ref'))
) { ) {
return $val; return $val;
} }
@ -349,9 +349,9 @@ final class ApiController extends Controller
private function createCostTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n private function createCostTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{ {
$costL11n = new 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->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$costL11n->content = $request->getDataString('title') ?? ''; $costL11n->content = $request->getDataString('content') ?? '';
return $costL11n; return $costL11n;
} }