From 28862b9464d38b25581dfdd41c111976ecaadb87 Mon Sep 17 00:00:00 2001
From: Dennis Eichhorn <spl1nes.com@googlemail.com>
Date: Sat, 8 Apr 2023 04:36:26 +0200
Subject: [PATCH] fix billing process

---
 .../Install/Application/Shop/Application.php  | 12 +++-----
 Controller/ApiController.php                  | 28 +++++++++----------
 tests/Controller/ApiControllerTest.php        |  2 +-
 3 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/Admin/Install/Application/Shop/Application.php b/Admin/Install/Application/Shop/Application.php
index 896cf49..7051a18 100755
--- a/Admin/Install/Application/Shop/Application.php
+++ b/Admin/Install/Application/Shop/Application.php
@@ -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()
diff --git a/Controller/ApiController.php b/Controller/ApiController.php
index 5f82511..927f85e 100755
--- a/Controller/ApiController.php
+++ b/Controller/ApiController.php
@@ -67,8 +67,8 @@ final class ApiController extends Controller
     private function validateTicketCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
-            || ($val['plain'] = empty($request->getData('plain')))
+        if (($val['title'] = !$request->hasData('title'))
+            || ($val['plain'] = !$request->hasData('plain'))
         ) {
             return $val;
         }
@@ -204,7 +204,7 @@ final class ApiController extends Controller
         if (($val['status'] = !TaskStatus::isValidValue((int) $request->getData('status')))
             || ($val['due'] = !((bool) \strtotime((string) $request->getData('due'))))
             || ($val['ticket'] = !(\is_numeric($request->getData('ticket'))))
-            || ($val['forward'] = !(\is_numeric(empty($request->getData('forward')) ? $request->header->account : $request->getData('forward'))))
+            || ($val['forward'] = !(\is_numeric(!$request->hasData('forward') ? $request->header->account : $request->getData('forward'))))
         ) {
             return $val;
         }
@@ -393,7 +393,7 @@ final class ApiController extends Controller
     private function validateSupportAppCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['name'] = empty($request->getData('name')))) {
+        if (($val['name'] = !$request->hasData('name'))) {
             return $val;
         }
 
@@ -467,9 +467,9 @@ final class ApiController extends Controller
     private function validateTicketAttributeCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['type'] = empty($request->getData('type')))
-            || ($val['value'] = empty($request->getData('value')))
-            || ($val['ticket'] = empty($request->getData('ticket')))
+        if (($val['type'] = !$request->hasData('type'))
+            || ($val['value'] = !$request->hasData('value'))
+            || ($val['ticket'] = !$request->hasData('ticket'))
         ) {
             return $val;
         }
@@ -537,8 +537,8 @@ final class ApiController extends Controller
     private function validateTicketAttributeTypeL11nCreate(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;
         }
@@ -605,7 +605,7 @@ final class ApiController extends Controller
     private function validateTicketAttributeTypeCreate(RequestAbstract $request) : array
     {
         $val = [];
-        if (($val['title'] = empty($request->getData('title')))
+        if (($val['title'] = !$request->hasData('title'))
         ) {
             return $val;
         }
@@ -689,8 +689,8 @@ final class ApiController extends Controller
     private function validateTicketAttributeValueCreate(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;
         }
@@ -758,8 +758,8 @@ final class ApiController extends Controller
     private function validateTicketAttributeValueL11nCreate(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;
         }
diff --git a/tests/Controller/ApiControllerTest.php b/tests/Controller/ApiControllerTest.php
index 69b2c73..76b2d68 100755
--- a/tests/Controller/ApiControllerTest.php
+++ b/tests/Controller/ApiControllerTest.php
@@ -69,7 +69,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