[Global] Bug retour system pay

ShopBundle/Services/Order/OrderUtilsStockTrait.php

@@ -14,161 +14,172 @@ trait OrderUtilsStockTrait
                 //TODO ne pas déduire des stocks les orderProduct marqué en relivraison
 
                 foreach ($orderShop->getOrderProducts() as $orderProduct) {
-                        switch ($orderProduct->getProduct()->getProductFamily()->getBehaviorCountStock()) {
-                                case ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE :
+                        //Si ce n'esrt pas une relivraison OU si c'est une relivraison + relivraison + ce n'est pas une erruer producteur
+                        if (!$orderProduct->isRedelivery() || ($orderProduct->isRedelivery() && $orderProduct->isRedeliverySupplierOrder() && !$orderProduct->isRedeliverySupplierMistake())) {
+                                switch ($orderProduct->getProduct()->getProductFamily()->getBehaviorCountStock()) {
+                                        case ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE :
 
-                                        //Disponibilité par unité de référence
-                                        $oldAvailability = $orderProduct->getProduct()->getAvailableQuantityInherited();
-                                        $newAvailability = $oldAvailability - ($orderProduct->getQuantityOrder() * ($orderProduct->getQuantityProduct() / $orderProduct->getUnit()->getCoefficient()));
+                                                //Disponibilité par unité de référence
+                                                $oldAvailability = $orderProduct->getProduct()->getAvailableQuantityInherited();
+                                                $newAvailability = $oldAvailability - ($orderProduct->getQuantityOrder() * ($orderProduct->getQuantityProduct() / $orderProduct->getUnit()->getCoefficient()));
 
-                                        $productFamily = $orderProduct->getProduct()->getProductFamily();
-                                        $productFamily->setAvailableQuantity($newAvailability);
-                                        $productFamily->setUpdatedBy($orderShop->getUser());
+                                                $productFamily = $orderProduct->getProduct()->getProductFamily();
+                                                $productFamily->setAvailableQuantity($newAvailability);
+                                                $productFamily->setUpdatedBy($orderShop->getUser());
 
-                                        $this->em->persist($productFamily);
+                                                $this->em->persist($productFamily);
 
-                                        break;
-                                case ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY :
+                                                break;
+                                        case ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY :
 
-                                        $oldAvailability = $orderProduct->getProduct()->getAvailableQuantityInherited();
-                                        $newAvailability = $oldAvailability - $orderProduct->getQuantityOrder();
+                                                $oldAvailability = $orderProduct->getProduct()->getAvailableQuantityInherited();
+                                                $newAvailability = $oldAvailability - $orderProduct->getQuantityOrder();
 
-                                        $productFamily = $orderProduct->getProduct()->getProductFamily();
-                                        $productFamily->setAvailableQuantity($newAvailability);
-                                        $productFamily->setUpdatedBy($orderShop->getUser());
+                                                $productFamily = $orderProduct->getProduct()->getProductFamily();
+                                                $productFamily->setAvailableQuantity($newAvailability);
+                                                $productFamily->setUpdatedBy($orderShop->getUser());
 
-                                        $this->em->persist($productFamily);
+                                                $this->em->persist($productFamily);
 
-                                        break;
-                                case ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT :
-                                        $oldAvailability = $orderProduct->getProduct()->getAvailableQuantityInherited();
-                                        $newAvailability = $oldAvailability - $orderProduct->getQuantityOrder();
+                                                break;
+                                        case ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT :
+                                                $oldAvailability = $orderProduct->getProduct()->getAvailableQuantityInherited();
+                                                $newAvailability = $oldAvailability - $orderProduct->getQuantityOrder();
 
-                                        $product = $orderProduct->getProduct();
-                                        $product->setAvailableQuantity($newAvailability);
-                                        $product->setUpdatedBy($orderShop->getUser());
+                                                $product = $orderProduct->getProduct();
+                                                $product->setAvailableQuantity($newAvailability);
+                                                $product->setUpdatedBy($orderShop->getUser());
 
-                                        $this->em->persist($product);
+                                                $this->em->persist($product);
 
-                                        break;
-                        }
+                                                break;
+                                }
 
-                        $this->em->flush();
+                                $this->em->flush();
+                        }
                 }
         }
+}
 
-        public function isProductAvailable(Product $product, $quantityOrder = 0, $checkCart = false, $orderShop = null)
-        {
-                if ($product->getStatus() != 1 || $product->getProductFamily()->getStatus() != 1) {
-                        return false;
-                }
+public
+function isProductAvailable(Product $product, $quantityOrder = 0, $checkCart = false, $orderShop = null)
+{
+        if ($product->getStatus() != 1 || $product->getProductFamily()->getStatus() != 1) {
+                return false;
+        }
 
-                if (!$orderShop) {
-                        $orderShop = $this->getCartCurrent();
-                }
-                $productFamily = $product->getProductFamily();
-                $quantityAsked = $quantityOrder;
-
-                if ($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE) {
-                        if (!$quantityOrder) {
-                                $quantityAsked = $this->getQuantityOrderByProduct($orderShop, $product, true);
-                        } else {
-                                $quantityAsked = ($product->getQuantityInherited() / $product->getUnitInherited()->getCoefficient()) * $quantityOrder;
-                        }
+        if (!$orderShop) {
+                $orderShop = $this->getCartCurrent();
+        }
+        $productFamily = $product->getProductFamily();
+        $quantityAsked = $quantityOrder;
 
-                        if ($checkCart) {
-                                $quantityAsked += $this->getQuantityOrderByProduct($orderShop, $product, true);
-                        }
+        if ($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE) {
+                if (!$quantityOrder) {
+                        $quantityAsked = $this->getQuantityOrderByProduct($orderShop, $product, true);
+                } else {
+                        $quantityAsked = ($product->getQuantityInherited() / $product->getUnitInherited()->getCoefficient()) * $quantityOrder;
                 }
 
-                if (($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY
-                        || $productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT)) {
+                if ($checkCart) {
+                        $quantityAsked += $this->getQuantityOrderByProduct($orderShop, $product, true);
+                }
+        }
 
-                        if (!$quantityOrder) {
-                                $quantityAsked = $this->getQuantityOrderByProduct($orderShop, $product);
-                        }
+        if (($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY
+                || $productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT)) {
 
-                        if ($checkCart) {
-                                $quantityAsked += $this->getQuantityOrderByProduct($orderShop, $product);
-                        }
+                if (!$quantityOrder) {
+                        $quantityAsked = $this->getQuantityOrderByProduct($orderShop, $product);
                 }
 
-                if ($product->getAvailableQuantityInherited() >= $quantityAsked
-                        || $productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_UNLIMITED) {
-                        return true;
-                } else {
-                        return false;
+                if ($checkCart) {
+                        $quantityAsked += $this->getQuantityOrderByProduct($orderShop, $product);
                 }
         }
 
-        public function isOneProductAvailableAddCart($products): bool
-        {
-                foreach ($products as $product) {
-                        if ($this->isProductAvailable($product, 1, true)) {
-                                return true;
-                        }
-                }
-
+        if ($product->getAvailableQuantityInherited() >= $quantityAsked
+                || $productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_UNLIMITED) {
+                return true;
+        } else {
                 return false;
         }
+}
 
-        public function isOrderProductAvailable(OrderProductInterface $orderProduct)
-        {
-                return $this->isProductAvailable($orderProduct->getProduct(), $orderProduct->getQuantityOrder());
+public
+function isOneProductAvailableAddCart($products): bool
+{
+        foreach ($products as $product) {
+                if ($this->isProductAvailable($product, 1, true)) {
+                        return true;
+                }
         }
 
-        public function isOrderProductAvailableAddCart(OrderProductInterface $orderProduct, $orderShop = null)
-        {
-                $product = $orderProduct->getProduct();
-                return $this->isProductAvailable($product, $orderProduct->getQuantityOrder(), true, $orderShop);
-        }
+        return false;
+}
 
-        public function getQuantityOrderByProduct($orderShop, $product, $byWeight = false)
-        {
-                $quantity = 0;
-                $productFamily = $product->getProductFamily();
-                $behaviorCountStock = $productFamily->getBehaviorCountStock();
-
-                if ($orderShop) {
-                        foreach ($orderShop->getOrderProducts() as $orderProduct) {
-                                if ($orderProduct->getProduct()->getId() == $product->getId()
-                                        || (($behaviorCountStock == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY || $behaviorCountStock == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE)
-                                                && $orderProduct->getProduct()->getProductFamily()->getId() == $productFamily->getId())) {
-
-                                        if ($byWeight) {
-                                                $quantity += $orderProduct->getQuantityOrder() * ($orderProduct->getQuantityProduct() / $orderProduct->getProduct()->getUnitInherited()->getCoefficient());
-                                        } else {
-                                                $quantity += $orderProduct->getQuantityOrder();
-                                        }
+public
+function isOrderProductAvailable(OrderProductInterface $orderProduct)
+{
+        return $this->isProductAvailable($orderProduct->getProduct(), $orderProduct->getQuantityOrder());
+}
+
+public
+function isOrderProductAvailableAddCart(OrderProductInterface $orderProduct, $orderShop = null)
+{
+        $product = $orderProduct->getProduct();
+        return $this->isProductAvailable($product, $orderProduct->getQuantityOrder(), true, $orderShop);
+}
+
+public
+function getQuantityOrderByProduct($orderShop, $product, $byWeight = false)
+{
+        $quantity = 0;
+        $productFamily = $product->getProductFamily();
+        $behaviorCountStock = $productFamily->getBehaviorCountStock();
+
+        if ($orderShop) {
+                foreach ($orderShop->getOrderProducts() as $orderProduct) {
+                        if ($orderProduct->getProduct()->getId() == $product->getId()
+                                || (($behaviorCountStock == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_PRODUCT_FAMILY || $behaviorCountStock == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE)
+                                        && $orderProduct->getProduct()->getProductFamily()->getId() == $productFamily->getId())) {
+
+                                if ($byWeight) {
+                                        $quantity += $orderProduct->getQuantityOrder() * ($orderProduct->getQuantityProduct() / $orderProduct->getProduct()->getUnitInherited()->getCoefficient());
+                                } else {
+                                        $quantity += $orderProduct->getQuantityOrder();
                                 }
                         }
                 }
-
-                return $quantity;
         }
 
-        public function getProductQuantityMaxAddCart($product)
-        {
-                $orderShop = $this->getCartCurrent();
-                $productFamily = $product->getProductFamily();
+        return $quantity;
+}
 
-                $byWeight = false;
-                if ($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE) {
-                        $byWeight = true;
-                }
+public
+function getProductQuantityMaxAddCart($product)
+{
+        $orderShop = $this->getCartCurrent();
+        $productFamily = $product->getProductFamily();
 
-                return $product->getAvailableQuantityInherited() - $this->getQuantityOrderByProduct($orderShop, $product, $byWeight);
+        $byWeight = false;
+        if ($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE) {
+                $byWeight = true;
         }
 
-        public function getProductQuantity($product)
-        {
+        return $product->getAvailableQuantityInherited() - $this->getQuantityOrderByProduct($orderShop, $product, $byWeight);
+}
 
-                $productFamily = $product->getProductFamily();
+public
+function getProductQuantity($product)
+{
 
-                if ($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE) {
-                        return $product->getQuantityInherited() / $product->getUnitInherited()->getCoefficient();
-                } else {
-                        return 1;
-                }
+        $productFamily = $product->getProductFamily();
+
+        if ($productFamily->getBehaviorCountStock() == ProductFamily::BEHAVIOR_COUNT_STOCK_BY_MEASURE) {
+                return $product->getQuantityInherited() / $product->getUnitInherited()->getCoefficient();
+        } else {
+                return 1;
         }
 }
+}