Sfoglia il codice sorgente

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

feature/export_comptable
Fab 4 anni fa
parent
commit
9b38d15eca
2 ha cambiato i file con 2 aggiunte e 6 eliminazioni
  1. +0
    -5
      ShopBundle/Model/OrderShop.php
  2. +2
    -1
      ShopBundle/Services/Order/OrderUtils.php

+ 0
- 5
ShopBundle/Model/OrderShop.php Vedi File

@@ -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)
*/

+ 2
- 1
ShopBundle/Services/Order/OrderUtils.php Vedi File

@@ -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());

Loading…
Annulla
Salva