Merge pull request #7 from ThomasDaSilva/main

change translation + add hide column option
thelia-modules · Oct 10, 2023 · dec35b6 · dec35b6
2 parents 8b6f53b + 50231be
commit dec35b6
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 6 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.1</version>
+ <version>1.0.2</version>
  <authors>
  <author>
  <name>thomas da silva mendonca</name>

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

diff --git a/Form/ParametersForm.php b/Form/ParametersForm.php
@@ -54,6 +54,28 @@ protected function buildForm()
  'data' => ZenDesk::getConfigValue('zen_desk_ticket_type')
  ]
  )
+ ->add(
+ 'column_hide',
+ ChoiceType::class,
+ [
+ 'choices' => [
+ Translator::getInstance()->trans("Hide assigned column", [], ZenDesk::DOMAIN_NAME) => "assigned hide",
+ Translator::getInstance()->trans("Hide requested column", [], ZenDesk::DOMAIN_NAME) => "requested hide",
+ Translator::getInstance()->trans("Hide nothing", [], ZenDesk::DOMAIN_NAME) => "nothing hide"
+ ],
+ 'label' => Translator::getInstance()->trans("Hidden column", [], ZenDesk::DOMAIN_NAME),
+ 'required' => true,
+ 'label_attr' => [
+ 'for' => 'ticket_type',
+ 'help' => Translator::getInstance()->trans(
+ "hide a column (only work with ticket type : all)",
+ [],
+ ZenDesk::DOMAIN_NAME
+ )
+ ],
+ 'data' => ZenDesk::getConfigValue('zen_desk_hide_column')
+ ]
+ )
  ;
  }
 }
diff --git a/I18n/fr_FR.php b/I18n/fr_FR.php
@@ -15,6 +15,10 @@
  'Assignee not Found' => 'Assigné non Trouvé',
  'Created At' => 'Date de création',
  'Go to zendesk admin panel, Search API Zendesk -> Add a token API' => 'Aller sur le panneau administrateur, Rechercher API Zendesk -> Ajouter un token API',
+ 'Hidden column' => 'Masquer une Colonne',
+ 'Hide assigned column' => 'Masquer la colonne des Assignés',
+ 'Hide nothing' => 'Ne Rien Masquer',
+ 'Hide requested column' => 'Masquer la colonne des Demandeurs',
  'ID' => 'ID',
  'Organization not Found' => 'Organisation non Trouvé',
  'Read-Only' => 'Lecture seulement',
@@ -35,6 +39,7 @@
  'comment_reply' => 'réponse',
  '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)',
  '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
@@ -2,7 +2,7 @@
 
 return array(
  'Create a new Zendesk ticket' => 'Créer un nouveau ticket Zendesk',
- 'My ZenDesk Tickets' => 'Mes Tickets ZenDesk',
+ 'My ZenDesk Tickets' => 'Mon suivi SAV',
  'ADD A COMMENT' => 'RÉDIGER UN COMMENTAIRE',
  'Open' => 'Ouvert',
  'Open Ticket comments' => 'Ouvrir les commentaires',

diff --git a/Service/ZenDeskTicketsDataTable.php b/Service/ZenDeskTicketsDataTable.php
@@ -87,6 +87,9 @@ public function getDefineColumnsDefinition($type): array
  {
  $i = -1;
 
+ $ticketType = ZenDesk::getConfigValue("zen_desk_ticket_type");
+ $hiddenColumn = ZenDesk::getConfigValue("zen_desk_hide_column");
+
  $definitions = [];
 
  $definitions[] =
@@ -105,7 +108,7 @@ public function getDefineColumnsDefinition($type): array
  'title' => Translator::getInstance()->trans('Subject', [], ZenDesk::DOMAIN_NAME)
  ];
 
- if (ZenDesk::getConfigValue("zen_desk_ticket_type") !== "requested")
+ if ($ticketType === "assigned" || $ticketType === "all" && $hiddenColumn !== "requested hide")
  {
  $definitions[] =
  [
@@ -117,7 +120,7 @@ public function getDefineColumnsDefinition($type): array
  ;
  }
 
- if (ZenDesk::getConfigValue("zen_desk_ticket_type") !== "assigned")
+ if ($ticketType === "requested" || $ticketType === "all" && $hiddenColumn !== "assigned hide")
  {
  $definitions[] =
  [

diff --git a/Service/ZendeskService.php b/Service/ZendeskService.php
@@ -137,7 +137,10 @@ public function jsonFormat(\stdClass $ticket): array
  $createdAt = new DateTime($ticket->created_at);
  $updateAt = new DateTime($ticket->updated_at);
 
- if (ZenDesk::getConfigValue("zen_desk_ticket_type") === "requested")
+ $ticketType = ZenDesk::getConfigValue("zen_desk_ticket_type");
+ $hiddenColumn = ZenDesk::getConfigValue("zen_desk_hide_column");
+
+ if ($ticketType === "requested" || $ticketType === "all" && $hiddenColumn === "requested hide")
  {
  return
  [
@@ -156,7 +159,7 @@ public function jsonFormat(\stdClass $ticket): array
  ];
  }
 
- if (ZenDesk::getConfigValue("zen_desk_ticket_type") === "assigned")
+ if ($ticketType === "assigned" || $ticketType === "all" && $hiddenColumn === "assigned hide")
  {
  return
  [

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

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