Skip to content
Snippets Groups Projects
Commit 2e22bee9 authored by Florian Azizian's avatar Florian Azizian
Browse files

refactoring

parent 6c137074
No related branches found
No related tags found
No related merge requests found
...@@ -51,12 +51,10 @@ class NoteController ...@@ -51,12 +51,10 @@ class NoteController
} }
if (isset($data['entities_chosen'])) { if (isset($data['entities_chosen'])) {
if (!Validator::arrayType()->validate($data['entities_chosen'])) { if (!Validator::arrayType()->validate($data['entities_chosen'])) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request entities chosen']); return $response->withStatus(400)->withJson(['errors' => 'Bad Request entities chosen']);
} }
foreach($data['entities_chosen'] as $entityId) { foreach ($data['entities_chosen'] as $entityId) {
if ($entityId == null) { if ($entityId == null) {
return $response->withStatus(400)->withJson(['errors' => 'Bad Request entities chosen']); return $response->withStatus(400)->withJson(['errors' => 'Bad Request entities chosen']);
} }
...@@ -78,12 +76,13 @@ class NoteController ...@@ -78,12 +76,13 @@ class NoteController
//Insert relation note with entities in note_entities_table //Insert relation note with entities in note_entities_table
if (!empty($noteId) && !empty($data['entities_chosen'])) { if (!empty($noteId) && !empty($data['entities_chosen'])) {
foreach($data['entities_chosen'] as $entity) { foreach ($data['entities_chosen'] as $entity) {
NoteEntityModel::create( ['item_id' => $entity, 'note_id' => $noteId ]); NoteEntityModel::create(['item_id' => $entity, 'note_id' => $noteId ]);
} }
} }
HistoryController::add( [ HistoryController::add(
[
'tableName' => "notes", 'tableName' => "notes",
'recordId' => $noteId, 'recordId' => $noteId,
'eventType' => "ADD", 'eventType' => "ADD",
...@@ -113,7 +112,7 @@ class NoteController ...@@ -113,7 +112,7 @@ class NoteController
$date = $date->format('d-m-Y H:i'); $date = $date->format('d-m-Y H:i');
$pdf->Cell(0, 20, "{$user['firstname']} {$user['lastname']} : {$date}", 1, 2, 'C', false); $pdf->Cell(0, 20, "{$user['firstname']} {$user['lastname']} : {$date}", 1, 2, 'C', false);
$pdf->MultiCell(0, 20, $note['note_text'] ,1, 'L', false); $pdf->MultiCell(0, 20, $note['note_text'], 1, 'L', false);
$pdf->SetY($pdf->GetY() + 40); $pdf->SetY($pdf->GetY() + 40);
} }
$fileContent = $pdf->Output('', 'S'); $fileContent = $pdf->Output('', 'S');
......
...@@ -430,7 +430,7 @@ class UserController ...@@ -430,7 +430,7 @@ class UserController
return $response->withStatus(400)->withJson(['errors' => 'User not found']); return $response->withStatus(400)->withJson(['errors' => 'User not found']);
} }
foreach($data['redirectedBasketIds'] as $redirectedBasketId) { foreach ($data['redirectedBasketIds'] as $redirectedBasketId) {
$redirectedBasket = RedirectBasketModel::get(['select' => ['actual_user_id', 'owner_user_id', 'basket_id'], 'where' => ['id = ?'], 'data' => [$redirectedBasketId]]); $redirectedBasket = RedirectBasketModel::get(['select' => ['actual_user_id', 'owner_user_id', 'basket_id'], 'where' => ['id = ?'], 'data' => [$redirectedBasketId]]);
if (empty($redirectedBasket[0]) || ($redirectedBasket[0]['actual_user_id'] != $aArgs['id'] && $redirectedBasket[0]['owner_user_id'] != $aArgs['id'])) { if (empty($redirectedBasket[0]) || ($redirectedBasket[0]['actual_user_id'] != $aArgs['id'] && $redirectedBasket[0]['owner_user_id'] != $aArgs['id'])) {
DatabaseModel::rollbackTransaction(); DatabaseModel::rollbackTransaction();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment