Merge pull request #5 from ThomasDaSilva/main

Fix Zendesk api config error or missing
thelia-modules · Aug 2, 2023 · 1db4f1b · 1db4f1b
2 parents f6570ca + 5298f27
commit 1db4f1b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/Controller/ConfigurationController.php b/Controller/ConfigurationController.php
@@ -11,15 +11,11 @@
 use Thelia\Form\Exception\FormValidationException;
 use ZenDesk\Form\ConfigurationForm;
 use ZenDesk\Form\ParametersForm;
-use ZenDesk\Utils\ZenDeskManager;
 use ZenDesk\ZenDesk;
 
 #[Route('/admin/module/ZenDesk', name: 'zendesk_config')]
 class ConfigurationController extends AdminController
 {
-    public function __construct(protected ZenDeskManager $manager) {
-    }
-
     #[Route('/configuration', name: 'configuration')]
     public function saveConfiguration(ParserContext $parserContext) : RedirectResponse|Response
     {

diff --git a/Loop/ZendeskCustomersLoop.php b/Loop/ZendeskCustomersLoop.php
@@ -9,10 +9,12 @@
 use Thelia\Core\Template\Element\PropelSearchLoopInterface;
 use Thelia\Core\Template\Loop\Argument\Argument;
 use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Log\Tlog;
 use Thelia\Model\CustomerQuery;
 use Zendesk\API\Exceptions\AuthException;
 use Zendesk\API\Exceptions\ResponseException;
 use ZenDesk\Utils\ZenDeskManager;
+use ZenDesk\ZenDesk;
 
 class ZendeskCustomersLoop extends BaseLoop implements PropelSearchLoopInterface
 {
@@ -39,20 +41,28 @@ public function parseResults(LoopResult $loopResult): LoopResult
      * @throws ResponseException
      * @throws AuthException
      */
-    public function buildModelCriteria(): CustomerQuery|ModelCriteria
+    public function buildModelCriteria(): CustomerQuery|null
     {
-        $manager = new ZenDeskManager();
-        $zendeskUsers = $manager->getAllUsers();
+        try
+        {
+            $manager = new ZenDeskManager();
+            $zendeskUsers = $manager->getAllUsers();
+
+            $search = CustomerQuery::create();
 
-        $search = CustomerQuery::create();
+            foreach ($zendeskUsers as $user)
+            {
+                $search->filterByEmail($user->email);
+                $search->_or();
+            }
 
-        foreach ($zendeskUsers as $user)
+            return $search;
+        } catch (\Exception $ex)
         {
-            $search->filterByEmail($user->email);
-            $search->_or();
+            Tlog::getInstance()->error($ex->getMessage());
         }
 
-        return $search;
+        return null;
     }
 
     protected function getArgDefinitions(): ArgumentCollection

diff --git a/templates/backOffice/default/module_configuration.html b/templates/backOffice/default/module_configuration.html
@@ -84,7 +84,7 @@
                                 {loop type="zendesk_customers_loop" name="zendesk_customers"}
                                 {loop type="zendesk_users_loop" name="zendesk_user" email=$EMAIL locale=$locale}
                                     <tr>
-                                        <td><a href="/admin/customer/update?customer_id={$ID}">{$ID}</td>
+                                        <td><a href={url path='/admin/customer/update?customer_id='}{$ID}>{$ID}</td>
                                         <td>{$NAME}</td>
                                         <td>{$EMAIL}</td>
                                         <td>{$ROLE}</td>