Jingga/oms-Exchange
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Exchange.git synced 2026-02-17 18: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:25 +02:00
parent 769bc2d0e2
commit 6289f90cb3
3 changed files with 16 additions and 10 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.

10
Controller/ApiController.php
View File

@ -113,7 +113,7 @@ final class ApiController extends Controller
require_once $path; require_once $path;
$remoteConnection = new NullConnection(); $remoteConnection = new NullConnection();
if (!empty($request->getData('dbtype'))) { if ($request->hasData('dbtype')) {
$remoteConnection = ConnectionFactory::create([ $remoteConnection = ConnectionFactory::create([
'db' => (string) $request->getData('dbtype'), 'db' => (string) $request->getData('dbtype'),
'host' => $request->getDataString('dbhost'), 'host' => $request->getDataString('dbhost'),
@ -150,7 +150,7 @@ final class ApiController extends Controller
private function validateInterfaceInstall(RequestAbstract $request) : array private function validateInterfaceInstall(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = empty($request->getData('title'))) if (($val['title'] = !$request->hasData('title'))
|| ($val['files'] = empty($request->getFiles())) || ($val['files'] = empty($request->getFiles()))
) { ) {
return $val; return $val;
@ -404,9 +404,9 @@ final class ApiController extends Controller
private function validateSettingCreate(RequestAbstract $request) : array private function validateSettingCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['title'] = empty($request->getData('title'))) if (($val['title'] = !$request->hasData('title'))
|| ($val['id'] = empty($request->getData('id'))) || ($val['id'] = !$request->hasData('id'))
|| ($val['data'] = empty($request->getData('data'))) || ($val['data'] = !$request->hasData('data'))
) { ) {
return $val; return $val;
} }

2
tests/Controller/ApiControllerTest.php
View File

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