Merge branch 'develop'

ShopBundle/Model/Document.php

@@ -6,6 +6,7 @@ use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
 use Lc\ShopBundle\Context\FilterMerchantInterface;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
  * @ORM\MappedSuperclass()
@@ -80,6 +81,20 @@ abstract class Document extends AbstractDocumentEntity implements FilterMerchant
          */
         protected $orderRefund;
 
+        /**
+         * @Gedmo\Blameable(on="create")
+         * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\UserInterface")
+         * @ORM\JoinColumn(nullable=true)
+         */
+        protected $createdBy;
+
+        /**
+         * @Gedmo\Blameable(on="update")
+         * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\UserInterface")
+         * @ORM\JoinColumn(nullable=true)
+         */
+        protected $updatedBy;
+
         public function __construct()
         {
                 $this->orderShops = new ArrayCollection();

ShopBundle/Services/TicketUtils.php

@@ -38,7 +38,7 @@ class TicketUtils
                         $ticket->setVisitorToken(uniqid()) ;
                 }
 
-                $ticket->setTicketStatus(Ticket::TICKET_STATUS_OPEN) ;
+                $ticket->setStatus(Ticket::TICKET_STATUS_OPEN) ;
                 $ticket->setType($params['type']) ;
                 if(isset($params['orderShop']) && $params['orderShop'] && $params['orderShop'] instanceof OrderShopInterface) {
                         $ticket->setOrderShop($params['orderShop']) ;