Merge pull request #6 from okazy/kurozumi-patch-13

ログイン時のカートマージでカートが別れる場合のDoctrineのエラーを回避
tao-s · Mar 16, 2021 · 5c5d965 · 5c5d965
2 parents e26c7b3 + a7cfaf1
commit 5c5d965
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/Eccube/Entity/CartItem.php b/src/Eccube/Entity/CartItem.php
@@ -65,7 +65,7 @@ class CartItem extends \Eccube\Entity\AbstractEntity implements ItemInterface
         /**
          * @var \Eccube\Entity\Cart
          *
-         * @ORM\ManyToOne(targetEntity="Eccube\Entity\Cart", inversedBy="CartItems")
+         * @ORM\ManyToOne(targetEntity="Eccube\Entity\Cart", inversedBy="CartItems", cascade={"persist"})
          * @ORM\JoinColumns({
          *   @ORM\JoinColumn(name="cart_id", referencedColumnName="id", onDelete="CASCADE")
          * })
@@ -91,7 +91,7 @@ public function getId()
         {
             return $this->id;
         }
-        
+
         /**
          * @param  integer  $price
          *

diff --git a/src/Eccube/Service/CartService.php b/src/Eccube/Service/CartService.php
@@ -400,9 +400,7 @@ public function save()
             $this->entityManager->persist($Cart);
             foreach ($Cart->getCartItems() as $item) {
                 $this->entityManager->persist($item);
-                $this->entityManager->flush();
             }
-            $this->entityManager->persist($Cart);
             $this->entityManager->flush();
             $cartKeys[] = $Cart->getCartKey();
         }