Merge branch 'develop'

ShopBundle/Services/Order/OrderUtilsStockTrait.php

@@ -23,7 +23,7 @@ trait OrderUtilsStockTrait
 
                                         $productFamily = $orderProduct->getProduct()->getProductFamily() ;
                                         $productFamily->setAvailableQuantity($newAvailability);
-                                        $productFamily->setUpdatedBy($productFamily->getCreatedBy()) ;
+                                        $productFamily->setUpdatedBy($orderShop->getUser()) ;
 
                                         $this->em->persist($productFamily);
 
@@ -35,7 +35,7 @@ trait OrderUtilsStockTrait
 
                                         $productFamily = $orderProduct->getProduct()->getProductFamily() ;
                                         $productFamily->setAvailableQuantity($newAvailability);
-                                        $productFamily->setUpdatedBy($productFamily->getCreatedBy()) ;
+                                        $productFamily->setUpdatedBy($orderShop->getUser()) ;
 
                                         $this->em->persist($productFamily);
 
@@ -46,7 +46,7 @@ trait OrderUtilsStockTrait
 
                                         $product = $orderProduct->getProduct() ;
                                         $product->setAvailableQuantity($newAvailability);
-                                        $product->setUpdatedBy($product->getCreatedBy()) ;
+                                        $product->setUpdatedBy($orderShop->getUser()) ;
 
                                         $this->em->persist($product);