Merge branch 'develop' of https://gitea.laclic.fr/Laclic/LcShopBundle into develop

ShopBundle/Model/OrderShop.php

@@ -75,11 +75,6 @@ abstract class OrderShop extends AbstractEntity implements FilterMerchantInterfa
          */
         protected $orderProducts;
 
-        /**
-         * @ORM\OneToMany(targetEntity="Lc\ShopBundle\Context\CreditHistoryInterface", mappedBy="orderShop", orphanRemoval=true)
-         */
-        protected $creditHistories;
-
         /**
          * @ORM\Column(type="text", nullable=true)
          */

ShopBundle/Services/Order/OrderUtils.php

@@ -180,7 +180,8 @@ class OrderUtils
 
                                 foreach ($orderShop->getOrderProducts() as $orderProduct) {
                                         if ($orderProduct->getProduct()->getId() == $orderProductAdd->getProduct()->getId()
-                                                && (string)$this->priceUtils->getPrice($orderProduct) == (string)$this->priceUtils->getPrice($orderProductAdd)
+                                                && $orderProduct->getRedelivery() == $orderProductAdd->getRedelivery()
+                                                && (string) $this->priceUtils->getPrice($orderProduct) == (string) $this->priceUtils->getPrice($orderProductAdd)
                                                 && $this->compareOrderProductReductionCatalog($orderProduct->getOrderProductReductionCatalog(), $orderProductAdd->getOrderProductReductionCatalog())) {
 
                                                 $orderProduct->setQuantityOrder($orderProduct->getQuantityOrder() + $orderProductAdd->getQuantityOrder());