Merge branch 'develop'

Controller/Merchant/SwitchMerchantController.php

                 if ($context == 'admin') {
                     $url .= 'admin';
                 }
+            }
 
+            if(!$url) {
+                $url = $request->headers->get('referer');
+            }
 
+            if($url) {
+                return $this->redirect($url);
             }
-        }
 
-        if ($url) {
-            return $this->redirect($url);
-        } else {
-            $this->addFlashTranslator('error', ActionDefinition::SWITCH_MERCHANT, 'Merchant');
-            return $this->redirect($request->headers->get('referer'));
         }
 
-
+        $this->addFlashTranslator('error', ActionDefinition::SWITCH_MERCHANT, 'Merchant');
+        return $this->redirectToRoute('frontend_home');
     }
 
 }

Controller/Order/CartController.php

             $idProductFamily = $data['order_products']['id_product_family'];
             $this->productFamily = $this->getProductFamilyContainer()->getStore()->getOneById($idProductFamily);
 
+            if(!$this->productFamily) {
+                $return['return'] = 'error';
+            }
+
             // alerte si cookies non acceptés
             if (!$user && !$visitor) {
                 $this->addFlash(
                                 'fos_user_security_login'
                         ) . '">connecter</a> pour ajouter un produit.'
                 );
-                return false;
+                $return['return'] = 'error';
             }
 
             if ($this->productFamily) {
                             $this->addOrderProduct($orderShop, $orderProduct);
                         }
                     }
+
+                    $return['return'] = 'success';
                 }
             }
         }

Controller/Product/FavoriteController.php

     private function _getProductFamily($request)
     {
         $idProductFamily = $request->request->get('idProductFamily');
-        $productFamily = $this->getProductFamilyContainer()->getStore()->getOneById($idProductFamily);
 
-        if ($productFamily) {
+        if($idProductFamily) {
+            $productFamily = $this->getProductFamilyContainer()->getStore()->getOneById($idProductFamily);
+        }
+
+        if (isset($productFamily) && $productFamily) {
             return $productFamily;
         } else {
             throw new \ErrorException('Ce produit est introuvable');

Field/Filter/User/UserMerchantEmailFilter.php

             array(
                     'required' => false,
                     'attr' => array(
-                            'class' => ' input-sm',
+                            'class' => ' input-sm autocomplete-disabled',
                             'form' => 'filters-form',
                     ),
             )

Field/Filter/User/UserMerchantFirstnameFilter.php

             array(
                     'required' => false,
                     'attr' => array(
-                            'class' => ' input-sm',
+                            'class' => ' input-sm autocomplete-disabled',
                             'form' => 'filters-form',
                     ),
             )

Field/Filter/User/UserMerchantLastnameFilter.php

             array(
                     'required' => false,
                     'attr' => array(
-                            'class' => ' input-sm',
+                            'class' => ' input-sm autocomplete-disabled',
                             'form' => 'filters-form',
                     ),
             )