Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-02-15 09:18:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

l11n, unit/app and simplification fixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-01-07 19:00:32 +01:00
parent bac165d21d
commit c41acd4832
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Controller/ApiController.php
View File

@ -116,11 +116,11 @@ final class ApiController extends Controller
if (!empty($request->getData('dbtype'))) { if (!empty($request->getData('dbtype'))) {
$remoteConnection = ConnectionFactory::create([ $remoteConnection = ConnectionFactory::create([
'db' => (string) $request->getData('dbtype'), 'db' => (string) $request->getData('dbtype'),
'host' => $request->hasData('dbhost') ? (string) $request->getData('dbhost') : null, 'host' => $request->getData('dbhost', 'string'),
'port' => $request->hasData('dbport') ? (int) $request->getData('dbport') : null, 'port' => $request->getData('dbport', 'int'),
'database' => $request->hasData('dbdatabase') ? (string) $request->getData('dbdatabase') : null, 'database' => $request->getData('dbdatabase', 'string'),
'login' => $request->hasData('dblogin') ? (string) $request->getData('dblogin') : null, 'login' => $request->getData('dblogin', 'string'),
'password' => $request->hasData('dbpassword') ? (string) $request->getData('dbpassword') : null, 'password' => $request->getData('dbpassword', 'string'),
]); ]);
} }

22
Interfaces/GSD/Importer.php
View File

@ -36,7 +36,7 @@ use Modules\Exchange\Interfaces\GSD\Model\GSDSupplierMapper;
use Modules\Exchange\Models\ImporterAbstract; use Modules\Exchange\Models\ImporterAbstract;
use Modules\ItemManagement\Models\Item; use Modules\ItemManagement\Models\Item;
use Modules\ItemManagement\Models\ItemAttributeType; use Modules\ItemManagement\Models\ItemAttributeType;
use Modules\ItemManagement\Models\ItemAttributeTypeL11n; use phpOMS\Localization\BaseStringL11n;
use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper; use Modules\ItemManagement\Models\ItemAttributeTypeL11nMapper;
use Modules\ItemManagement\Models\ItemAttributeTypeMapper; use Modules\ItemManagement\Models\ItemAttributeTypeMapper;
use Modules\ItemManagement\Models\ItemAttributeValue; use Modules\ItemManagement\Models\ItemAttributeValue;
@ -548,40 +548,40 @@ final class Importer extends ImporterAbstract
$itemAttrType['tradegroup'] = new ItemAttributeType('tradegroup'); $itemAttrType['tradegroup'] = new ItemAttributeType('tradegroup');
ItemAttributeTypeMapper::create()->execute($itemAttrType['tradegroup']); ItemAttributeTypeMapper::create()->execute($itemAttrType['tradegroup']);
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['tradegroup']->getId(), 'Trade Group', ISO639x1Enum::_EN)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['tradegroup']->getId(), 'Trade Group', ISO639x1Enum::_EN));
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['tradegroup']->getId(), 'Handelsgruppe', ISO639x1Enum::_DE)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['tradegroup']->getId(), 'Handelsgruppe', ISO639x1Enum::_DE));
} }
if (($itemAttrType['exportcontrolgroup'] = ItemAttributeTypeMapper::get()->where('name', 'exportcontrolgroup')->execute()) instanceof NullItemAttributeType) { if (($itemAttrType['exportcontrolgroup'] = ItemAttributeTypeMapper::get()->where('name', 'exportcontrolgroup')->execute()) instanceof NullItemAttributeType) {
$itemAttrType['exportcontrolgroup'] = new ItemAttributeType('exportcontrolgroup'); $itemAttrType['exportcontrolgroup'] = new ItemAttributeType('exportcontrolgroup');
ItemAttributeTypeMapper::create()->execute($itemAttrType['exportcontrolgroup']); ItemAttributeTypeMapper::create()->execute($itemAttrType['exportcontrolgroup']);
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['exportcontrolgroup']->getId(), 'Export Control Group', ISO639x1Enum::_EN)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['exportcontrolgroup']->getId(), 'Export Control Group', ISO639x1Enum::_EN));
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['exportcontrolgroup']->getId(), 'Exportkontrollgruppe', ISO639x1Enum::_DE)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['exportcontrolgroup']->getId(), 'Exportkontrollgruppe', ISO639x1Enum::_DE));
} }
if (($itemAttrType['medicalgroup'] = ItemAttributeTypeMapper::get()->where('name', 'medicalgroup')->execute()) instanceof NullItemAttributeType) { if (($itemAttrType['medicalgroup'] = ItemAttributeTypeMapper::get()->where('name', 'medicalgroup')->execute()) instanceof NullItemAttributeType) {
$itemAttrType['medicalgroup'] = new ItemAttributeType('medicalgroup'); $itemAttrType['medicalgroup'] = new ItemAttributeType('medicalgroup');
ItemAttributeTypeMapper::create()->execute($itemAttrType['medicalgroup']); ItemAttributeTypeMapper::create()->execute($itemAttrType['medicalgroup']);
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['medicalgroup']->getId(), 'Medical Device Group', ISO639x1Enum::_EN)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['medicalgroup']->getId(), 'Medical Device Group', ISO639x1Enum::_EN));
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['medicalgroup']->getId(), 'Medezinproduktklasse', ISO639x1Enum::_DE)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['medicalgroup']->getId(), 'Medezinproduktklasse', ISO639x1Enum::_DE));
} }
if (($itemAttrType['customsnumber'] = ItemAttributeTypeMapper::get()->where('name', 'customsnumber')->execute()) instanceof NullItemAttributeType) { if (($itemAttrType['customsnumber'] = ItemAttributeTypeMapper::get()->where('name', 'customsnumber')->execute()) instanceof NullItemAttributeType) {
$itemAttrType['customsnumber'] = new ItemAttributeType('customsnumber'); $itemAttrType['customsnumber'] = new ItemAttributeType('customsnumber');
ItemAttributeTypeMapper::create()->execute($itemAttrType['customsnumber']); ItemAttributeTypeMapper::create()->execute($itemAttrType['customsnumber']);
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['customsnumber']->getId(), 'Customs Number', ISO639x1Enum::_EN)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['customsnumber']->getId(), 'Customs Number', ISO639x1Enum::_EN));
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['customsnumber']->getId(), 'Zolltarifnummer', ISO639x1Enum::_DE)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['customsnumber']->getId(), 'Zolltarifnummer', ISO639x1Enum::_DE));
} }
if (($itemAttrType['unnumber'] = ItemAttributeTypeMapper::get()->where('name', 'unnumber')->execute()) instanceof NullItemAttributeType) { if (($itemAttrType['unnumber'] = ItemAttributeTypeMapper::get()->where('name', 'unnumber')->execute()) instanceof NullItemAttributeType) {
$itemAttrType['unnumber'] = new ItemAttributeType('unnumber'); $itemAttrType['unnumber'] = new ItemAttributeType('unnumber');
ItemAttributeTypeMapper::create()->execute($itemAttrType['unnumber']); ItemAttributeTypeMapper::create()->execute($itemAttrType['unnumber']);
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['unnumber']->getId(), 'UN-Number', ISO639x1Enum::_EN)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['unnumber']->getId(), 'UN-Number', ISO639x1Enum::_EN));
ItemAttributeTypeL11nMapper::create()->execute(new ItemAttributeTypeL11n($itemAttrType['unnumber']->getId(), 'UN-Nummer', ISO639x1Enum::_DE)); ItemAttributeTypeL11nMapper::create()->execute(new BaseStringL11n($itemAttrType['unnumber']->getId(), 'UN-Nummer', ISO639x1Enum::_DE));
} }
return $itemAttrType; return $itemAttrType;