From 8b5c3e11a8acd9c56b9551dac62d8d849d889fab Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 8 Apr 2023 04:36:26 +0200 Subject: [PATCH] fix billing process --- Controller/ApiController.php | 6 +++--- Controller/BackendController.php | 2 +- tests/Controller/ApiControllerTest.php | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Controller/ApiController.php b/Controller/ApiController.php index a811229..c4c83a0 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -102,8 +102,8 @@ final class ApiController extends Controller private function validateResourceCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title'))) - || ($val['uri'] = empty($request->getData('uri'))) + if (($val['title'] = !$request->hasData('title')) + || ($val['uri'] = !$request->hasData('uri')) ) { return $val; } @@ -158,7 +158,7 @@ final class ApiController extends Controller // @todo: check if user is part of organization below AND has free resources to add!!! $resource->organization = new NullAccount( - empty($request->getData('organization')) + !$request->hasData('organization') ? 1 : (int) ($request->getData('organization')) ); diff --git a/Controller/BackendController.php b/Controller/BackendController.php index 1dceac5..4cc14c6 100755 --- a/Controller/BackendController.php +++ b/Controller/BackendController.php @@ -70,7 +70,7 @@ final class BackendController extends Controller $member = \prev($split); - if (!empty($request->getData('organizationUserList-f-' . $member . '-f1'))) { + if ($request->hasData('organizationUserList-f-' . $member . '-f1')) { $filterField[$member] = [ 'type' => $type, 'value1' => $request->getData('organizationUserList-f-' . $member . '-f1'), diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index a37a7b8..4c92ad8 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -69,7 +69,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase $permission = new AccountPermission(); $permission->setUnit(1); - $permission->setApp('backend'); + $permission->setApp(2); $permission->setPermission( PermissionType::READ | PermissionType::CREATE