[shopsys] upgraded doctrine/orm to latest version (#2775)

shopsys · Sep 12, 2023 · 4c86a91 · 4c86a91
1 parent e64d75e
commit 4c86a91
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/composer.json b/composer.json
@@ -118,9 +118,6 @@
             "docker": false
         }
     },
-    "conflict": {
-        "doctrine/orm": "2.12.0 || >=2.16.0"
-    },
     "suggest": {
         "ext-pgsql": "Required for dumping the Postgres database in shopsys:database:dump command"
     },

diff --git a/src/Model/Order/Order.php b/src/Model/Order/Order.php
@@ -313,6 +313,7 @@ public function __construct(
         $this->createdAsAdministratorName = $orderData->createdAsAdministratorName;
         $this->origin = $orderData->origin;
         $this->uuid = $orderData->uuid ?: Uuid::uuid4()->toString();
+        $this->setTotalPrice(new OrderTotalPrice(Money::zero(), Money::zero(), Money::zero()));
     }
 
     /**

diff --git a/src/Model/Order/OrderFacade.php b/src/Model/Order/OrderFacade.php
@@ -120,17 +120,15 @@ public function createOrder(OrderData $orderData, OrderPreview $orderPreview, ?C
             $customerUser,
         );
 
-        $this->fillOrderItems($order, $orderPreview);
+        $this->em->persist($order);
+        $this->em->flush();
 
-        foreach ($order->getItems() as $orderItem) {
-            $this->em->persist($orderItem);
-        }
+        $this->fillOrderItems($order, $orderPreview);
 
         $order->setTotalPrice(
             $this->orderPriceCalculation->getOrderTotalPrice($order),
         );
 
-        $this->em->persist($order);
         $this->em->flush();
 
         return $order;
@@ -389,6 +387,9 @@ protected function fillOrderProducts(Order $order, OrderPreview $orderPreview, s
                 $product,
             );
 
+            $this->em->persist($orderItem);
+            $this->em->flush();
+
             if ($quantifiedItemDiscount !== null) {
                 $this->addOrderItemDiscount(
                     $orderItem,
@@ -490,7 +491,7 @@ protected function addOrderItemDiscount(
             $orderItem->getName(),
         );
 
-        $this->orderItemFactory->createProduct(
+        $discount = $this->orderItemFactory->createProduct(
             $orderItem->getOrder(),
             $name,
             $quantifiedItemDiscount->inverse(),
@@ -500,6 +501,8 @@ protected function addOrderItemDiscount(
             null,
             null,
         );
+
+        $this->em->persist($discount);
     }
 
     /**