Jingga/oms-Profile
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Profile.git synced 2026-02-13 14: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 2a7395010f
commit ed9792da40
3 changed files with 19 additions and 13 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 # Bug Description
A clear and concise description of what the bug is. A clear and concise description of what the bug is.
# How to Reproduce # How to Reproduce
Steps to reproduce the behavior: Steps to reproduce the behavior:
1. Go to '...' 1. Go to '...'
@ -19,16 +21,20 @@ Steps to reproduce the behavior:
4. See error 4. See error
# Expected Behavior # Expected Behavior
A clear and concise description of what you expected to happen. A clear and concise description of what you expected to happen.
# Screenshots # Screenshots
If applicable, add screenshots to help explain your problem. If applicable, add screenshots to help explain your problem.
# System Information # System Information
- System: [e.g. PC or iPhone11, ...]
- OS: [e.g. iOS] - System: [e.g. PC or iPhone11, ...]
- Browser [e.g. chrome, safari] - OS: [e.g. iOS]
- KarakaVersion [e.g. 22] - Browser [e.g. chrome, safari]
- KarakaVersion [e.g. 22]
# Additional Information # Additional Information
Add any other context about the problem here. Add any other context about the problem here.

16
Controller/ApiController.php
View File

@ -17,8 +17,8 @@ namespace Modules\Profile\Controller;
use Modules\Admin\Models\AccountMapper; use Modules\Admin\Models\AccountMapper;
use Modules\Admin\Models\Address; use Modules\Admin\Models\Address;
use Modules\Admin\Models\AddressMapper; use Modules\Admin\Models\AddressMapper;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\MediaMapper; use Modules\Media\Models\MediaMapper;
use Modules\Media\Models\NullMedia;
use Modules\Media\Models\PathSettings; use Modules\Media\Models\PathSettings;
use Modules\Profile\Models\ContactElement; use Modules\Profile\Models\ContactElement;
use Modules\Profile\Models\ContactElementMapper; use Modules\Profile\Models\ContactElementMapper;
@ -271,10 +271,10 @@ final class ApiController extends Controller
public function validateContactElementCreate(RequestAbstract $request) : array public function validateContactElementCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['account'] = (empty($request->getData('account')) && empty($request->getData('profile')))) if (($val['account'] = (!$request->hasData('account') && !$request->hasData('profile')))
|| ($val['type'] = !\is_numeric($request->getData('type'))) || ($val['type'] = !\is_numeric($request->getData('type')))
|| ($val['content'] = empty($request->getData('content'))) || ($val['content'] = !$request->hasData('content'))
|| ($val['contact'] = empty($request->getData('contact'))) || ($val['contact'] = !$request->hasData('contact'))
) { ) {
return $val; return $val;
} }
@ -356,11 +356,11 @@ final class ApiController extends Controller
private function validateAddressCreate(RequestAbstract $request) : array private function validateAddressCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['account'] = (empty($request->getData('account')) && empty($request->getData('profile')))) if (($val['account'] = (!$request->hasData('account') && !$request->hasData('profile')))
|| ($val['type'] = !\is_numeric($request->getData('type'))) || ($val['type'] = !\is_numeric($request->getData('type')))
|| ($val['country'] = empty($request->getData('country'))) || ($val['country'] = !$request->hasData('country'))
|| ($val['city'] = empty($request->getData('city'))) || ($val['city'] = !$request->hasData('city'))
|| ($val['address'] = empty($request->getData('address'))) || ($val['address'] = !$request->hasData('address'))
) { ) {
return $val; return $val;
} }

2
tests/Controller/ApiControllerTest.php
View File

@ -73,7 +73,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