diff --git a/Web/Models/Entities/TicketComment.php b/Web/Models/Entities/TicketComment.php index e85515b9..1f54fa92 100644 --- a/Web/Models/Entities/TicketComment.php +++ b/Web/Models/Entities/TicketComment.php @@ -113,5 +113,18 @@ class TicketComment extends RowModel return $this->getRecord()->mark; } + function isLikedByUser(): ?bool + { + $mark = $this->getMark(); + + if($mark === 0) { + return false; + } elseif ($mark === 1) { + return true; + } elseif ($mark === null) { + return null; + } + } + use Traits\TRichText; } diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php index 94467b09..683a9597 100644 --- a/Web/Presenters/SupportPresenter.php +++ b/Web/Presenters/SupportPresenter.php @@ -232,24 +232,18 @@ final class SupportPresenter extends OpenVKPresenter $this->assertUserLoggedIn(); $comment = $this->comments->get($id); + if($this->user->id === $this->tickets->get($comment->getTicketId())->getUser()->getId()) { - if($mark === 1 || $mark === 2) {} - $comments->setMark($mark); - $comments->save(); - if($mark === 1) { - // $this->flashFail("succ", tr("information_-1"), tr("support_rated_good")); - exit(header("HTTP/1.1 200 OK")); - } elseif($mark === 2) { - // $this->flashFail("succ", tr("information_-1"), tr("support_rated_bad")); - exit(header("HTTP/1.1 200 OK")); - } - } else { - // $this->flashFail("err", tr("error"), tr("wrong_parameters")); + $comments->setMark($mark); + $comments->save(); + + if($mark === 1 || $mark === 2) { + exit(header("HTTP/1.1 200 OK")); + } else { exit(header("HTTP/1.1 400 Bad Request")); - } + } } else { - // $this->flashFail("err", tr("error"), tr("forbidden")); exit(header("HTTP/1.1 403 Forbidden")); } } -} +} \ No newline at end of file diff --git a/Web/Presenters/templates/Support/AnswerTicket.xml b/Web/Presenters/templates/Support/AnswerTicket.xml index 5938d8a5..b7fb1b4b 100644 --- a/Web/Presenters/templates/Support/AnswerTicket.xml +++ b/Web/Presenters/templates/Support/AnswerTicket.xml @@ -110,12 +110,12 @@ {/if} - {if $comment->getUType() === 1 && $comment->getMark() != null}} + {if $comment->getUType() === 1}
{/if} - {if $comment->getUType() === 1 && $comment->getMark() != null}} + {if $comment->getUType() === 1}