From 57a83310bcf1961da3ed2183ad5c1d8563fe3768 Mon Sep 17 00:00:00 2001 From: maianhtu010596 Date: Thu, 1 Sep 2022 16:06:03 +0700 Subject: [PATCH 01/10] Fix issues/5753 --- .../Controller/Admin/Order/EditController.php | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index 5d74d57ea17..80fda67ae86 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -18,6 +18,7 @@ use Eccube\Entity\Master\CustomerStatus; use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Master\OrderStatus; +use Eccube\Entity\Master\TaxDisplayType; use Eccube\Entity\Master\TaxType; use Eccube\Entity\Order; use Eccube\Entity\Shipping; @@ -221,6 +222,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->getTaxDisplayType($orderItem->getOrderItemType())); + } + } if ($form->isSubmitted() && $form['OrderItems']->isValid()) { $event = new EventArgs( @@ -690,4 +697,39 @@ public function searchOrderItemType(Request $request) throw new BadRequestHttpException(); } + + /** + * 税表示区分を取得する. + * + * - 商品: 税抜 + * - 送料: 税込 + * - 値引き: 税抜 + * - 手数料: 税込 + * - ポイント値引き: 税込 + * + * @param $OrderItemType + * + * @return TaxType + */ + 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); + } + } } From 54ea12e4e3fe8777920ecd43407eb2e0a42dca0a Mon Sep 17 00:00:00 2001 From: shinya Date: Fri, 14 Jul 2023 18:41:36 +0900 Subject: [PATCH 02/10] =?UTF-8?q?OrderHelper=E3=81=AB=E5=87=A6=E7=90=86?= =?UTF-8?q?=E3=82=92=E7=A7=BB=E5=8B=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/Admin/Order/EditController.php | 38 +------------------ src/Eccube/Service/OrderHelper.php | 37 ++++++++++++++++++ 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index 80fda67ae86..9b5a4b24454 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -18,7 +18,6 @@ use Eccube\Entity\Master\CustomerStatus; use Eccube\Entity\Master\OrderItemType; use Eccube\Entity\Master\OrderStatus; -use Eccube\Entity\Master\TaxDisplayType; use Eccube\Entity\Master\TaxType; use Eccube\Entity\Order; use Eccube\Entity\Shipping; @@ -225,7 +224,7 @@ public function index(Request $request, RouterInterface $router, $id = null) foreach ($TargetOrder->getOrderItems() as $orderItem) { if($orderItem->getTaxDisplayType() == null){ - $orderItem->setTaxDisplayType($this->getTaxDisplayType($orderItem->getOrderItemType())); + $orderItem->setTaxDisplayType($this->orderHelper->getTaxDisplayType($orderItem->getOrderItemType())); } } @@ -697,39 +696,4 @@ public function searchOrderItemType(Request $request) throw new BadRequestHttpException(); } - - /** - * 税表示区分を取得する. - * - * - 商品: 税抜 - * - 送料: 税込 - * - 値引き: 税抜 - * - 手数料: 税込 - * - ポイント値引き: 税込 - * - * @param $OrderItemType - * - * @return TaxType - */ - 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); - } - } } diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php index 141b67978d4..2b5bdac20ee 100644 --- 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,40 @@ private function getUser(): ?UserInterface return $user; } + + /** + * 税表示区分を取得する. + * + * - 商品: 税抜 + * - 送料: 税込 + * - 値引き: 税抜 + * - 手数料: 税込 + * - ポイント値引き: 税込 + * + * @param $OrderItemType + * + * @return TaxType + * @see Symfony\Bundle\FrameworkBundle\Controller\AbstractController + */ + 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); + } + } } From c346f0f7184bf61745f4372e8634cbc98b74f923 Mon Sep 17 00:00:00 2001 From: shinya Date: Tue, 18 Jul 2023 17:39:36 +0900 Subject: [PATCH 03/10] =?UTF-8?q?TaxProcessor=E3=82=82=E5=85=B1=E9=80=9A?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/OrderHelper.php | 2 +- .../PurchaseFlow/Processor/TaxProcessor.php | 41 +++---------------- 2 files changed, 6 insertions(+), 37 deletions(-) diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php index 2b5bdac20ee..a351acc4b89 100644 --- a/src/Eccube/Service/OrderHelper.php +++ b/src/Eccube/Service/OrderHelper.php @@ -530,7 +530,7 @@ private function getUser(): ?UserInterface return $user; } - /** + /** * 税表示区分を取得する. * * - 商品: 税抜 diff --git a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php index 5fbf48936b9..8e3fbd871e2 100644 --- 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 { @@ -50,11 +51,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 +80,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)); } // 税区分: 非課税, 不課税 @@ -142,38 +145,4 @@ protected function getTaxType($OrderItemType) return $this->entityManager->find(TaxType::class, $TaxType); } - /** - * 税表示区分を取得する. - * - * - 商品: 税抜 - * - 送料: 税込 - * - 値引き: 税抜 - * - 手数料: 税込 - * - ポイント値引き: 税込 - * - * @param $OrderItemType - * - * @return TaxType - */ - 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); - } - } } From 4f54e2ba69eb6d8ea14dc3c7501970da3abd987d Mon Sep 17 00:00:00 2001 From: shinya Date: Tue, 18 Jul 2023 18:27:03 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=AE?= =?UTF-8?q?=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Eccube/Tests/Service/OrderHelperTest.php | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/tests/Eccube/Tests/Service/OrderHelperTest.php b/tests/Eccube/Tests/Service/OrderHelperTest.php index 83dc30e9654..3971dbd143f 100644 --- a/tests/Eccube/Tests/Service/OrderHelperTest.php +++ b/tests/Eccube/Tests/Service/OrderHelperTest.php @@ -69,4 +69,23 @@ public function testUpdateCustomerInfoNewCustomer() self::assertNotNull($Order->getName01()); self::assertSame($Order->getName01(), $Customer->getName01()); } + + /** + * 税表示区分が問題ないかを確認する + */ + public function testTaxDisplayType() + { + // 商品：税抜 OrderItemType::PRODUCT + self::assertSame($this->helper->getTaxDisplayType(1)['name'],'税抜'); + // 送料：税込 OrderItemType::DELIVERY_FEE + self::assertSame($this->helper->getTaxDisplayType(2)['name'],'税込'); + // 手数量：税込 OrderItemType::CHARGE + self::assertSame($this->helper->getTaxDisplayType(3)['name'],'税込'); + // 値引：税抜 OrderItemType::DISCOUNT + self::assertSame($this->helper->getTaxDisplayType(4)['name'],'税抜'); + // 税：税抜 OrderItemType::TAX + self::assertSame($this->helper->getTaxDisplayType(5)['name'],'税抜'); + // ポイント値引き：税込 OrderItemType::POINT + self::assertSame($this->helper->getTaxDisplayType(6)['name'],'税込'); + } } From 02eea0b9a047a909465040b61f20b5688bce429f Mon Sep 17 00:00:00 2001 From: shinya Date: Wed, 19 Jul 2023 16:13:53 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=82=92DataP?= =?UTF-8?q?rovider=E3=82=92=E4=BD=BF=E3=81=86=E5=BD=A2=E5=BC=8F=E3=81=B8?= =?UTF-8?q?=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Eccube/Tests/Service/OrderHelperTest.php | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/tests/Eccube/Tests/Service/OrderHelperTest.php b/tests/Eccube/Tests/Service/OrderHelperTest.php index 3971dbd143f..3a0c51783a3 100644 --- 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 { @@ -72,20 +75,30 @@ public function testUpdateCustomerInfoNewCustomer() /** * 税表示区分が問題ないかを確認する + * @dataProvider taxDisplayTypeProvider */ - public function testTaxDisplayType() + public function testTaxDisplayType($OrderItemType, $TaxDisplayType) + { + $TaxDisplayType = $this->entityManager->find(TaxDisplayType::class, $TaxDisplayType); + + self::assertSame($this->helper->getTaxDisplayType($OrderItemType), $TaxDisplayType); + } + + public function taxDisplayTypeProvider() { - // 商品：税抜 OrderItemType::PRODUCT - self::assertSame($this->helper->getTaxDisplayType(1)['name'],'税抜'); - // 送料：税込 OrderItemType::DELIVERY_FEE - self::assertSame($this->helper->getTaxDisplayType(2)['name'],'税込'); - // 手数量：税込 OrderItemType::CHARGE - self::assertSame($this->helper->getTaxDisplayType(3)['name'],'税込'); - // 値引：税抜 OrderItemType::DISCOUNT - self::assertSame($this->helper->getTaxDisplayType(4)['name'],'税抜'); - // 税：税抜 OrderItemType::TAX - self::assertSame($this->helper->getTaxDisplayType(5)['name'],'税抜'); - // ポイント値引き：税込 OrderItemType::POINT - self::assertSame($this->helper->getTaxDisplayType(6)['name'],'税込'); + // - 商品: 税抜 + // - 送料: 税込 + // - 手数料: 税込 + // - 値引き: 税抜 + // - 税: 税抜 + // - ポイント値引き: 税込 + 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], + ]; } } From f18e9a0bfff47dfb66bdedce1323e580d640a5ec Mon Sep 17 00:00:00 2001 From: shinya Date: Wed, 19 Jul 2023 16:21:24 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=E9=96=93=E9=81=95=E3=81=84=E9=83=A8?= =?UTF-8?q?=E5=88=86=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/OrderHelper.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Eccube/Service/OrderHelper.php b/src/Eccube/Service/OrderHelper.php index a351acc4b89..8c6b6675612 100644 --- a/src/Eccube/Service/OrderHelper.php +++ b/src/Eccube/Service/OrderHelper.php @@ -541,8 +541,7 @@ private function getUser(): ?UserInterface * * @param $OrderItemType * - * @return TaxType - * @see Symfony\Bundle\FrameworkBundle\Controller\AbstractController + * @return TaxDisplayType */ public function getTaxDisplayType($OrderItemType) { From d5af7f91b88f4462682eeeb76fc5b89df564a206 Mon Sep 17 00:00:00 2001 From: shinya Date: Wed, 19 Jul 2023 17:26:40 +0900 Subject: [PATCH 07/10] =?UTF-8?q?phpstan=E6=8C=87=E6=91=98=E4=BA=8B?= =?UTF-8?q?=E9=A0=85=E3=82=92=E5=8F=8D=E6=98=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Service/PurchaseFlow/Processor/TaxProcessor.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php index 8e3fbd871e2..cb86a1a219a 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php @@ -42,6 +42,11 @@ class TaxProcessor implements ItemHolderPreprocessor */ protected $taxRuleService; + /** + * @var OrderHelper + */ + protected $orderHelper; + /** * TaxProcessor constructor. * @@ -57,7 +62,7 @@ public function __construct( $this->entityManager = $entityManager; $this->taxRuleRepository = $taxRuleRepository; $this->taxRuleService = $taxRuleService; - $this->orderHelper = $orderHelper; + $this->orderHelper = $orderHelper; } /** @@ -144,5 +149,4 @@ protected function getTaxType($OrderItemType) return $this->entityManager->find(TaxType::class, $TaxType); } - } From ceb90dde42778d3822387d76f7302e8a1e0706da Mon Sep 17 00:00:00 2001 From: shinya Date: Wed, 19 Jul 2023 18:33:58 +0900 Subject: [PATCH 08/10] =?UTF-8?q?=E5=89=8A=E9=99=A4=E3=81=97=E3=81=9Ffunct?= =?UTF-8?q?ion=E3=82=92=E4=BA=92=E6=8F=9B=E6=80=A7=E7=B6=AD=E6=8C=81?= =?UTF-8?q?=E3=81=AE=E3=81=9F=E3=82=81=E5=BE=A9=E5=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controller/Admin/Order/EditController.php | 2 +- .../PurchaseFlow/Processor/TaxProcessor.php | 35 +++++++++++++++++++ 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/Eccube/Controller/Admin/Order/EditController.php b/src/Eccube/Controller/Admin/Order/EditController.php index 9b5a4b24454..11cfc38fc1b 100644 --- a/src/Eccube/Controller/Admin/Order/EditController.php +++ b/src/Eccube/Controller/Admin/Order/EditController.php @@ -223,7 +223,7 @@ public function index(Request $request, RouterInterface $router, $id = null) $purchaseContext = new PurchaseContext($OriginOrder, $OriginOrder->getCustomer()); foreach ($TargetOrder->getOrderItems() as $orderItem) { - if($orderItem->getTaxDisplayType() == null){ + if ($orderItem->getTaxDisplayType() == null) { $orderItem->setTaxDisplayType($this->orderHelper->getTaxDisplayType($orderItem->getOrderItemType())); } } diff --git a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php index cb86a1a219a..312be1c73a0 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php @@ -149,4 +149,39 @@ protected function getTaxType($OrderItemType) return $this->entityManager->find(TaxType::class, $TaxType); } + + /** + * 税表示区分を取得する. + * + * - 商品: 税抜 + * - 送料: 税込 + * - 値引き: 税抜 + * - 手数料: 税込 + * - ポイント値引き: 税込 + * + * @param $OrderItemType + * + * @return TaxType + */ + 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); + } + } } From 8b33dcffe414bd8dd0c45833297b9d0ba6ae385c Mon Sep 17 00:00:00 2001 From: shinya Date: Thu, 20 Jul 2023 10:11:33 +0900 Subject: [PATCH 09/10] =?UTF-8?q?=E5=87=A6=E7=90=86=E3=81=AE=E7=A7=BB?= =?UTF-8?q?=E8=AD=B2=E3=82=92=E5=8F=8D=E6=98=A0=E3=81=A8=E8=AA=A4=E8=A8=98?= =?UTF-8?q?=E3=82=92=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PurchaseFlow/Processor/TaxProcessor.php | 21 ++----------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php index 312be1c73a0..d152d69a35e 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php @@ -161,27 +161,10 @@ protected function getTaxType($OrderItemType) * * @param $OrderItemType * - * @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); } } From 99b20b47882369ff231ae2a8f572ed37bb152570 Mon Sep 17 00:00:00 2001 From: shinya Date: Thu, 20 Jul 2023 10:13:15 +0900 Subject: [PATCH 10/10] =?UTF-8?q?deprecated=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php index d152d69a35e..1514a77129e 100644 --- a/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php +++ b/src/Eccube/Service/PurchaseFlow/Processor/TaxProcessor.php @@ -160,6 +160,7 @@ protected function getTaxType($OrderItemType) * - ポイント値引き: 税込 * * @param $OrderItemType + * @deprecated OrderHelper::getTaxDisplayTypeを使用してください * * @return TaxDisplayType */