Livraisons : adaptations PointSale

ShopBundle/Controller/Admin/AdminController.php

                 }
 
 
-                //ça bloque tout ce truc là faut qu'on en parle
-
-                /* if (method_exists($entity, 'getAddress')) {
+                 if (method_exists($entity, 'getAddress') && $entity->getAddress()) {
                          $entity->getAddress()->setCreatedBy($this->security->getUser());
                          $entity->getAddress()->setCreatedAt(new \DateTime());
                  }
 
-                 if (method_exists($entity, 'getAddresses')) {
+                 if (method_exists($entity, 'getAddresses')
+                         && $entity->getAddresses() && count($entity->getAddresses()) > 0) {
                          foreach($entity->getAddresses() as $address) {
                                  $address->setCreatedBy($this->security->getUser()) ;
                                  $address->setCreatedAt(new \DateTime()) ;
                          }
-                 }*/
+                 }
 
                 $this->setUpdated($entity);
 
                         $entity->setUpdatedBy($this->security->getUser());
                 }
 
-                //ça bloque tout ce truc là faut qu'on en parle
-                /*
-                if (method_exists($entity, 'getAddress')) {
+                if (method_exists($entity, 'getAddress') && $entity->getAddress()) {
                         $entity->getAddress()->setUpdatedBy($this->security->getUser());
                 }
 
-                if (method_exists($entity, 'getAddresses')) {
+                if (method_exists($entity, 'getAddresses')
+                        && $entity->getAddresses() && count($entity->getAddresses()) > 0) {
+
                         foreach($entity->getAddresses() as $address) {
                                 $address->setUpdatedBy($this->security->getUser()) ;
                                 $address->setUpdatedAt(new \DateTime()) ;
                                         $address->setCreatedAt(new \DateTime()) ;
                                 }
                         }
-                }*/
+                }
         }
 
         public function listChildrenAction()

ShopBundle/Model/PointSale.php

                 $this->pointSaleDayInfos = new ArrayCollection();
         }
 
+        public function __toString()
+        {
+                return $this->getTitle() ;
+        }
+
         /**
          * @return Collection|Merchant[]
          */