Merge pull request #5761 from maianhtu010596/issues/5753

受注編集の画面で、金額にエラーがあると、課税区分のカッコ内が表示されなくなる不具合の修正
EC-CUBE · Jul 20, 2023 · 8873b3c · 8873b3c
2 parents 24a6b63 + 99b20b4
commit 8873b3c
Show file tree

Hide file tree

Showing 4 changed files with 87 additions and 21 deletions.
diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php
@@ -221,6 +221,12 @@ public function index(Request $request, RouterInterface $router, $id = null)
 
         $form->handleRequest($request);
         $purchaseContext = new PurchaseContext($OriginOrder, $OriginOrder->getCustomer());
+
+        foreach ($TargetOrder->getOrderItems() as $orderItem) {
+            if ($orderItem->getTaxDisplayType() == null) {
+                $orderItem->setTaxDisplayType($this->orderHelper->getTaxDisplayType($orderItem->getOrderItemType()));
+            }
+        }
 
         if ($form->isSubmitted() && $form['OrderItems']->isValid()) {
             $event = new EventArgs(

diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php
@@ -26,6 +26,7 @@
 use Eccube\Entity\Order;
 use Eccube\Entity\OrderItem;
 use Eccube\Entity\Shipping;
+use Eccube\Entity\Master\TaxDisplayType;
 use Eccube\EventListener\SecurityListener;
 use Eccube\Repository\DeliveryRepository;
 use Eccube\Repository\Master\DeviceTypeRepository;
@@ -528,4 +529,39 @@ private function getUser(): ?UserInterface
 
         return $user;
     }
+
+    /**
+     * 税表示区分を取得する.
+     *
+     * - 商品: 税抜
+     * - 送料: 税込
+     * - 値引き: 税抜
+     * - 手数料: 税込
+     * - ポイント値引き: 税込
+     *
+     * @param $OrderItemType
+     *
+     * @return TaxDisplayType
+     */
+    public function getTaxDisplayType($OrderItemType)
+    {
+        if ($OrderItemType instanceof OrderItemType) {
+            $OrderItemType = $OrderItemType->getId();
+        }
+
+        switch ($OrderItemType) {
+            case OrderItemType::PRODUCT:
+                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::EXCLUDED);
+            case OrderItemType::DELIVERY_FEE:
+                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED);
+            case OrderItemType::DISCOUNT:
+                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::EXCLUDED);
+            case OrderItemType::CHARGE:
+                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED);
+            case OrderItemType::POINT:
+                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED);
+            default:
+                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::EXCLUDED);
+        }
+    }
 }
diff --git a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php
@@ -23,6 +23,7 @@
 use Eccube\Service\PurchaseFlow\ItemHolderPreprocessor;
 use Eccube\Service\PurchaseFlow\PurchaseContext;
 use Eccube\Service\TaxRuleService;
+use Eccube\Service\OrderHelper;
 
 class TaxProcessor implements ItemHolderPreprocessor
 {
@@ -41,6 +42,11 @@ class TaxProcessor implements ItemHolderPreprocessor
      */
     protected $taxRuleService;
 
+    /**
+     * @var OrderHelper
+     */
+    protected $orderHelper;
+
     /**
      * TaxProcessor constructor.
      *
@@ -50,11 +56,13 @@ class TaxProcessor implements ItemHolderPreprocessor
     public function __construct(
         EntityManagerInterface $entityManager,
         TaxRuleRepository $taxRuleRepository,
-        TaxRuleService $taxRuleService
+        TaxRuleService $taxRuleService,
+        OrderHelper $orderHelper
     ) {
         $this->entityManager = $entityManager;
         $this->taxRuleRepository = $taxRuleRepository;
         $this->taxRuleService = $taxRuleService;
+        $this->orderHelper = $orderHelper;
     }
 
     /**
@@ -77,7 +85,7 @@ public function process(ItemHolderInterface $itemHolder, PurchaseContext $contex
                 $item->setTaxType($this->getTaxType($OrderItemType));
             }
             if (!$item->getTaxDisplayType()) {
-                $item->setTaxDisplayType($this->getTaxDisplayType($OrderItemType));
+                $item->setTaxDisplayType($this->orderHelper->getTaxDisplayType($OrderItemType));
             }
 
             // 税区分: 非課税, 不課税
@@ -152,28 +160,12 @@ protected function getTaxType($OrderItemType)
      * - ポイント値引き: 税込
      *
      * @param $OrderItemType
+     * @deprecated OrderHelper::getTaxDisplayTypeを使用してください
      *
-     * @return TaxType
+     * @return TaxDisplayType
      */
     protected function getTaxDisplayType($OrderItemType)
     {
-        if ($OrderItemType instanceof OrderItemType) {
-            $OrderItemType = $OrderItemType->getId();
-        }
-
-        switch ($OrderItemType) {
-            case OrderItemType::PRODUCT:
-                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::EXCLUDED);
-            case OrderItemType::DELIVERY_FEE:
-                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED);
-            case OrderItemType::DISCOUNT:
-                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::EXCLUDED);
-            case OrderItemType::CHARGE:
-                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED);
-            case OrderItemType::POINT:
-                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::INCLUDED);
-            default:
-                return $this->entityManager->find(TaxDisplayType::class, TaxDisplayType::EXCLUDED);
-        }
+        return $this->orderHelper->getTaxDisplayType($OrderItemType);
     }
 }
diff --git a/tests/Eccube/Tests/Service/OrderHelperTest.php b/tests/Eccube/Tests/Service/OrderHelperTest.php
@@ -17,6 +17,9 @@
 use Eccube\Entity\Order;
 use Eccube\Service\OrderHelper;
 use Eccube\Tests\EccubeTestCase;
+use Eccube\Entity\Master\TaxDisplayType;
+use Eccube\Entity\Master\OrderItemType;
+
 
 class OrderHelperTest extends EccubeTestCase
 {
@@ -69,4 +72,33 @@ public function testUpdateCustomerInfoNewCustomer()
         self::assertNotNull($Order->getName01());
         self::assertSame($Order->getName01(), $Customer->getName01());
     }
+
+    /**
+     * 税表示区分が問題ないかを確認する
+     * @dataProvider taxDisplayTypeProvider
+     */
+    public function testTaxDisplayType($OrderItemType, $TaxDisplayType)
+    {
+        $TaxDisplayType = $this->entityManager->find(TaxDisplayType::class, $TaxDisplayType);
+
+        self::assertSame($this->helper->getTaxDisplayType($OrderItemType), $TaxDisplayType);
+    }
+
+    public function taxDisplayTypeProvider()
+    {
+        // - 商品: 税抜
+        // - 送料: 税込
+        // - 手数料: 税込
+        // - 値引き: 税抜
+        // - 税: 税抜
+        // - ポイント値引き: 税込
+        return [
+            [OrderItemType::PRODUCT, TaxDisplayType::EXCLUDED],
+            [OrderItemType::DELIVERY_FEE, TaxDisplayType::INCLUDED],
+            [OrderItemType::CHARGE, TaxDisplayType::INCLUDED],
+            [OrderItemType::DISCOUNT, TaxDisplayType::EXCLUDED],
+            [OrderItemType::TAX, TaxDisplayType::EXCLUDED],
+            [OrderItemType::POINT, TaxDisplayType::INCLUDED],
+        ];
+    }
 }