Jingga/oms-Organization
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Organization.git synced 2026-02-05 19:18:40 +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 c18883b7c8
commit 4f9a0ddb07
4 changed files with 31 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.github/user_bug_report.md vendored
View File

@ -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.

38
Controller/ApiController.php
View File

@ -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;
}

1
Models/Unit.php
View File

@ -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.
*

2
tests/Controller/ApiControllerTest.php
View File

@ -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