Jingga/oms-SupplierManagement
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-SupplierManagement.git synced 2026-01-11 01:18:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

autofixes

Browse Source
This commit is contained in:
Dennis Eichhorn 2024-04-07 17:47:07 +00:00
parent 87fd85dc5d
commit d9e6065a0b
3 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Admin/Routes/Web/Api.php
View File

@ -23,7 +23,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierFind', 'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierFind',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -36,7 +36,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -47,7 +47,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -60,7 +60,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -71,7 +71,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -84,7 +84,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeL11nCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeL11nCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -95,7 +95,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeL11nUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeTypeL11nUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -108,7 +108,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -119,7 +119,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -132,7 +132,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueL11nCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueL11nCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -143,7 +143,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueL11nUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiAttributeController:apiSupplierAttributeValueL11nUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -156,7 +156,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -167,7 +167,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -180,7 +180,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nTypeCreate', 'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nTypeCreate',
'verb' => RouteVerb::PUT, 'verb' => RouteVerb::PUT,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -191,7 +191,7 @@ return [
'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nTypeUpdate', 'dest' => '\Modules\SupplierManagement\Controller\ApiController:apiSupplierL11nTypeUpdate',
'verb' => RouteVerb::SET, 'verb' => RouteVerb::SET,
'csrf' => true, 'csrf' => true,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => ApiController::NAME, 'module' => ApiController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

18
Admin/Routes/Web/Backend.php
View File

@ -22,7 +22,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeTypeList', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeTypeList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -34,7 +34,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeType', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeType',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -46,7 +46,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeType', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeType',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
@ -58,7 +58,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeValue', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeValue',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -70,7 +70,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeValueCreate', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementAttributeValueCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
@ -82,7 +82,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierList', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierList',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -94,7 +94,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierCreate', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierCreate',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::CREATE, 'type' => PermissionType::CREATE,
@ -106,7 +106,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierView', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierView',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,
@ -118,7 +118,7 @@ return [
[ [
'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierAnalysis', 'dest' => '\Modules\SupplierManagement\Controller\BackendController:viewSupplierManagementSupplierAnalysis',
'verb' => RouteVerb::GET, 'verb' => RouteVerb::GET,
'active' => true, 'active' => true,
'permission' => [ 'permission' => [
'module' => BackendController::NAME, 'module' => BackendController::NAME,
'type' => PermissionType::READ, 'type' => PermissionType::READ,

56
Controller/BackendController.php
View File

@ -324,8 +324,8 @@ final class BackendController extends Controller
->executeGetArray() ->executeGetArray()
: []; : [];
/** @var \Modules\Attribute\Models\AttributeType[] $tmp */ /** @var \Modules\Attribute\Models\AttributeType[] $tmp */
$tmp = SupplierAttributeTypeMapper::getAll() $tmp = SupplierAttributeTypeMapper::getAll()
->with('defaults') ->with('defaults')
->with('defaults/l11n') ->with('defaults/l11n')
->where('name', [ ->where('name', [
@ -337,15 +337,15 @@ final class BackendController extends Controller
->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language)) ->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
->executeGetArray(); ->executeGetArray();
$defaultAttributeTypes = []; $defaultAttributeTypes = [];
foreach ($tmp as $t) { foreach ($tmp as $t) {
$defaultAttributeTypes[$t->name] = $t; $defaultAttributeTypes[$t->name] = $t;
} }
$view->data['defaultAttributeTypes'] = $defaultAttributeTypes; $view->data['defaultAttributeTypes'] = $defaultAttributeTypes;
/** @var \Modules\Attribute\Models\AttributeType[] $tmp */ /** @var \Modules\Attribute\Models\AttributeType[] $tmp */
$tmp = SupplierAttributeTypeMapper::getAll() $tmp = SupplierAttributeTypeMapper::getAll()
->with('defaults') ->with('defaults')
->with('defaults/l11n') ->with('defaults/l11n')
->where('name', [ ->where('name', [
@ -357,47 +357,47 @@ final class BackendController extends Controller
->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language)) ->orWhere(SupplierAttributeValueL11nMapper::getColumnByMember('language') ?? '', '=', $response->header->l11n->language))
->executeGetArray(); ->executeGetArray();
$supplierSegmentationTypes = []; $supplierSegmentationTypes = [];
foreach ($tmp as $t) { foreach ($tmp as $t) {
$supplierSegmentationTypes[$t->name] = $t; $supplierSegmentationTypes[$t->name] = $t;
} }
$view->data['supplierSegmentationTypes'] = $supplierSegmentationTypes; $view->data['supplierSegmentationTypes'] = $supplierSegmentationTypes;
$logs = []; $logs = [];
if ($this->app->accountManager->get($request->header->account)->hasPermission( if ($this->app->accountManager->get($request->header->account)->hasPermission(
PermissionType::READ, PermissionType::READ,
$this->app->unitId, $this->app->unitId,
null, null,
self::NAME, self::NAME,
PermissionCategory::SUPPLIER_LOG, PermissionCategory::SUPPLIER_LOG,
) )
) { ) {
/** @var \Modules\Auditor\Models\Audit[] */ /** @var \Modules\Auditor\Models\Audit[] */
$logs = AuditMapper::getAll() $logs = AuditMapper::getAll()
->where('type', StringUtils::intHash(SupplierMapper::class)) ->where('type', StringUtils::intHash(SupplierMapper::class))
->where('module', 'SupplierManagement') ->where('module', 'SupplierManagement')
->where('ref', (string) $view->data['supplier']->id) ->where('ref', (string) $view->data['supplier']->id)
->executeGetArray(); ->executeGetArray();
} }
$view->data['logs'] = $logs; $view->data['logs'] = $logs;
// @todo join audit with files, attributes, localization, prices, notes, ... // @todo join audit with files, attributes, localization, prices, notes, ...
$view->data['files'] = MediaMapper::getAll() $view->data['files'] = MediaMapper::getAll()
->with('types') ->with('types')
->join('id', SupplierMapper::class, 'files') // id = media id, files = supplier relations ->join('id', SupplierMapper::class, 'files') // id = media id, files = supplier relations
->on('id', $view->data['supplier']->id, relation: 'files') // id = item id ->on('id', $view->data['supplier']->id, relation: 'files') // id = item id
->executeGetArray(); ->executeGetArray();
$view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response); $view->data['media-upload'] = new \Modules\Media\Theme\Backend\Components\Upload\BaseView($this->app->l11nManager, $request, $response);
$view->data['note'] = new \Modules\Editor\Theme\Backend\Components\Note\BaseView($this->app->l11nManager, $request, $response); $view->data['note'] = new \Modules\Editor\Theme\Backend\Components\Note\BaseView($this->app->l11nManager, $request, $response);
$view->data['address-component'] = new \Modules\Admin\Theme\Backend\Components\AddressEditor\AddressView($this->app->l11nManager, $request, $response); $view->data['address-component'] = new \Modules\Admin\Theme\Backend\Components\AddressEditor\AddressView($this->app->l11nManager, $request, $response);
$view->data['contact-component'] = new \Modules\Admin\Theme\Backend\Components\ContactEditor\ContactView($this->app->l11nManager, $request, $response); $view->data['contact-component'] = new \Modules\Admin\Theme\Backend\Components\ContactEditor\ContactView($this->app->l11nManager, $request, $response);
return $view; return $view;
} }
/** /**