From 7f46d683c3d086e04ed97b5d9bf243a94ef27443 Mon Sep 17 00:00:00 2001
From: n1rwana <aydashkin@vk.com>
Date: Fri, 11 Aug 2023 02:11:40 +0300
Subject: [PATCH] Support: Give users the ability to close tickets themselves
 (#925)

* User can close ticket (#879)

* Localization

* Update SupportPresenter.php

* Update View.xml
---
 Web/Presenters/SupportPresenter.php        | 24 ++++++++++++++++++++--
 Web/Presenters/templates/Support/Agent.xml |  3 +--
 Web/Presenters/templates/Support/List.xml  |  2 +-
 Web/Presenters/templates/Support/View.xml  | 13 ++++++++++++
 Web/routes.yml                             |  2 ++
 locales/en.strings                         |  7 +++++++
 locales/ru.strings                         |  6 ++++++
 7 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/Web/Presenters/SupportPresenter.php b/Web/Presenters/SupportPresenter.php
index c4d729ea..8163dbf8 100644
--- a/Web/Presenters/SupportPresenter.php
+++ b/Web/Presenters/SupportPresenter.php
@@ -385,7 +385,7 @@ final class SupportPresenter extends OpenVKPresenter
             $agent->setNumerate((int) $this->postParam("number") ?? NULL);
             $agent->setIcon($this->postParam("avatar"));
             $agent->save();
-            $this->flashFail("succ", "Успех", "Профиль отредактирован.");
+            $this->flashFail("succ", tr("agent_profile_edited"));
         } else {
             $agent = new SupportAgent;
             $agent->setAgent($this->user->identity->getId());
@@ -393,7 +393,27 @@ final class SupportPresenter extends OpenVKPresenter
             $agent->setNumerate((int) $this->postParam("number") ?? NULL);
             $agent->setIcon($this->postParam("avatar"));
             $agent->save();
-            $this->flashFail("succ", "Успех", "Профиль создан. Теперь пользователи видят Ваши псевдоним и аватарку вместо стандартных аватарки и номера.");
+            $this->flashFail("succ", tr("agent_profile_created_1"), tr("agent_profile_created_2"));
         }
     }
+
+    function renderCloseTicket(int $id): void
+    {
+        $this->assertUserLoggedIn();
+        $this->assertNoCSRF();
+        $this->willExecuteWriteAction();
+
+        $ticket = $this->tickets->get($id);
+
+        if($ticket->isDeleted() === 1 || $ticket->getType() === 2 || $ticket->getUserId() !== $this->user->id) {
+            header("HTTP/1.1 403 Forbidden");
+            header("Location: /support/view/" . $id);
+            exit;
+        }
+
+        $ticket->setType(2);
+        $ticket->save();
+
+        $this->flashFail("succ", tr("ticket_changed"), tr("ticket_changed_comment"));
+    }
 }
diff --git a/Web/Presenters/templates/Support/Agent.xml b/Web/Presenters/templates/Support/Agent.xml
index 987fb081..a229d763 100644
--- a/Web/Presenters/templates/Support/Agent.xml
+++ b/Web/Presenters/templates/Support/Agent.xml
@@ -55,7 +55,6 @@
                 <input name="name" type="text" value="{$agent->getCanonicalName()}" placeholder="{_helpdesk_agent} #777" />
                 <br/><br/>
                 <label for="number">{_helpdesk_show_number}?</label>
-                {$agent->isShowNumber()}
                 <select name="number">
                     <option value="1" n:attr="selected => $agent->isShowNumber() === 1 ? true : false">{_yes}</option>
                     <option value="0" n:attr="selected => $agent->isShowNumber() === 0 ? true : false">{_no}</option>
@@ -71,7 +70,7 @@
     </div>
 </div>
 {else}
-    <h4>Создать</h4>
+    <h4>{_create}</h4>
     <br/>
         <form method="post" action="/support/agent{$agent_id}/edit">
             <label for="name">{_helpdesk_showing_name}</label>
diff --git a/Web/Presenters/templates/Support/List.xml b/Web/Presenters/templates/Support/List.xml
index b2cefbfa..a1898eed 100644
--- a/Web/Presenters/templates/Support/List.xml
+++ b/Web/Presenters/templates/Support/List.xml
@@ -19,7 +19,7 @@
         <a n:attr="id => ($act === 'closed' ? 'act_tab_a' : 'ki')" href="?act=closed">{_support_closed}</a>
     </div>
     <div class="tab">
-        <a href="/support/agent{$thisUser->getId()}">Мой профиль</a>
+        <a href="/support/agent{$thisUser->getId()}">{_agent_profile}</a>
     </div>
 {/block}
 
diff --git a/Web/Presenters/templates/Support/View.xml b/Web/Presenters/templates/Support/View.xml
index b239c351..91a11fd4 100644
--- a/Web/Presenters/templates/Support/View.xml
+++ b/Web/Presenters/templates/Support/View.xml
@@ -27,6 +27,14 @@
         function errorHandler(id, mark) {
             document.getElementById("markText-" + id).innerHTML = {_error};
         }
+
+        function closeTicket() {
+            let url = `/support/ticket${{$ticket->getId()}}/close?hash=${{urlencode($csrfToken)}}`;
+            $.ajax(url, {
+                error: () => alert(tr("error")),
+                success: () => location.reload()
+            });
+        }
     </script>
 
     {if $ticket->isDeleted() == 0}
@@ -34,6 +42,11 @@
             <a href="#" style="font-size:13px;"><b>{$ticket->getName()}</b></a>
             <br />{_status}: {$ticket->getStatus()}
         </div>
+        {if $ticket->getType() === 1}
+            <div class="post-author" style="border-top: none; padding: 14px; margin-top: 14px;">
+                {_you_can_close_this_ticket_1} <a onClick="closeTicket()">{_you_can_close_this_ticket_2}</a>.
+            </div>
+        {/if}
         <div class="text" style="padding-top: 10px; border-bottom: #ECECEC solid 1px;">
             {$ticket->getText()|noescape}
             <br /></br>
diff --git a/Web/routes.yml b/Web/routes.yml
index d1a0e7ae..267c0608 100644
--- a/Web/routes.yml
+++ b/Web/routes.yml
@@ -35,6 +35,8 @@ routes:
       handler: "Support->agent"
     - url: "/support/agent{num}/edit"
       handler: "Support->editAgent"
+    - url: "/support/ticket{num}/close"
+      handler: "Support->closeTicket"
     - url: "/language"
       handler: "About->language"
     - url: "/language/{text}.js"
diff --git a/locales/en.strings b/locales/en.strings
index 1a7a8c72..ce4ac0bf 100644
--- a/locales/en.strings
+++ b/locales/en.strings
@@ -915,6 +915,13 @@
 "banned_in_support_1" = "Sorry, <b>$1</b>, but now you can't create tickets.";
 "banned_in_support_2" = "And the reason for this is simple: <b>$1</b>. Unfortunately, this time we had to take away this opportunity from you forever.";
 
+"you_can_close_this_ticket_1" = "If you have no more questions, you can ";
+"you_can_close_this_ticket_2" = "close this ticket";
+"agent_profile_created_1" = "Profile created";
+"agent_profile_created_2" = "Now users see your customized name and avatar instead of the default ones.";
+"agent_profile_edited" = "Profile edited";
+"agent_profile" = "My Agent Card";
+
 /* Invite */
 
 "invite" = "Invite";
diff --git a/locales/ru.strings b/locales/ru.strings
index 841e8776..d4b85c79 100644
--- a/locales/ru.strings
+++ b/locales/ru.strings
@@ -842,6 +842,12 @@
 "ticket_changed_comment" = "Изменения вступят силу через несколько секунд.";
 "banned_in_support_1" = "Извините, <b>$1</b>, но теперь вам нельзя создавать обращения.";
 "banned_in_support_2" = "А причина этому проста: <b>$1</b>. К сожалению, на этот раз нам пришлось отобрать у вас эту возможность навсегда.";
+"you_can_close_this_ticket_1" = "Если у Вас больше нет вопросов, Вы можете ";
+"you_can_close_this_ticket_2" = "закрыть этот тикет";
+"agent_profile_created_1" = "Профиль создан";
+"agent_profile_created_2" = "Теперь пользователи видят Ваши псевдоним и аватарку вместо стандартных аватарки и номера.";
+"agent_profile_edited" = "Профиль отредактирован";
+"agent_profile" = "Карточка агента";
 
 /* Invite */