Jingga/oms-OnlineResourceWatcher
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git synced 2026-02-17 16:38:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix billing process

Browse Source
This commit is contained in:
Dennis Eichhorn 2023-04-08 04:36:26 +02:00
parent dbdf8f5fb8
commit 8b5c3e11a8
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Controller/ApiController.php
View File

@ -102,8 +102,8 @@ final class ApiController extends Controller
private function validateResourceCreate(RequestAbstract $request) : array private function validateResourceCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = empty($request->getData('title'))) if (($val['title'] = !$request->hasData('title'))
|| ($val['uri'] = empty($request->getData('uri'))) || ($val['uri'] = !$request->hasData('uri'))
) { ) {
return $val; 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!!! // @todo: check if user is part of organization below AND has free resources to add!!!
$resource->organization = new NullAccount( $resource->organization = new NullAccount(
empty($request->getData('organization')) !$request->hasData('organization')
? 1 ? 1
: (int) ($request->getData('organization')) : (int) ($request->getData('organization'))
); );

2
Controller/BackendController.php
View File

@ -70,7 +70,7 @@ final class BackendController extends Controller
$member = \prev($split); $member = \prev($split);
if (!empty($request->getData('organizationUserList-f-' . $member . '-f1'))) { if ($request->hasData('organizationUserList-f-' . $member . '-f1')) {
$filterField[$member] = [ $filterField[$member] = [
'type' => $type, 'type' => $type,
'value1' => $request->getData('organizationUserList-f-' . $member . '-f1'), 'value1' => $request->getData('organizationUserList-f-' . $member . '-f1'),

2
tests/Controller/ApiControllerTest.php
View File

@ -69,7 +69,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
$permission = new AccountPermission(); $permission = new AccountPermission();
$permission->setUnit(1); $permission->setUnit(1);
$permission->setApp('backend'); $permission->setApp(2);
$permission->setPermission( $permission->setPermission(
PermissionType::READ PermissionType::READ
| PermissionType::CREATE | PermissionType::CREATE