mirror of
https://github.com/Karaka-Management/oms-OnlineResourceWatcher.git
synced 2026-02-09 21:08:41 +00:00
fix billing process
This commit is contained in:
parent
dbdf8f5fb8
commit
8b5c3e11a8
|
|
@ -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'))
|
||||
);
|
||||
|
|
|
|||
|
|
@ -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'),
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user