Merge branch 'develop'

ShopBundle/Model/OrderShop.php

 
 namespace Lc\ShopBundle\Model;
 
-use App\Entity\OrderStatus;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Gedmo\Mapping\Annotation as Gedmo;
 use Doctrine\ORM\Mapping as ORM;
 use Lc\ShopBundle\Context\DocumentInterface;
 use Lc\ShopBundle\Context\FilterMerchantInterface;
+use Lc\ShopBundle\Services\Order\OrderUtils;
+use Lc\ShopBundle\Model\OrderStatus ;
 
 /**
  * @ORM\MappedSuperclass()
 
         public function getDateCreated()
         {
-                $orderStatusHistory = $this->getOrderStatusHistory('new');
+                $orderStatusHistory = $this->getOrderStatusHistory(OrderStatus::ALIAS_WAITING_DELIVERY);
                 if ($orderStatusHistory) {
                         return $orderStatusHistory->getCreatedAt();
                 }