diff --git a/Admin/Install/Application/Shop/info.json b/Admin/Install/Application/Shop/info.json index 3be73ac..d477bc1 100755 --- a/Admin/Install/Application/Shop/info.json +++ b/Admin/Install/Application/Shop/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "The shop application.", "directory": "Shop", diff --git a/Controller/ApiController.php b/Controller/ApiController.php index e7a3865..012c3f6 100755 --- a/Controller/ApiController.php +++ b/Controller/ApiController.php @@ -26,7 +26,6 @@ use Modules\Support\Models\TicketMapper; use Modules\Tasks\Models\TaskElementMapper; use Modules\Tasks\Models\TaskMapper; use Modules\Tasks\Models\TaskStatus; -use Modules\Tasks\Models\TaskType; use phpOMS\Message\Http\RequestStatusCode; use phpOMS\Message\RequestAbstract; use phpOMS\Message\ResponseAbstract; @@ -232,7 +231,7 @@ final class ApiController extends Controller private function createTicketFromRequest(RequestAbstract $request) : Ticket { $request->setData('redirect', 'support/ticket/view?for={$id}'); - $task = $this->app->moduleManager->get('Tasks', 'Api')->createTaskFromRequest($request); + $task = $this->app->moduleManager->get('Tasks', 'Api')->createTaskFromRequest($request); $ticket = new Ticket($task); $ticket->app = new NullSupportApp($request->getDataInt('app') ?? 1); @@ -393,7 +392,11 @@ final class ApiController extends Controller $this->app->moduleManager->get('Tasks')->apiTaskElementSet($request, $response); /** @var \Modules\Tasks\Models\TaskElement $new */ - $new = $response->getDataArray($request->uri->__toString())['response']; + $new = $response->getDataArray($request->uri->__toString())['response'] ?? null; + if ($new === null) { + $response->header->status = RequestStatusCode::R_400; + $this->createInvalidUpdateResponse($request, $response, $new); + } $ticket = TicketMapper::get() ->with('task') @@ -503,7 +506,12 @@ final class ApiController extends Controller } /** @var \Modules\Editor\Models\EditorDoc $model */ - $model = $response->getDataArray($request->uri->__toString())['response']; + $model = $response->getDataArray($request->uri->__toString())['response'] ?? null; + if ($model === null) { + $response->header->status = RequestStatusCode::R_400; + $this->createInvalidUpdateResponse($request, $response, $model); + } + $this->createModelRelation($request->header->account, $request->getDataInt('id'), $model->id, TicketMapper::class, 'notes', '', $request->getOrigin()); } diff --git a/Docs/Dev/en/structure.md b/Docs/Dev/en/structure.md deleted file mode 100755 index a42535f..0000000 --- a/Docs/Dev/en/structure.md +++ /dev/null @@ -1,5 +0,0 @@ -# Structure - -## ER - -![ER](Modules/Support/Docs/Dev/img/er.png) \ No newline at end of file diff --git a/Docs/Dev/img/er.png b/Docs/Dev/img/er.png deleted file mode 100644 index 2befc58..0000000 Binary files a/Docs/Dev/img/er.png and /dev/null differ diff --git a/info.json b/info.json index 455b7c2..dedb9ad 100755 --- a/info.json +++ b/info.json @@ -12,7 +12,7 @@ }, "creator": { "name": "Jingga", - "website": "jingga.app" + "website": "https://jingga.app" }, "description": "Support module.", "directory": "Support", diff --git a/tests/Models/TicketTest.php b/tests/Models/TicketTest.php index b9378a2..3876ff2 100755 --- a/tests/Models/TicketTest.php +++ b/tests/Models/TicketTest.php @@ -15,7 +15,6 @@ declare(strict_types=1); namespace Modules\Support\tests\Models; use Modules\Support\Models\Ticket; -use Modules\Support\Models\TicketElement; /** * @internal @@ -51,7 +50,7 @@ final class TicketTest extends \PHPUnit\Framework\TestCase self::assertEquals( [ - 'id' => 0, + 'id' => 0, ], $serialized );