Merge branch 'develop'

ShopBundle/Model/Product.php

@@ -11,6 +11,7 @@ use Lc\ShopBundle\Context\ProductInterface;
 use Lc\ShopBundle\Context\ProductPropertyInterface;
 use Lc\ShopBundle\Context\SortableInterface;
 use Lc\ShopBundle\Services\Price;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 /**
  * @ORM\MappedSuperclass()
@@ -20,6 +21,20 @@ abstract class Product extends AbstractEntity implements SortableInterface, Prod
         use SortableTrait;
         use ProductPropertyTrait;
 
+        /**
+         * @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;
+
         /**
          * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\ProductFamilyInterface", inversedBy="products")
          * @ORM\JoinColumn(nullable=false)

ShopBundle/Model/ProductFamily.php

@@ -9,6 +9,7 @@ use Lc\ShopBundle\Context\FilterMerchantInterface;
 use Lc\ShopBundle\Context\PriceInterface;
 use Lc\ShopBundle\Context\ProductInterface;
 use Lc\ShopBundle\Context\ProductPropertyInterface;
+use Gedmo\Mapping\Annotation as Gedmo;
 
 
 /**
@@ -54,6 +55,20 @@ abstract class ProductFamily extends AbstractDocumentEntity implements ProductPr
         //Champ hydraté par ProductFamilyUtils
         protected $reductionCatalog;
 
+        /**
+         * @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;
+
         /**
          * @ORM\ManyToOne(targetEntity="Lc\ShopBundle\Context\MerchantInterface", inversedBy="productFamilies")
          * @ORM\JoinColumn(nullable=false)