Jingga/oms-WarehouseManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-WarehouseManagement.git synced 2026-01-10 14:48:42 +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:41 +00:00
parent 2ae4d7fe62
commit a8f11dbf7c
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Admin/Installer.php
View File

@ -108,7 +108,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('language', \array_keys($type['l11n'])[0] ?? 'en');
$module->apiStockTypeCreate($request, $response);
@ -135,9 +135,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', $stockType['id']);
$request->setData('ref', $stockType['id']);
$module->apiStockTypeL11nCreate($request, $response);
}

20
Controller/ApiAttributeController.php
View File

@ -158,9 +158,9 @@ final class ApiAttributeController extends Controller
private function createLotAttributeTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('type') ?? 0;
$attrL11n->ref = $request->getDataInt('ref') ?? 0;
$attrL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$attrL11n->content = $request->getDataString('title') ?? '';
$attrL11n->content = $request->getDataString('content') ?? '';
return $attrL11n;
}
@ -177,8 +177,8 @@ final class ApiAttributeController extends Controller
private function validateLotAttributeTypeL11nCreate(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;
}
@ -230,7 +230,7 @@ final class ApiAttributeController extends Controller
$attrType->isRequired = $request->getDataBool('is_required') ?? false;
$attrType->validationPattern = $request->getDataString('validation_pattern') ?? '';
$attrType->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
$attrType->setFields($request->getDataInt('fields') ?? 0);
@ -250,7 +250,7 @@ final class ApiAttributeController extends Controller
private function validateLotAttributeTypeCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = !$request->hasData('title'))
if (($val['content'] = !$request->hasData('content'))
|| ($val['name'] = !$request->hasData('name'))
) {
return $val;
@ -316,9 +316,9 @@ final class ApiAttributeController extends Controller
$attrValue->isDefault = $request->getDataBool('default') ?? false;
$attrValue->setValue($request->getDataString('value'), $type->datatype);
if ($request->hasData('title')) {
if ($request->hasData('content')) {
$attrValue->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
}
@ -386,9 +386,9 @@ final class ApiAttributeController extends Controller
private function createLotAttributeValueL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$attrL11n = new BaseStringL11n();
$attrL11n->ref = $request->getDataInt('value') ?? 0;
$attrL11n->ref = $request->getDataInt('ref') ?? 0;
$attrL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$attrL11n->content = $request->getDataString('title') ?? '';
$attrL11n->content = $request->getDataString('content') ?? '';
return $attrL11n;
}

12
Controller/ApiStockTypeController.php
View File

@ -75,7 +75,7 @@ final class ApiStockTypeController extends Controller
$stockType = new StockType();
$stockType->name = $request->getDataString('name') ?? '';
$stockType->setL11n(
$request->getDataString('title') ?? '',
$request->getDataString('content') ?? '',
ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? ISO639x1Enum::_EN
);
@ -94,7 +94,7 @@ final class ApiStockTypeController extends Controller
private function validateStockTypeCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = !$request->hasData('title'))
if (($val['content'] = !$request->hasData('content'))
|| ($val['name'] = !$request->hasData('name'))
) {
return $val;
@ -142,9 +142,9 @@ final class ApiStockTypeController extends Controller
private function createStockTypeL11nFromRequest(RequestAbstract $request) : BaseStringL11n
{
$stockTypeL11n = new BaseStringL11n();
$stockTypeL11n->ref = $request->getDataInt('type') ?? 0;
$stockTypeL11n->ref = $request->getDataInt('ref') ?? 0;
$stockTypeL11n->language = ISO639x1Enum::tryFromValue($request->getDataString('language')) ?? $request->header->l11n->language;
$stockTypeL11n->content = $request->getDataString('title') ?? '';
$stockTypeL11n->content = $request->getDataString('content') ?? '';
return $stockTypeL11n;
}
@ -161,8 +161,8 @@ final class ApiStockTypeController extends Controller
private function validateStockTypeL11nCreate(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;
}

3
Theme/Backend/stock-type-view.tpl.php
View File

@ -54,7 +54,8 @@ echo $this->data['nav']->render();
<?= $this->data['l11nView']->render(
$this->data['l11nValues'],
[],
'{/api}warehouse/stock/type/l11n?csrf={$CSRF}'
'{/api}warehouse/stock/type/l11n?csrf={$CSRF}',
(string) $type->id
);
?>
</div>