Jingga/oms-QA
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-QA.git synced 2026-02-05 02:48: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 0c0b5cb10d
commit f73b35f372
4 changed files with 21 additions and 19 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.

12
Admin/Install/Application/QA/Application.php
View File

@ -153,18 +153,14 @@ final class Application
if (!($account instanceof NullAccount)) {
$response->header->l11n = $account->l11n;
} elseif ($this->app->sessionManager->get('language') !== null) {
} elseif ($this->app->sessionManager->get('language') !== null
&& $response->header->l11n->getLanguage() !== $this->app->sessionManager->get('language')
) {
$response->header->l11n
->loadFromLanguage(
$this->app->sessionManager->get('language'),
$this->app->sessionManager->get('country') ?? '*'
);
} elseif ($this->app->cookieJar->get('language') !== null) {
$response->header->l11n
->loadFromLanguage(
$this->app->cookieJar->get('language'),
$this->app->cookieJar->get('country') ?? '*'
);
}
if (!\in_array($response->getLanguage(), $this->config['language'])) {
@ -212,7 +208,7 @@ final class Application
$request->uri->getRoute(),
$request->getDataString('CSRF'),
$request->getRouteVerb(),
$this->app->appName,
$this->app->appId,
$this->app->unitId,
$account,
$request->getData()

12
Controller/ApiController.php
View File

@ -210,9 +210,9 @@ final class ApiController extends Controller
private function validateQAQuestionCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['title'] = empty($request->getData('title')))
|| ($val['plain'] = empty($request->getData('plain')))
|| ($val['language'] = empty($request->getData('language')))
if (($val['title'] = !$request->hasData('title'))
|| ($val['plain'] = !$request->hasData('plain'))
|| ($val['language'] = !$request->hasData('language'))
|| ($val['status'] = (
$request->hasData('status')
&& !QAQuestionStatus::isValidValue((int) $request->getData('status'))
@ -308,8 +308,8 @@ final class ApiController extends Controller
private function validateQAAnswerCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['plain'] = empty($request->getData('plain')))
|| ($val['question'] = empty($request->getData('question')))
if (($val['plain'] = !$request->hasData('plain'))
|| ($val['question'] = !$request->hasData('question'))
|| ($val['status'] = (
$request->hasData('status')
&& !QAAnswerStatus::isValidValue((int) $request->getData('status'))
@ -437,7 +437,7 @@ final class ApiController extends Controller
private function validateQAAppCreate(RequestAbstract $request) : array
{
$val = [];
if (($val['name'] = empty($request->getData('name')))) {
if (($val['name'] = !$request->hasData('name'))) {
return $val;
}

2
tests/Controller/ApiControllerTest.php
View File

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