Merge branch 'develop'

ShopBundle/Controller/Backend/MerchantController.php

@@ -96,13 +96,15 @@ class MerchantController extends AdminController
                                 ->find($idMerchant);
 
                         if ($merchant) {
-
                                 $user->setMerchant($merchant);
                                 $em->persist($user);
                                 $em->flush();
+
+                                return $this->redirect($merchant->getMerchantConfig('url').'admin/dashboard') ;
                         }
                 }
-                return $this->redirect('/admin/dashboard') ;
+
+                return $this->redirectToRoute('admin_dashboard') ;
         }
 
 }

ShopBundle/Repository/TicketRepository.php

@@ -23,12 +23,26 @@ class TicketRepository extends BaseRepository implements DefaultRepositoryInterf
                 return TicketInterface::class;
         }
 
+        public function filterStatus($query, $statusArray)
+        {
+                $query->andWhere('e.status IN (:status)')->setParameter('status', $statusArray) ;
+                return $query ;
+        }
+
         public function findAllOpen()
         {
                 $query = $this->findByMerchantQuery() ;
-                $query->andWhere('e.status IN (:statusOpen)')->setParameter('statusOpen', [Ticket::TICKET_STATUS_OPEN, Ticket::TICKET_STATUS_BEING_PROCESSED]) ;
+                $this->filterStatus($query, [Ticket::TICKET_STATUS_OPEN, Ticket::TICKET_STATUS_BEING_PROCESSED]) ;
                 $query->addOrderBy('e.id', 'DESC') ;
                 return $query->getQuery()->getResult() ;
         }
+
+        public function countAllOpen()
+        {
+                $query = $this->findByMerchantQuery() ;
+                $query->select('count(e.id)');
+                $this->filterStatus($query, [Ticket::TICKET_STATUS_OPEN, Ticket::TICKET_STATUS_BEING_PROCESSED]) ;
+                return $query->getQuery()->getSingleScalarResult() ;
+        }
 }
 

ShopBundle/Twig/BackendTwigExtension.php

@@ -82,7 +82,7 @@ class BackendTwigExtension extends AbstractExtension
                 switch($entityName){
                         case 'ticket' :
                                 $ticketRepo = $this->em->getRepository(TicketInterface::class);
-                                return $ticketRepo->countByStatus('open');
+                                return $ticketRepo->countAllOpen();
 
                 }
         }