Prida do vyhledavani take vyhledavani podle jmena uvedeneho v billing…

… nebo shipping adres, dale mimo stavajici vyhledavani podle emailu uzivatele prida vyhledavani podle emailu z objednavky. refs Sylius#5036
ThreeSixtyEu · Feb 21, 2017 · e224aa4 · e224aa4
1 parent 58cb93b
commit e224aa4
Showing 1 changed file with 29 additions and 6 deletions.
diff --git a/src/Sylius/Bundle/CoreBundle/Form/Type/Filter/OrderFilterType.php b/src/Sylius/Bundle/CoreBundle/Form/Type/Filter/OrderFilterType.php
@@ -198,13 +198,31 @@ public function buildForm(FormBuilderInterface $builder, array $options)
 
                     // Concatenate user.firstname, ' ' and user.lastanme and put it in a LIKE %username% query
                     $qb
+                        ->leftJoin('o.shippingAddress', 'a')
+                        ->leftJoin('o.billingAddress', 'b')
                         ->andWhere(
-                            $qb->expr()->like(
-                                $qb->expr()->concat(
-                                    $qb->expr()->concat('user.firstName', $qb->expr()->literal(' ')),
-                                    'user.lastName'
+                            $qb->expr()->orX(
+                                $qb->expr()->like(
+                                    $qb->expr()->concat(
+                                        $qb->expr()->concat('user.firstName', $qb->expr()->literal(' ')),
+                                        'user.lastName'
+                                    ),
+                                    ':username'
                                 ),
-                                ':username'
+                                $qb->expr()->like(
+                                    $qb->expr()->concat(
+                                        $qb->expr()->concat('a.firstName', $qb->expr()->literal(' ')),
+                                        'a.lastName'
+                                    ),
+                                    ':username'
+                                ),
+                                $qb->expr()->like(
+                                    $qb->expr()->concat(
+                                        $qb->expr()->concat('b.firstName', $qb->expr()->literal(' ')),
+                                        'b.lastName'
+                                    ),
+                                    ':username'
+                                )
                             )
                         )
                         ->setParameter('username', '%' . $values['value'] . '%');
@@ -226,7 +244,12 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     /** @var QueryBuilder $qb */
                     $qb = $filterQuery->getQueryBuilder();
                     $qb
-                        ->andWhere($qb->expr()->like('user.email', ':usermail'))
+                        ->andWhere(
+                            $qb->expr()->orX(
+                                $qb->expr()->like('user.email', ':usermail'),
+                                $qb->expr()->like('o.email', ':usermail')
+                            )
+                        )
                         ->setParameter('usermail', '%' . $values['value'] . '%');
                     return $qb;
                 },