Merge branch 'develop'

ShopBundle/Services/Order/OrderUtilsPaymentTrait.php

                 $orderPayment->setReference($reference);
                 $orderPayment->setComment($comment);
                 $orderPayment->setEditable(false);
+                $orderPayment->setCreatedBy($orderShop->getUser()) ;
+                $orderPayment->setUpdatedBy($orderShop->getUser()) ;
 
                 if ($paidAt) {
                         $orderPayment->setPaidAt($paidAt);