Misc. mailbox updates

antuchaudharyqlo246 · Dec 17, 2022 · ef08bbf · ef08bbf
1 parent b8fe362
commit ef08bbf
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 20 deletions.
diff --git a/Controller/Ticket.php b/Controller/Ticket.php
@@ -31,6 +31,7 @@
 use Webkul\UVDesk\CoreFrameworkBundle\Entity\User;
 use Webkul\UVDesk\CoreFrameworkBundle\Entity\TicketPriority;
 use Webkul\UVDesk\CoreFrameworkBundle\Entity\TicketStatus;
+use Webkul\UVDesk\MailboxBundle\Services\MailboxService;
 
 class Ticket extends AbstractController
 {
@@ -51,14 +52,29 @@ public function __construct(UserService $userService, TranslatorInterface $trans
         $this->kernel = $kernel;
     }
 
-    public function listTicketCollection(Request $request)
+    public function listTicketCollection(Request $request, MailboxService $mailboxService)
     {
         $entityManager = $this->getDoctrine()->getManager();
 
+        $mailboxCollection = [];
+        $mailboxConfiguration = $mailboxService->parseMailboxConfigurations();
+
+        foreach ($mailboxConfiguration->getMailboxes() as $mailbox) {
+            $imapConfiguration = $mailbox->getImapConfiguration();
+
+            if (!empty($imapConfiguration)) {
+                $mailboxCollection[] = [
+                    'name' => $mailbox->getName(), 
+                    'email' => $imapConfiguration->getUsername(), 
+                ];
+            }
+        }
+
         return $this->render('@UVDeskCoreFramework//ticketList.html.twig', [
-            'ticketStatusCollection' => $entityManager->getRepository(TicketStatus::class)->findAll(),
-            'ticketTypeCollection' => $entityManager->getRepository(TicketType::class)->findByIsActive(true),
-            'ticketPriorityCollection' => $entityManager->getRepository(TicketPriority::class)->findAll(),
+            'mailboxCollection' => $mailboxCollection, 
+            'ticketStatusCollection' => $entityManager->getRepository(TicketStatus::class)->findAll(), 
+            'ticketTypeCollection' => $entityManager->getRepository(TicketType::class)->findByIsActive(true), 
+            'ticketPriorityCollection' => $entityManager->getRepository(TicketPriority::class)->findAll(), 
         ]);
     }
 

diff --git a/Resources/views/ticketList.html.twig b/Resources/views/ticketList.html.twig
@@ -788,15 +788,18 @@
                                     <label>{{ 'Filter With'|trans }}</label>
                                     <ul class="">
                                         {% set options = [] %}
-                                        {% for mailbox in ticket_service.getAllMailboxes() %}
+                                        {% for mailbox in mailboxCollection %}
                                             {% set options = options|merge([{'id': mailbox.email, 'name': mailbox.name}]) %}
+
                                             <li data-id="{{mailbox.email}}">
                                                 {{ mailbox.name|trans }}
                                             </li>
                                         {% endfor %}
+
                                         <li class="uv-no-results" style="display: none;">
                                             {{ 'No result found'|trans }}
                                         </li>
+
                                         {% set filterContext = filterContext|merge({'mailbox': options}) %}
                                     </ul>
                                 </div>

diff --git a/Services/TicketService.php b/Services/TicketService.php
@@ -67,20 +67,6 @@ public function __construct(
         $this->mailboxService = $mailboxService;
     }
 
-    public function getAllMailboxes()
-    {
-        $collection = array_map(function ($mailbox) {
-            return [
-                'id' => $mailbox->getId(),
-                'name' => $mailbox->getName(),
-                'isEnabled' => $mailbox->getIsEnabled(),
-                'email'     => $mailbox->getImapConfiguration()->getUsername(),
-            ];
-        }, $this->mailboxService->parseMailboxConfigurations()->getMailboxes());
-
-        return $collection;
-    }
-
     public function getPathToConfigurationFile()
     {
         return $this->container->get('kernel')->getProjectDir() . self::PATH_TO_CONFIG;
@@ -220,7 +206,7 @@ public function createTicketBase(array $ticketData = [])
         if ('email' == $ticketData['source']) {
             try {
                 if (array_key_exists('UVDeskMailboxBundle', $this->container->getParameter('kernel.bundles'))) {
-                    $mailbox = $this->container->get('uvdesk.mailbox')->getMailboxByEmail($ticketData['mailboxEmail']);
+                    $mailbox = $this->mailboxService->getMailboxByEmail($ticketData['mailboxEmail']);
                     $ticketData['mailboxEmail'] = $mailbox['email'];
                 }
             } catch (\Exception $e) {