Merge pull request #8 from ThomasDaSilva/main

list Zendesk customer update

Config/config.xml

@@ -8,6 +8,9 @@
  <hook id="zendesk.database.render.front.tools.hook" class="ZenDesk\Hook\ZendeskDataTableFrontHook">
  <tag name="hook.event_listener" event="front.easydatatablemanager.js" type="front" method="renderDataTableTools" />
  </hook>
+ <hook id="zendesk.database.render.back.tools.hook" class="ZenDesk\Hook\ZendeskDataTableBackHook">
+ <tag name="hook.event_listener" event="easydatatablemanager.js" type="back" method="renderDataTableTools" />
+ </hook>
  </hooks>
 
  <loops>

Config/module.xml

@@ -13,7 +13,7 @@
  <language>en_US</language>
  <language>fr_FR</language>
  </languages>
- <version>1.0.2</version>
+ <version>1.0.3</version>
  <authors>
  <author>
  <name>thomas da silva mendonca</name>

Hook/ConfigurationHook.php

@@ -8,13 +8,9 @@
 
 class ConfigurationHook extends BaseHook
 {
- public function onModuleConfiguration(HookRenderEvent $event)
+ public function onModuleConfiguration(HookRenderEvent $event): void
  {
- $event->add($this->render("module_configuration.html", [
- 'url' => ZenDesk::getConfigValue('zen_desk_api_subdomain'),
- 'key' => ZenDesk::getConfigValue('zen_desk_api_username'),
- 'login' => ZenDesk::getConfigValue('zen_desk_api_token'),
- ]));
+ $event->add($this->render("module_configuration.html"));
  }
 
  public static function getSubscribedHooks(): array

Hook/ZendeskDataTableBackHook.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace ZenDesk\Hook;
+
+use Thelia\Core\Event\Hook\HookRenderEvent;
+use Thelia\Core\Hook\BaseHook;
+
+class ZendeskDataTableBackHook extends BaseHook
+{
+ public function renderDataTableTools(HookRenderEvent $event): void
+ {
+ $event->add($this->render('datatable/render/zendesk.render.datatable.users.js.html'));
+ }
+}

Hook/ZendeskDataTableFrontHook.php

@@ -7,10 +7,8 @@
 
 class ZendeskDataTableFrontHook extends BaseHook
 {
- public function renderDataTableTools(HookRenderEvent $event)
+ public function renderDataTableTools(HookRenderEvent $event): void
  {
- $event->add(
- $this->render('datatable/render/zendesk.render.datatable.tickets.js.html', [])
- );
+ $event->add($this->render('datatable/render/zendesk.render.datatable.tickets.js.html'));
  }
 }

I18n/backOffice/default/fr_FR.php

@@ -4,16 +4,17 @@
  'Configuration' => 'Configuration',
  'Created_At' => 'Date de création',
  'Email' => 'Email',
+ 'Error Zendesk API Connection' => 'Erreur de connection à L\'API Zendesk',
  'Id' => 'Id',
  'List Zendesk Users' => 'Liste des utilisateurs de Zendesk',
  'Locale' => 'Locale',
  'Name' => 'Nom',
- 'Parameters' => 'Parametres',
+ 'Parameters' => 'Paramètres',
  'Role' => 'Rôle',
  'Save Configuration' => 'Enregistrer la configuration',
  'Save Parameters' => 'Enregistrer les paramètres',
  'Update_At' => 'Date de modification',
- 'Zen Desk Parameters' => 'Parametres Zendesk',
+ 'Zen Desk Parameters' => 'Paramètres Zendesk',
  'Zen Desk Users' => 'Utilisateurs de Zendesk',
  'Zen Desk configuration' => 'Configuration ZenDesk',
 );

I18n/fr_FR.php

@@ -8,7 +8,7 @@
  '\'The\'' => '\'Le\'',
  '\'at\'' => '\'à\'',
  'Actions' => 'Actions',
- 'Admin Zendesk username' => 'Nom de l\'administateur ZenDesk',
+ 'Admin Zendesk username' => 'Nom de l\'administrateur ZenDesk',
  'All-Tickets' => 'Tous les tickets de l\'utilisateur',
  'Assigned-Only' => 'Seulement les tickets assignés',
  'Assignee' => 'Assigné',
@@ -29,9 +29,9 @@
  'Status' => 'Statut',
  'Ticket Type' => 'Type de Ticket',
  'Update At' => 'Date de modification',
- 'User Rules' => 'Régles Utilisateur',
- 'api_token' => 'API token',
- 'api_username' => 'Nom d\'utilisateur Api',
+ 'User Rules' => 'Règles des Utilisateurs',
+ 'api_token' => 'API Token',
+ 'api_username' => 'Nom de l\'Utilisateur de l\'API Zendesk',
  'assignee' => 'Assigné',
  'attachments' => 'Pièces Jointes',
  'attachments of your ticket' => 'pièces jointes du ticket',
@@ -50,7 +50,7 @@
  'priority' => 'Priorité',
  'priority of your issue' => 'priorité du ticket',
  'solved' => 'Résolu',
- 'subdomain' => 'sous-domaine',
+ 'subdomain' => 'Sous-domaine',
  'subject' => 'Sujet',
  'subject of the ticket' => 'sujet du ticket',
  'tags' => 'Tags',

Loop/ZendeskUsersLoop.php

@@ -2,6 +2,7 @@
 
 namespace ZenDesk\Loop;
 
+use Exception;
 use IntlDateFormatter;
 use Thelia\Core\Template\Element\ArraySearchLoopInterface;
 use Thelia\Core\Template\Element\BaseLoop;
@@ -41,7 +42,9 @@ public function buildArray(): array
  $items = [];
 
  $manager = new ZenDeskManager();
- $zendeskUsers = $manager->getAllUsers();
+ try {
+ $zendeskUsers = $manager->getAllUsers();
+
 
  foreach ($zendeskUsers as $usersArray)
  {
@@ -64,6 +67,10 @@ public function buildArray(): array
 
  sort($items);
 
+ } catch (Exception) {
+ return [];
+ }
+
  return $items;
  }
 
@@ -90,7 +97,7 @@ private function getFormatDate($datetime, $locale): bool|string
  return $fmt->format($datetime);
  }
 
- protected function getArgDefinitions()
+ protected function getArgDefinitions(): ArgumentCollection
  {
  return new ArgumentCollection(
  Argument::createAnyTypeArgument("email"),

Service/ZenDeskTicketsDataTable.php

@@ -3,6 +3,7 @@
 namespace ZenDesk\Service;
 
 use EasyDataTableManager\Service\DataTable\BaseDataTable;
+use Exception;
 use Propel\Runtime\ActiveQuery\ModelCriteria;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\HttpFoundation\RequestStack;
@@ -32,7 +33,7 @@ public function __construct(
  }
 
  /**
- * @throws \Exception
+ * @throws Exception
  */
  public function buildResponseData($type): Response
  {
@@ -45,7 +46,7 @@ public function buildResponseData($type): Response
  $json = [];
 
  if ($tickets !== null) {
- $sortedTickets = $this->service->sortOrder(
+ $sortedTickets = $this->service->sortOrderTickets(
  $this->request->get('order')[0],
  $this->getDefineColumnsDefinition(true)[(int)$this->request->get('order')[0]['column']],
  $tickets