From 4f9a0ddb070c994512ab493175949f6abdd72ce7 Mon Sep 17 00:00:00 2001 From: Dennis Eichhorn Date: Sat, 8 Apr 2023 04:36:26 +0200 Subject: [PATCH] fix billing process --- .github/user_bug_report.md | 14 +++++++--- Controller/ApiController.php | 38 +++++++++++++------------- Models/Unit.php | 1 + tests/Controller/ApiControllerTest.php | 2 +- 4 files changed, 31 insertions(+), 24 deletions(-) diff --git a/.github/user_bug_report.md b/.github/user_bug_report.md index 9e5f2a5..4b92a8e 100755 --- a/.github/user_bug_report.md +++ b/.github/user_bug_report.md @@ -8,9 +8,11 @@ assignees: '' --- # Bug Description + A clear and concise description of what the bug is. # How to Reproduce + Steps to reproduce the behavior: 1. Go to '...' @@ -19,16 +21,20 @@ Steps to reproduce the behavior: 4. See error # Expected Behavior + A clear and concise description of what you expected to happen. # Screenshots + If applicable, add screenshots to help explain your problem. # System Information - - System: [e.g. PC or iPhone11, ...] - - OS: [e.g. iOS] - - Browser [e.g. chrome, safari] - - KarakaVersion [e.g. 22] + +- System: [e.g. PC or iPhone11, ...] +- OS: [e.g. iOS] +- Browser [e.g. chrome, safari] +- KarakaVersion [e.g. 22] # Additional Information + Add any other context about the problem here. diff --git a/Controller/ApiController.php b/Controller/ApiController.php index 630c00f..7222fda 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -78,9 +78,9 @@ final class ApiController extends Controller private function validateUnitCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) || ($val['parent'] = ( - !empty($request->getData('parent')) + $request->hasData('parent') && !\is_numeric($request->getData('parent')) )) || ($val['status'] = ( @@ -290,8 +290,8 @@ final class ApiController extends Controller private function validateUnitMainAddressSet(RequestAbstract $request) : array { $val = []; - if (($val['unit'] = empty($request->getData('unit'))) - || ($val['address'] = empty($request->getData('address'))) + if (($val['unit'] = !$request->hasData('unit')) + || ($val['address'] = !$request->hasData('address')) ) { return $val; } @@ -434,9 +434,9 @@ final class ApiController extends Controller private function validatePositionCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) || ($val['parent'] = ( - !empty($request->getData('parent')) + $request->hasData('parent') && !\is_numeric($request->getData('parent')) )) || ($val['status'] = ( @@ -610,9 +610,9 @@ final class ApiController extends Controller private function validateDepartmentCreate(RequestAbstract $request) : array { $val = []; - if (($val['name'] = empty($request->getData('name'))) + if (($val['name'] = !$request->hasData('name')) || ($val['parent'] = ( - !empty($request->getData('parent')) + $request->hasData('parent') && !\is_numeric($request->getData('parent')) )) || ($val['unit'] = ( @@ -925,9 +925,9 @@ final class ApiController extends Controller private function validateUnitAttributeCreate(RequestAbstract $request) : array { $val = []; - if (($val['type'] = empty($request->getData('type'))) - || ($val['value'] = (empty($request->getData('value')) && empty($request->getData('custom')))) - || ($val['unit'] = empty($request->getData('unit'))) + if (($val['type'] = !$request->hasData('type')) + || ($val['value'] = (!$request->hasData('value') && !$request->hasData('custom'))) + || ($val['unit'] = !$request->hasData('unit')) ) { return $val; } @@ -995,8 +995,8 @@ final class ApiController extends Controller private function validateUnitAttributeTypeL11nCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title'))) - || ($val['type'] = empty($request->getData('type'))) + if (($val['title'] = !$request->hasData('title')) + || ($val['type'] = !$request->hasData('type')) ) { return $val; } @@ -1066,8 +1066,8 @@ final class ApiController extends Controller private function validateUnitAttributeTypeCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title'))) - || ($val['name'] = empty($request->getData('name'))) + if (($val['title'] = !$request->hasData('title')) + || ($val['name'] = !$request->hasData('name')) ) { return $val; } @@ -1154,8 +1154,8 @@ final class ApiController extends Controller private function validateUnitAttributeValueCreate(RequestAbstract $request) : array { $val = []; - if (($val['type'] = empty($request->getData('type'))) - || ($val['value'] = empty($request->getData('value'))) + if (($val['type'] = !$request->hasData('type')) + || ($val['value'] = !$request->hasData('value')) ) { return $val; } @@ -1223,8 +1223,8 @@ final class ApiController extends Controller private function validateUnitAttributeValueL11nCreate(RequestAbstract $request) : array { $val = []; - if (($val['title'] = empty($request->getData('title'))) - || ($val['value'] = empty($request->getData('value'))) + if (($val['title'] = !$request->hasData('title')) + || ($val['value'] = !$request->hasData('value')) ) { return $val; } diff --git a/Models/Unit.php b/Models/Unit.php index 05531e1..c57ad30 100755 --- a/Models/Unit.php +++ b/Models/Unit.php @@ -18,6 +18,7 @@ use Modules\Admin\Models\Address; use Modules\Admin\Models\NullAddress; use Modules\Media\Models\Media; use Modules\Media\Models\NullMedia; + /** * Organization unit class. * diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php index 34c013c..9f7f441 100755 --- a/tests/Controller/ApiControllerTest.php +++ b/tests/Controller/ApiControllerTest.php @@ -66,7 +66,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