Merge pull request #10 from ThomasDaSilva/feat/on-hold-status

add on-hold-status
thelia-modules · Dec 4, 2023 · 290acb4 · 290acb4
2 parents 1261acd + 7901a3d
commit 290acb4
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 5 deletions.
diff --git a/Config/module.xml b/Config/module.xml
@@ -13,7 +13,7 @@
         <language>en_US</language>
         <language>fr_FR</language>
     </languages>
-    <version>1.0.6</version>
+    <version>1.0.7</version>
     <authors>
         <author>
             <name>thomas da silva mendonca</name>

diff --git a/Controller/ConfigurationController.php b/Controller/ConfigurationController.php
@@ -54,6 +54,7 @@ public function saveParameters(ParserContext $parserContext) : RedirectResponse|
             ZenDesk::setConfigValue("zen_desk_ticket_type", $data["ticket_type"]);
             ZenDesk::setConfigValue("zen_desk_hide_column", $data["column_hide"]);
             ZenDesk::setConfigValue("zen_desk_show_private_comment", $data["private_comment"]);
+            ZenDesk::setConfigValue("zen_desk_status_hold", $data["status_hold"]);
 
             return $this->generateSuccessRedirect($form);
         } catch (FormValidationException $e) {

diff --git a/Controller/FrontController.php b/Controller/FrontController.php
@@ -140,7 +140,8 @@ public function getCommentsByTicketsId(RequestStack $requestStack, ZenDeskManage
             "ticketId" => $id,
             "ticketName" => $ticketName,
             "status" => $ticket["ticket"]->status,
-            "zendesk_rules" => (bool)ZenDesk::getConfigValue("zen_desk_user_rules")
+            "zendesk_rules" => (bool)ZenDesk::getConfigValue("zen_desk_user_rules"),
+            "zendesk_hold" => (bool)ZenDesk::getConfigValue("zen_desk_status_hold"),
          ]);
     }
 
@@ -200,6 +201,7 @@ public function updateTicketStatus(
                 if (
                     $status ==="open" ||
                     $status === "pending" ||
+                    $status === "hold" ||
                     $status ==="solved"
                 ) {
                     $params = [

diff --git a/Form/ParametersForm.php b/Form/ParametersForm.php
@@ -86,6 +86,15 @@ protected function buildForm()
                     'data' => (bool)ZenDesk::getConfigValue('zen_desk_show_private_comment')
                 ]
             )
+            ->add(
+                'status_hold',
+                CheckboxType::class,
+                [
+                    'label'    => Translator::getInstance()->trans("Status \"On-hold\" Activated ?", [], ZenDesk::DOMAIN_NAME),
+                    'required' => false,
+                    'data' => (bool)ZenDesk::getConfigValue('zen_desk_status_hold')
+                ]
+            )
         ;
     }
 }
diff --git a/I18n/fr_FR.php b/I18n/fr_FR.php
@@ -32,6 +32,7 @@
     'Role' => 'Rôle',
     'Show private comments ?' => 'Montrer les commentaires privés ?',
     'Status' => 'Statut',
+    'Status "On-hold" Activated ?' => 'Statut "En pause" Activé ?',
     'Ticket Type' => 'Type de Ticket',
     'Update At' => 'Date de modification',
     'Updated_At' => 'Date de modification',
@@ -46,6 +47,7 @@
     'description' => 'Description',
     'description of your issue' => 'description du ticket',
     'hide a column (only work with ticket type : all)' => 'masque une colonne (fonctionne seulement avec le type de ticket : tous les tickets)',
+    'hold' => 'En pause',
     'https://{subdomain}.zendesk.com' => 'https://{sous-domaine}.zendesk.com',
     'mail of the assignee' => 'mail de l\'assigné au ticket',
     'name of your organisation' => 'nom de l\'organisation',

diff --git a/I18n/frontOffice/default/fr_FR.php b/I18n/frontOffice/default/fr_FR.php
@@ -4,6 +4,7 @@
     'Create a new Zendesk ticket' => 'Créer un nouveau ticket Zendesk',
     'My ZenDesk Tickets' => 'Mon suivi SAV',
     'ADD A COMMENT' => 'RÉDIGER UN COMMENTAIRE',
+    'Hold' => 'En Pause',
     'Open' => 'Ouvert',
     'Open Ticket comments' => 'Ouvrir les commentaires',
     'Pending' => 'En Attente',

diff --git a/Service/ZendeskService.php b/Service/ZendeskService.php
@@ -37,6 +37,7 @@ public function sortOrderTickets(
         $ticketsNew = [];
         $ticketsOpen = [];
         $ticketsPending = [];
+        $ticketsHold = [];
         $ticketsClosed = [];
 
         $sort = $order['dir'];
@@ -56,6 +57,10 @@ public function sortOrderTickets(
                     $ticketsPending[] = $ticket;
                 }
 
+                if ($ticket->status === "hold") {
+                    $ticketsHold[] = $ticket;
+                }
+
                 if ($ticket->status === "closed" ||
                     $ticket->status === "solved") {
                     $ticketsClosed[] = $ticket;
@@ -66,6 +71,7 @@ public function sortOrderTickets(
                 $this->sortByUpdatedAt($ticketsNew, $columnDefinition),
                 $this->sortByUpdatedAt($ticketsOpen, $columnDefinition),
                 $this->sortByUpdatedAt($ticketsPending, $columnDefinition),
+                $this->sortByUpdatedAt($ticketsHold, $columnDefinition),
                 $this->sortByUpdatedAt($ticketsClosed, $columnDefinition)
             );
         }
@@ -156,7 +162,7 @@ public function jsonFormat(stdClass $ticket): array
         $ticketType = ZenDesk::getConfigValue("zen_desk_ticket_type");
         $hiddenColumn = ZenDesk::getConfigValue("zen_desk_hide_column");
 
-        if ($ticketType === "requested" || $ticketType === "all" && $hiddenColumn === "requested hide") {
+        if ($ticketType === "requested" || ($ticketType === "all" && $hiddenColumn === "requested hide")) {
             return
                 [
                     $ticket->id,
@@ -174,7 +180,7 @@ public function jsonFormat(stdClass $ticket): array
                 ];
         }
 
-        if ($ticketType === "assigned" || $ticketType === "all" && $hiddenColumn === "assigned hide") {
+        if ($ticketType === "assigned" || ($ticketType === "all" && $hiddenColumn === "assigned hide")) {
             return
                 [
                     $ticket->id,
@@ -252,6 +258,9 @@ public function translateStatus(string $status): ?string
         if ($status === "pending") {
             return Translator::getInstance()->trans('pending', [], ZenDesk::DOMAIN_NAME);
         }
+        if ($status === "hold") {
+            return Translator::getInstance()->trans('hold', [], ZenDesk::DOMAIN_NAME);
+        }
         if ($status === "solved") {
             return Translator::getInstance()->trans('solved', [], ZenDesk::DOMAIN_NAME);
         }

diff --git a/ZenDesk.php b/ZenDesk.php
@@ -32,6 +32,7 @@ public function postActivation(ConnectionInterface $con = null): void
         self::setConfigValue('zen_desk_ticket_type', 'assigned');
         self::setConfigValue('zen_desk_hide_column', 'nothing hide');
         self::setConfigValue('zen_desk_show_private_comment', 'false');
+        self::setConfigValue('zen_desk_status_hold', 'false');
     }
 
     /**

diff --git a/templates/backOffice/default/module_configuration.html b/templates/backOffice/default/module_configuration.html
@@ -105,6 +105,7 @@
                                         {render_form_field field='ticket_type'}
                                         {render_form_field field='column_hide'}
                                         {render_form_field field='private_comment'}
+                                        {render_form_field field='status_hold'}
                                         <button type="submit" class="btn btn-success" >{intl l="Save Parameters" d="zendesk.bo.default"}</button>
                                     </div>
                                 </form>

diff --git a/templates/frontOffice/default/comments.html b/templates/frontOffice/default/comments.html
@@ -11,11 +11,11 @@
         <a class="Button Button--primary" href="#{count($comments)}">{intl l="show last message" d='zendesk.fo.default'}</a>
     </div>
     <hr>
-
     {if $zendesk_rules && $status != "closed"}
         <div class="text-center m-2">
             <a class="Button Button--{if $status == "open"}secondary{else}primary{/if}" href="{if $status == "open"}#{else}{url path="/zendesk/tickets/$ticketId/status/open"}{/if}">{intl l="Open" d='zendesk.fo.default'}</a>
             <a class="Button Button--{if $status == "pending"}secondary{else}primary{/if}" href="{if $status == "pending"}#{else}{url path="/zendesk/tickets/$ticketId/status/pending"}{/if}">{intl l="Pending" d='zendesk.fo.default'}</a>
+            {if $zendesk_hold}<a class="Button Button--{if $status == "hold"}secondary{else}primary{/if}" href="{if $status == "hold"}#{else}{url path="/zendesk/tickets/$ticketId/status/hold"}{/if}">{intl l="Hold" d='zendesk.fo.default'}</a>{/if}
             <a class="Button Button--{if $status == "solved"}secondary{else}primary{/if}" href="{if $status == "solved"}#{else}{url path="/zendesk/tickets/$ticketId/status/solved"}{/if}">{intl l="Solved" d='zendesk.fo.default'}</a>
         </div>
         <hr>