Jingga/oms-Accounting
1
0
Fork 0
mirror of https://github.com/Karaka-Management/oms-Accounting.git synced 2026-02-14 03:28: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 c9b98394c4
commit 35dbf113fe
3 changed files with 26 additions and 20 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.

28
Controller/ApiController.php
View File

@ -66,7 +66,7 @@ final class ApiController extends Controller
private function validateAccountCreate(RequestAbstract $request) : array private function validateAccountCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -123,7 +123,7 @@ final class ApiController extends Controller
private function validateAccountUpdate(RequestAbstract $request) : array private function validateAccountUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }
@ -180,7 +180,7 @@ final class ApiController extends Controller
private function validateCostCenterCreate(RequestAbstract $request) : array private function validateCostCenterCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -237,7 +237,7 @@ final class ApiController extends Controller
private function validateCostCenterUpdate(RequestAbstract $request) : array private function validateCostCenterUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }
@ -294,7 +294,7 @@ final class ApiController extends Controller
private function validateCostObjectCreate(RequestAbstract $request) : array private function validateCostObjectCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -351,7 +351,7 @@ final class ApiController extends Controller
private function validateCostObjectUpdate(RequestAbstract $request) : array private function validateCostObjectUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }
@ -408,7 +408,7 @@ final class ApiController extends Controller
private function validateEntryCreate(RequestAbstract $request) : array private function validateEntryCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -465,7 +465,7 @@ final class ApiController extends Controller
private function validateEntryUpdate(RequestAbstract $request) : array private function validateEntryUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }
@ -522,7 +522,7 @@ final class ApiController extends Controller
private function validateRecurringEntryCreate(RequestAbstract $request) : array private function validateRecurringEntryCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -579,7 +579,7 @@ final class ApiController extends Controller
private function validateRecurringEntryUpdate(RequestAbstract $request) : array private function validateRecurringEntryUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }
@ -636,7 +636,7 @@ final class ApiController extends Controller
private function validateTaxKeyCreate(RequestAbstract $request) : array private function validateTaxKeyCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -693,7 +693,7 @@ final class ApiController extends Controller
private function validateTaxKeyUpdate(RequestAbstract $request) : array private function validateTaxKeyUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }
@ -750,7 +750,7 @@ final class ApiController extends Controller
private function validateBatchEntryCreate(RequestAbstract $request) : array private function validateBatchEntryCreate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['name'] = empty($request->getData('name'))) if (($val['name'] = !$request->hasData('name'))
) { ) {
return $val; return $val;
} }
@ -807,7 +807,7 @@ final class ApiController extends Controller
private function validateBatchEntryUpdate(RequestAbstract $request) : array private function validateBatchEntryUpdate(RequestAbstract $request) : array
{ {
$val = []; $val = [];
if (($val['id'] = empty($request->getData('id'))) if (($val['id'] = !$request->hasData('id'))
) { ) {
return $val; return $val;
} }

4
tests/Controller/ApiControllerTest.php
View File

@ -58,7 +58,7 @@ final class ApiControllerTest extends \PHPUnit\Framework\TestCase
}; };
$this->app->dbPool = $GLOBALS['dbpool']; $this->app->dbPool = $GLOBALS['dbpool'];
$this->app->unitId = 1; $this->app->unitId = 1;
$this->app->accountManager = new AccountManager($GLOBALS['session']); $this->app->accountManager = new AccountManager($GLOBALS['session']);
$this->app->appSettings = new CoreSettings(); $this->app->appSettings = new CoreSettings();
$this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/'); $this->app->moduleManager = new ModuleManager($this->app, __DIR__ . '/../../../../Modules/');
@ -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