Merge pull request #4126 from shutta-/#4125

在庫が0の状態で注文取り消しができるように修正

src/Eccube/Service/PurchaseFlow/Processor/StockDiffProcessor.php

@@ -67,15 +67,16 @@ public function validate(ItemHolderInterface $itemHolder, PurchaseContext $conte
             }
             $stock = $ProductClass->getStock();
             // 更新後ステータスがキャンセルの場合は, 差分ではなく更新後の個数で確認.
-            if ($To->getOrderStatus() && $To->getOrderStatus()->getId() == OrderStatus::CANCEL) {
+            if ($To->getOrderStatus() && $To->getOrderStatus()->getId() == OrderStatus::CANCEL
+                && $From->getOrderStatus() && $From->getOrderStatus()->getId() != OrderStatus::CANCEL) {
                 $Items = $To->getProductOrderItems();
                 $Items = array_filter($Items, function ($Item) use ($id) {
                     return $Item->getProductClass()->getId() == $id;
                 });
                 $toQuantity = array_reduce($Items, function ($quantity, $Item) {
                     return $quantity += $Item->getQuantity();
                 }, 0);
-                if ($stock - $toQuantity < 0) {
+                if ($stock + $toQuantity < 0) {
                     $this->throwInvalidItemException(trans('purchase_flow.over_stock', ['%name%' => $ProductClass->formattedProductName()]));
                 }
             } else {

tests/Eccube/Tests/Service/PurchaseFlow/Processor/StockDiffProcessorTest.php

@@ -0,0 +1,239 @@
+<?php
+
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) EC-CUBE CO.,LTD. All Rights Reserved.
+ *
+ * http://www.ec-cube.co.jp/
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+namespace Eccube\Tests\Service\PurchaseFlow\Processor;
+
+use Eccube\Entity\BaseInfo;
+use Eccube\Entity\Customer;
+use Eccube\Entity\Master\OrderItemType;
+use Eccube\Entity\Master\OrderStatus;
+use Eccube\Entity\Order;
+use Eccube\Entity\OrderItem;
+use Eccube\Entity\ProductClass;
+use Eccube\Repository\Master\OrderItemTypeRepository;
+use Eccube\Repository\Master\OrderStatusRepository;
+use Eccube\Service\PurchaseFlow\Processor\StockDiffProcessor;
+use Eccube\Service\PurchaseFlow\PurchaseContext;
+use Eccube\Service\PurchaseFlow\PurchaseFlow;
+use Eccube\Tests\EccubeTestCase;
+
+class StockDiffProcessorTest extends EccubeTestCase
+{
+    /** @var StockDiffProcessor */
+    private $processor;
+
+    /** @var OrderItemTypeRepository */
+    private $OrderItemTypeRepository;
+
+    /** @var OrderStatusRepository */
+    private $OrderStatusRepository;
+
+    /** @var BaseInfo */
+    private $BaseInfo;
+
+    public function setUp()
+    {
+        parent::setUp();
+        $this->processor = $this->container->get(StockDiffProcessor::class);
+        $this->OrderStatusRepository = $this->container->get(OrderStatusRepository::class);
+        $this->OrderItemTypeRepository = $this->container->get(OrderItemTypeRepository::class);
+        $this->BaseInfo = $this->entityManager->find(BaseInfo::class, 1);
+    }
+
+    /**
+     * @dataProvider validateProvider
+     *
+     * @param $stock int 在庫数
+     * @param $beforeQuantity int 編集前の商品の数量
+     * @param $afterQuantity int 編集後の商品の数量
+     * @param $isError bool バリデーションエラーがある場合はtrue
+     * @param $beforeOrderStatus int 編集前の受注ステータス
+     * @param $afterOrderStatus int 編集後の受注ステータス
+     */
+    public function testValidate($stock, $beforeQuantity, $afterQuantity, $isError, $beforeOrderStatus, $afterOrderStatus)
+    {
+        $Customer = new Customer();
+
+        /* @var ProductClass $ProductClass */
+        $ProductClass = $this->createProduct('テスト', 1)->getProductClasses()->first();
+
+        $OrderItemType = $this->OrderItemTypeRepository->find(OrderItemType::PRODUCT);
+
+        // 編集前の受注
+        $BeforeOrder = new Order();
+        $BeforeOrderStatus = $this->OrderStatusRepository->find($beforeOrderStatus);
+        $BeforeOrder->setOrderStatus($BeforeOrderStatus);
+        $BeforeOrder->setCustomer($Customer);
+        $ProductClass->setStock($stock);
+        $beforeOrderItem = $this->newOrderItem($ProductClass, 1000, $beforeQuantity);
+        $beforeOrderItem->setOrderItemType($OrderItemType);
+        $BeforeOrder->addOrderItem($beforeOrderItem);
+
+        // 編集後の受注
+        $AfterOrder = new Order();
+        $AfterOrderStatus = $this->OrderStatusRepository->find($afterOrderStatus);
+        $AfterOrder->setOrderStatus($AfterOrderStatus);
+        $AfterOrder->setCustomer($Customer);
+        $ProductClass->setStock($stock);
+        $afterOrderItem = $this->newOrderItem($ProductClass, 1000, $afterQuantity);
+        $afterOrderItem->setOrderItemType($OrderItemType);
+        $AfterOrder->addOrderItem($afterOrderItem);
+
+        $purchaseFlow = new PurchaseFlow();
+        $purchaseFlow->setFlowType(PurchaseContext::ORDER_FLOW);
+        $purchaseFlow->addItemHolderValidator($this->processor);
+        $context = new PurchaseContext($BeforeOrder, $Customer);
+        $result = $purchaseFlow->validate($AfterOrder, $context);
+
+        $this->expected = $isError;
+        $this->actual = $result->hasError();
+        $this->verify('バリデーションエラーの有無を判定');
+
+        if ($isError) {
+            $productName = $ProductClass->formattedProductName($afterOrderStatus);
+            $this->expected = '「'.$productName.'」の在庫が足りません。';
+            $this->actual = $result->getErrors()[0]->getMessage();
+            $this->verify('バリデーションエラーのメッセージを比較。');
+        }
+    }
+
+    public function validateProvider()
+    {
+        return [
+            [10, 2, 12, false, OrderStatus::NEW, OrderStatus::NEW],
+            [1, 3, 2, false, OrderStatus::NEW, OrderStatus::PAID],
+            [1, 1, 2, false, OrderStatus::NEW, OrderStatus::IN_PROGRESS],
+            [0, 3, 6, false, OrderStatus::NEW, OrderStatus::CANCEL],
+            [2, 4, 6, false, OrderStatus::NEW, OrderStatus::DELIVERED],
+            [3, 1, 1, false, OrderStatus::PAID, OrderStatus::PAID],
+            [1, 1, 1, false, OrderStatus::PAID, OrderStatus::IN_PROGRESS],
+            [1, 1, 10, false, OrderStatus::PAID, OrderStatus::CANCEL],
+            [1, 12, 13, false, OrderStatus::PAID, OrderStatus::DELIVERED],
+            [1, 1, 1, false, OrderStatus::IN_PROGRESS, OrderStatus::IN_PROGRESS],
+            [1, 1, 1, false, OrderStatus::IN_PROGRESS, OrderStatus::CANCEL],
+            [1, 1, 1, false, OrderStatus::IN_PROGRESS, OrderStatus::DELIVERED],
+            [1, 1, 2, false, OrderStatus::CANCEL, OrderStatus::IN_PROGRESS],
+            [1, 1, 2, false, OrderStatus::CANCEL, OrderStatus::CANCEL],
+            [1, 1, 2, false, OrderStatus::DELIVERED, OrderStatus::DELIVERED],
+            [1, 1, 2, false, OrderStatus::DELIVERED, OrderStatus::RETURNED],
+            [3, 3, 6, false, OrderStatus::RETURNED, OrderStatus::DELIVERED],
+            [3, 3, 6, false, OrderStatus::RETURNED, OrderStatus::RETURNED],
+            [10, 2, 13, true, OrderStatus::NEW, OrderStatus::NEW],
+            [1, 3, 5, true, OrderStatus::NEW, OrderStatus::PAID],
+            [1, 1, 3, true, OrderStatus::NEW, OrderStatus::IN_PROGRESS],
+            [0, 3, -1, true, OrderStatus::NEW, OrderStatus::CANCEL],
+            [2, 4, 7, true, OrderStatus::NEW, OrderStatus::DELIVERED],
+            [3, 1, 7, true, OrderStatus::PAID, OrderStatus::PAID],
+            [1, 1, 3, true, OrderStatus::PAID, OrderStatus::IN_PROGRESS],
+            [1, 1, -2, true, OrderStatus::PAID, OrderStatus::CANCEL],
+            [1, 12, 14, true, OrderStatus::PAID, OrderStatus::DELIVERED],
+            [1, 1, 3, true, OrderStatus::IN_PROGRESS, OrderStatus::IN_PROGRESS],
+            [1, 1, -2, true, OrderStatus::IN_PROGRESS, OrderStatus::CANCEL],
+            [1, 1, 3, true, OrderStatus::IN_PROGRESS, OrderStatus::DELIVERED],
+            [1, 1, 3, true, OrderStatus::CANCEL, OrderStatus::IN_PROGRESS],
+            [0, 1, 2, true, OrderStatus::CANCEL, OrderStatus::CANCEL],
+            [1, 1, 3, true, OrderStatus::DELIVERED, OrderStatus::DELIVERED],
+            [1, 1, 3, true, OrderStatus::DELIVERED, OrderStatus::RETURNED],
+            [3, 3, 7, true, OrderStatus::RETURNED, OrderStatus::DELIVERED],
+            [3, 3, 7, true, OrderStatus::RETURNED, OrderStatus::RETURNED],
+        ];
+    }
+
+    /**
+     * @dataProvider prepareProvider
+     * @param $beforeStock int 編集前の在庫数
+     * @param $afterStock int 編集後の在庫数
+     * @param $beforeQuantity int 編集前の商品の数量
+     * @param $afterQuantity int 編集後の商品の数量
+     * @param $beforeOrderStatus int 編集前の受注ステータス
+     * @param $afterOrderStatus int 編集後の受注ステータス
+     * @throws \Eccube\Service\PurchaseFlow\PurchaseException
+     */
+    public function testPrepare($beforeStock, $afterStock, $beforeQuantity, $afterQuantity, $beforeOrderStatus, $afterOrderStatus)
+    {
+        $Customer = new Customer();
+
+        /* @var ProductClass $ProductClass */
+        $ProductClass = $this->createProduct('テスト', 1)->getProductClasses()->first();
+
+        $OrderItemType = $this->OrderItemTypeRepository->find(OrderItemType::PRODUCT);
+
+        // 編集前の受注
+        $BeforeOrder = new Order();
+        $BeforeOrderStatus = $this->OrderStatusRepository->find($beforeOrderStatus);
+        $BeforeOrder->setOrderStatus($BeforeOrderStatus);
+        $BeforeOrder->setCustomer($Customer);
+        $ProductClass->setStock($beforeStock);
+        $beforeOrderItem = $this->newOrderItem($ProductClass, 1000, $beforeQuantity);
+        $beforeOrderItem->setOrderItemType($OrderItemType);
+        $BeforeOrder->addOrderItem($beforeOrderItem);
+
+        // 編集後の受注
+        $AfterOrder = new Order();
+        $AfterOrderStatus = $this->OrderStatusRepository->find($afterOrderStatus);
+        $AfterOrder->setOrderStatus($AfterOrderStatus);
+        $AfterOrder->setCustomer($Customer);
+        $ProductClass->setStock($beforeStock);
+        $afterOrderItem = $this->newOrderItem($ProductClass, 1000, $afterQuantity);
+        $afterOrderItem->setOrderItemType($OrderItemType);
+        $AfterOrder->addOrderItem($afterOrderItem);
+
+        $purchaseFlow = new PurchaseFlow();
+        $purchaseFlow->setFlowType(PurchaseContext::ORDER_FLOW);
+        $purchaseFlow->addPurchaseProcessor($this->processor);
+        $context = new PurchaseContext($BeforeOrder, $Customer);
+        $purchaseFlow->prepare($AfterOrder, $context);
+        $this->expected = $afterStock;
+        $this->actual = $ProductClass->getStock();
+        $this->verify('dtb_product_class の在庫数(stock)が正しくセットされていない。');
+
+        $ProductStock = $ProductClass->getProductStock();
+        $this->expected = $afterStock;
+        $this->actual = $ProductStock->getStock();
+        $this->verify('dtb_product_stock の在庫数(stock)が正しくセットされていない。');
+    }
+
+    public function prepareProvider()
+    {
+        return [
+            [10, 0, 2, 12, OrderStatus::NEW, OrderStatus::NEW],
+            [1, 2, 3, 2, OrderStatus::NEW, OrderStatus::PAID],
+            [1, 0, 1, 2, OrderStatus::NEW, OrderStatus::IN_PROGRESS],
+            [0, 1, 3, 2, OrderStatus::NEW, OrderStatus::CANCEL],
+            [2, 0, 4, 6, OrderStatus::NEW, OrderStatus::DELIVERED],
+            [3, 3, 1, 1, OrderStatus::PAID, OrderStatus::PAID],
+            [1, 1, 1, 1, OrderStatus::PAID, OrderStatus::IN_PROGRESS],
+            [1, 0, 1, 2, OrderStatus::PAID, OrderStatus::CANCEL],
+            [1, 0, 12, 13, OrderStatus::PAID, OrderStatus::DELIVERED],
+            [1, 2, 1, 0, OrderStatus::IN_PROGRESS, OrderStatus::IN_PROGRESS],
+            [1, 1, 1, 1, OrderStatus::IN_PROGRESS, OrderStatus::CANCEL],
+            [1, 2, 1, 0, OrderStatus::IN_PROGRESS, OrderStatus::DELIVERED],
+            [1, 2, 1, 0, OrderStatus::CANCEL, OrderStatus::IN_PROGRESS],
+            [1, 0, 1, 2, OrderStatus::CANCEL, OrderStatus::CANCEL],
+            [1, 0, 1, 2, OrderStatus::DELIVERED, OrderStatus::DELIVERED],
+            [1, 0, 1, 2, OrderStatus::DELIVERED, OrderStatus::RETURNED],
+            [3, 0, 3, 6, OrderStatus::RETURNED, OrderStatus::DELIVERED],
+            [3, 0, 3, 6, OrderStatus::RETURNED, OrderStatus::RETURNED],
+        ];
+    }
+
+    private function newOrderItem($ProductClass, $price, $quantity)
+    {
+        $OrderItem = new OrderItem();
+        $OrderItem->setProductClass($ProductClass);
+        $OrderItem->setPrice($price);
+        $OrderItem->setQuantity($quantity);
+
+        return $OrderItem;
+    }
+}