diff --git a/src/Eccube/Resource/template/default/Shopping/confirm.twig b/src/Eccube/Resource/template/default/Shopping/confirm.twig
index 8f608521bfe..4abbba128c8 100644
--- a/src/Eccube/Resource/template/default/Shopping/confirm.twig
+++ b/src/Eccube/Resource/template/default/Shopping/confirm.twig
@@ -221,6 +221,16 @@ file that was distributed with this source code.
{% endif %}
+ {# 配送方法・支払い方法の保存チェックボックス(会員かつ単一配送先のみ) #}
+ {% if form.save_preferred_shipping_payment is defined and (isMultipleShipping is not defined or not isMultipleShipping) %}
+
{{ 'front.shopping.delivery_info'|trans }}
diff --git a/tests/Eccube/Tests/Controller/ShoppingControllerSavePreferredShippingPaymentTest.php b/tests/Eccube/Tests/Controller/ShoppingControllerSavePreferredShippingPaymentTest.php
new file mode 100644
index 00000000000..92801f0a1cc
--- /dev/null
+++ b/tests/Eccube/Tests/Controller/ShoppingControllerSavePreferredShippingPaymentTest.php
@@ -0,0 +1,187 @@
+resetLoggerFacade();
+ LoggerFacade::init($this->createStub(ContainerInterface::class), $this->createStub(Logger::class));
+
+ $this->entityManager = $this->createMock(EntityManagerInterface::class);
+ $this->flashBag = $this->createMock(FlashBagInterface::class);
+
+ $session = $this->createMock(FlashBagAwareSessionInterface::class);
+ $session->method('getFlashBag')->willReturn($this->flashBag);
+
+ // getUser() は会員を返すようにオーバーライドし, それ以外の実装は維持する.
+ $this->controller = $this->getMockBuilder(ShoppingController::class)
+ ->disableOriginalConstructor()
+ ->onlyMethods(['getUser'])
+ ->getMock();
+ $this->controller->method('getUser')->willReturn(new Customer());
+
+ $reflection = new \ReflectionClass($this->controller);
+ $reflection->getProperty('entityManager')->setValue($this->controller, $this->entityManager);
+ $reflection->getProperty('session')->setValue($this->controller, $session);
+ }
+
+ protected function tearDown(): void
+ {
+ $this->resetLoggerFacade();
+
+ parent::tearDown();
+ }
+
+ /**
+ * 保存処理で例外が発生しても再スローされず, 注文完了画面用のフラッシュが積まれること.
+ */
+ public function testSwallowsExceptionAndAddsFlash(): void
+ {
+ $form = $this->createCheckedForm();
+ $Order = $this->createSingleShippingOrder();
+
+ // flush で例外を発生させる.
+ $this->entityManager->method('flush')->willThrowException(new \RuntimeException('DB error'));
+
+ // 注文完了画面用のフラッシュが積まれること.
+ $this->flashBag->expects($this->once())
+ ->method('add')
+ ->with('preferred_save_error', 'front.shopping.preferred_save_failed');
+
+ // 例外が再スローされない（注文処理が継続できる）こと.
+ $this->callSavePreferredShippingPayment($Order, $form);
+ }
+
+ /**
+ * 複数配送先の場合は flush を行わず, フラッシュも積まないこと（保存スキップ）.
+ */
+ public function testSkipsSaveWhenMultipleShipping(): void
+ {
+ $form = $this->createCheckedForm();
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getId')->willReturn(1);
+ $Order->method('getShippings')->willReturn(new ArrayCollection([
+ $this->createStub(Shipping::class),
+ $this->createStub(Shipping::class),
+ ]));
+
+ $this->entityManager->expects($this->never())->method('flush');
+ $this->flashBag->expects($this->never())->method('add');
+
+ $this->callSavePreferredShippingPayment($Order, $form);
+ }
+
+ /**
+ * チェックボックスが OFF の場合は flush を行わないこと.
+ */
+ public function testSkipsSaveWhenCheckboxOff(): void
+ {
+ $childForm = $this->createMock(FormInterface::class);
+ $childForm->method('getData')->willReturn(false);
+ $form = $this->createMock(FormInterface::class);
+ $form->method('has')->with('save_preferred_shipping_payment')->willReturn(true);
+ $form->method('get')->with('save_preferred_shipping_payment')->willReturn($childForm);
+
+ $Order = $this->createSingleShippingOrder();
+
+ $this->entityManager->expects($this->never())->method('flush');
+ $this->flashBag->expects($this->never())->method('add');
+
+ $this->callSavePreferredShippingPayment($Order, $form);
+ }
+
+ /**
+ * save_preferred_shipping_payment が ON のフォームモックを生成する.
+ */
+ private function createCheckedForm(): FormInterface|MockObject
+ {
+ $childForm = $this->createMock(FormInterface::class);
+ $childForm->method('getData')->willReturn(true);
+
+ $form = $this->createMock(FormInterface::class);
+ $form->method('has')->with('save_preferred_shipping_payment')->willReturn(true);
+ $form->method('get')->with('save_preferred_shipping_payment')->willReturn($childForm);
+
+ return $form;
+ }
+
+ /**
+ * 単一配送先で Payment / Delivery を持つ受注モックを生成する.
+ */
+ private function createSingleShippingOrder(): Order|MockObject
+ {
+ $Shipping = $this->createMock(Shipping::class);
+ $Shipping->method('getDelivery')->willReturn($this->createStub(Delivery::class));
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getId')->willReturn(1);
+ $Order->method('getShippings')->willReturn(new ArrayCollection([$Shipping]));
+ $Order->method('getPayment')->willReturn($this->createStub(Payment::class));
+
+ return $Order;
+ }
+
+ private function resetLoggerFacade(): void
+ {
+ $ref = new \ReflectionClass(LoggerFacade::class);
+ $ref->getProperty('instance')->setValue(null, null);
+ }
+
+ private function callSavePreferredShippingPayment(Order $Order, FormInterface $form): void
+ {
+ $reflection = new \ReflectionClass($this->controller);
+ $method = $reflection->getMethod('savePreferredShippingPayment');
+ $method->invoke($this->controller, $Order, $form);
+ }
+}
diff --git a/tests/Eccube/Tests/Controller/ShoppingControllerValidatePreferredShippingPaymentTest.php b/tests/Eccube/Tests/Controller/ShoppingControllerValidatePreferredShippingPaymentTest.php
new file mode 100644
index 00000000000..e95fad54d2d
--- /dev/null
+++ b/tests/Eccube/Tests/Controller/ShoppingControllerValidatePreferredShippingPaymentTest.php
@@ -0,0 +1,474 @@
+resetLoggerFacade();
+ LoggerFacade::init($this->createStub(ContainerInterface::class), $this->createStub(Logger::class));
+
+ $this->deliveryRepository = $this->createMock(DeliveryRepository::class);
+ $this->paymentRepository = $this->createMock(PaymentRepository::class);
+
+ $this->controller = $this->getMockBuilder(ShoppingController::class)
+ ->disableOriginalConstructor()
+ ->onlyMethods([])
+ ->getMock();
+
+ $reflection = new \ReflectionClass($this->controller);
+ $reflection->getProperty('deliveryRepository')->setValue($this->controller, $this->deliveryRepository);
+ $reflection->getProperty('paymentRepository')->setValue($this->controller, $this->paymentRepository);
+ }
+
+ protected function tearDown(): void
+ {
+ $this->resetLoggerFacade();
+
+ parent::tearDown();
+ }
+
+ /**
+ * 会員IDが存在しない場合, すべての戻り値がnullまたはfalseであること.
+ */
+ public function testWithoutCustomerId(): void
+ {
+ $Customer = $this->createCustomerWithId(null);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertNull($result['preferredPaymentId']);
+ $this->assertNull($result['preferredPaymentName']);
+ $this->assertNull($result['preferredDeliveryId']);
+ $this->assertNull($result['preferredDeliveryName']);
+ $this->assertFalse($result['isMultipleShipping']);
+ $this->assertNull($result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 保存情報が存在しない場合, preferredUnavailableReasonがnullであること.
+ */
+ public function testWithoutPreferredInfo(): void
+ {
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment();
+ $Customer->setPreferredDelivery();
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertNull($result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 保存済み Payment が非公開の場合, 支払い方法が利用不可の理由が返ること.
+ */
+ public function testWithInvisiblePayment(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(false);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_payment_unavailable', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 保存済み Delivery が非公開の場合, 配送方法が利用不可の理由が返ること.
+ */
+ public function testWithInvisibleDelivery(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(false);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_delivery_unavailable', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * Payment のみ保存されている場合(参照先削除等), 配送方法が利用不可の理由が返ること.
+ */
+ public function testWithPaymentOnly(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery();
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_delivery_unavailable', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * Delivery のみ保存されている場合(参照先削除等), 支払い方法が利用不可の理由が返ること.
+ */
+ public function testWithDeliveryOnly(): void
+ {
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment();
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_payment_unavailable', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 利用可能な配送方法が存在しない場合, 組み合わせ不可の理由が返ること.
+ */
+ public function testWithoutAvailableDeliveries(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+ $Payment->method('getId')->willReturn(1);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+ $Delivery->method('getId')->willReturn(1);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+ $Order->method('getSaleTypes')->willReturn([]);
+
+ $this->deliveryRepository->method('getDeliveries')->willReturn([]);
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_incompatible_combination', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 保存された配送方法が利用可能な配送方法に含まれていない場合, 組み合わせ不可の理由が返ること.
+ */
+ public function testWithIncompatibleDelivery(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+ $Payment->method('getId')->willReturn(1);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+ $Delivery->method('getId')->willReturn(1);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+ $Order->method('getSaleTypes')->willReturn([]);
+
+ // 利用可能な配送方法に保存された配送方法(ID:1)が含まれない.
+ $availableDelivery = $this->createMock(Delivery::class);
+ $availableDelivery->method('getId')->willReturn(2);
+ $this->deliveryRepository->method('getDeliveries')->willReturn([$availableDelivery]);
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_incompatible_combination', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 保存された支払い方法が利用可能な支払い方法に含まれていない場合, 組み合わせ不可の理由が返ること.
+ */
+ public function testWithIncompatiblePayment(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+ $Payment->method('getId')->willReturn(1);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+ $Delivery->method('getId')->willReturn(1);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+ $Order->method('getSaleTypes')->willReturn([]);
+
+ $availableDelivery = $this->createMock(Delivery::class);
+ $availableDelivery->method('getId')->willReturn(1);
+ $this->deliveryRepository->method('getDeliveries')->willReturn([$availableDelivery]);
+
+ // 利用可能な支払い方法に保存された支払い方法(ID:1)が含まれない.
+ $availablePayment = $this->createMock(Payment::class);
+ $availablePayment->method('getId')->willReturn(2);
+ $availablePayment->method('isVisible')->willReturn(true);
+ $this->paymentRepository->method('findAllowedPayments')->willReturn([$availablePayment]);
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame('front.shopping.preferred_incompatible_combination', $result['preferredUnavailableReason']);
+ }
+
+ /**
+ * すべての検証をパスした場合, ID・名称が設定され理由がnullであること.
+ */
+ public function testSuccess(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+ $Payment->method('getId')->willReturn(1);
+ $Payment->method('getMethod')->willReturn('クレジットカード');
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+ $Delivery->method('getId')->willReturn(1);
+ $Delivery->method('getName')->willReturn('宅配便');
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+ $Order->method('getSaleTypes')->willReturn([]);
+
+ $availableDelivery = $this->createMock(Delivery::class);
+ $availableDelivery->method('getId')->willReturn(1);
+ $this->deliveryRepository->method('getDeliveries')->willReturn([$availableDelivery]);
+
+ $availablePayment = $this->createMock(Payment::class);
+ $availablePayment->method('getId')->willReturn(1);
+ $availablePayment->method('isVisible')->willReturn(true);
+ $this->paymentRepository->method('findAllowedPayments')->willReturn([$availablePayment]);
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertSame(1, $result['preferredPaymentId']);
+ $this->assertSame('クレジットカード', $result['preferredPaymentName']);
+ $this->assertSame(1, $result['preferredDeliveryId']);
+ $this->assertSame('宅配便', $result['preferredDeliveryName']);
+ $this->assertNull($result['preferredUnavailableReason']);
+ }
+
+ /**
+ * 複数配送先の場合, isMultipleShippingがtrueであること.
+ */
+ public function testMultipleShipping(): void
+ {
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment();
+ $Customer->setPreferredDelivery();
+
+ $shipping1 = $this->createStub(Shipping::class);
+ $shipping2 = $this->createStub(Shipping::class);
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection([$shipping1, $shipping2]));
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertTrue($result['isMultipleShipping']);
+ }
+
+ /**
+ * 単一配送先の場合, isMultipleShippingがfalseであること.
+ */
+ public function testSingleShipping(): void
+ {
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment();
+ $Customer->setPreferredDelivery();
+
+ $shipping1 = $this->createStub(Shipping::class);
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection([$shipping1]));
+
+ $result = $this->callValidatePreferredShippingPayment($Customer, $Order);
+
+ $this->assertFalse($result['isMultipleShipping']);
+ }
+
+ /**
+ * DeliveryRepository::getDeliveries が受注の販売種別で呼び出されること.
+ */
+ public function testCallsDeliveryRepositoryWithSaleTypes(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+ $Payment->method('getId')->willReturn(1);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+ $Delivery->method('getId')->willReturn(1);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $saleTypes = ['dummy_sale_type'];
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+ $Order->method('getSaleTypes')->willReturn($saleTypes);
+
+ $availableDelivery = $this->createMock(Delivery::class);
+ $availableDelivery->method('getId')->willReturn(1);
+ $this->deliveryRepository->expects($this->once())
+ ->method('getDeliveries')
+ ->with($saleTypes)
+ ->willReturn([$availableDelivery]);
+
+ $availablePayment = $this->createMock(Payment::class);
+ $availablePayment->method('getId')->willReturn(1);
+ $availablePayment->method('isVisible')->willReturn(true);
+ $this->paymentRepository->method('findAllowedPayments')->willReturn([$availablePayment]);
+
+ $this->callValidatePreferredShippingPayment($Customer, $Order);
+ }
+
+ /**
+ * PaymentRepository::findAllowedPayments が一致した配送方法で呼び出されること.
+ */
+ public function testCallsPaymentRepositoryWithMatchedDelivery(): void
+ {
+ $Payment = $this->createMock(Payment::class);
+ $Payment->method('isVisible')->willReturn(true);
+ $Payment->method('getId')->willReturn(1);
+
+ $Delivery = $this->createMock(Delivery::class);
+ $Delivery->method('isVisible')->willReturn(true);
+ $Delivery->method('getId')->willReturn(1);
+
+ $Customer = $this->createCustomerWithId(1);
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+
+ $Order = $this->createMock(Order::class);
+ $Order->method('getShippings')->willReturn(new ArrayCollection());
+ $Order->method('getSaleTypes')->willReturn([]);
+
+ $availableDelivery = $this->createMock(Delivery::class);
+ $availableDelivery->method('getId')->willReturn(1);
+ $this->deliveryRepository->method('getDeliveries')->willReturn([$availableDelivery]);
+
+ $availablePayment = $this->createMock(Payment::class);
+ $availablePayment->method('getId')->willReturn(1);
+ $availablePayment->method('isVisible')->willReturn(true);
+ $this->paymentRepository->expects($this->once())
+ ->method('findAllowedPayments')
+ ->with([$availableDelivery], true)
+ ->willReturn([$availablePayment]);
+
+ $this->callValidatePreferredShippingPayment($Customer, $Order);
+ }
+
+ /**
+ * LoggerFacade のシングルトンをリセットする.
+ */
+ private function resetLoggerFacade(): void
+ {
+ $ref = new \ReflectionClass(LoggerFacade::class);
+ $ref->getProperty('instance')->setValue(null, null);
+ }
+
+ /**
+ * 指定IDを持つ Customer を生成する(IDはIDENTITY採番のためリフレクションで設定する).
+ */
+ private function createCustomerWithId(?int $id): Customer
+ {
+ $Customer = new Customer();
+ $ref = new \ReflectionProperty(Customer::class, 'id');
+ $ref->setValue($Customer, $id);
+
+ return $Customer;
+ }
+
+ /**
+ * private メソッド validatePreferredShippingPayment を呼び出す.
+ *
+ * @return array{preferredPaymentId: int|null, preferredPaymentName: string|null, preferredDeliveryId: int|null, preferredDeliveryName: string|null, isMultipleShipping: bool, preferredUnavailableReason: string|null}
+ */
+ private function callValidatePreferredShippingPayment(Customer $Customer, Order $Order, string $logPrefix = '[保存情報検証]'): array
+ {
+ $reflection = new \ReflectionClass($this->controller);
+ $method = $reflection->getMethod('validatePreferredShippingPayment');
+
+ return $method->invoke($this->controller, $Customer, $Order, $logPrefix);
+ }
+}
diff --git a/tests/Eccube/Tests/Entity/CustomerTest.php b/tests/Eccube/Tests/Entity/CustomerTest.php
new file mode 100644
index 00000000000..2822fddf8c2
--- /dev/null
+++ b/tests/Eccube/Tests/Entity/CustomerTest.php
@@ -0,0 +1,108 @@
+assertNotInstanceOf(Payment::class, $Customer->getPreferredPayment());
+ $this->assertNotInstanceOf(Delivery::class, $Customer->getPreferredDelivery());
+
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+ $this->assertSame($Payment, $Customer->getPreferredPayment());
+ $this->assertSame($Delivery, $Customer->getPreferredDelivery());
+
+ $Customer->setPreferredPayment();
+ $Customer->setPreferredDelivery();
+ $this->assertNull($Customer->getPreferredPayment());
+ $this->assertNull($Customer->getPreferredDelivery());
+ }
+
+ /**
+ * 優先支払方法・優先配送方法が DB に保存される.
+ */
+ public function testPreferredPaymentAndDeliveryPersistence(): void
+ {
+ $Customer = $this->createCustomer();
+ $Delivery = static::getContainer()->get(Generator::class)->createDelivery();
+ $Payment = $this->createPayment($Delivery, 'テスト支払い方法');
+
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+ $this->entityManager->flush();
+ $this->entityManager->clear();
+
+ /** @var Customer $found */
+ $found = $this->entityManager->getRepository(Customer::class)->find($Customer->getId());
+ $this->assertSame($Payment->getId(), $found->getPreferredPayment()->getId());
+ $this->assertSame($Delivery->getId(), $found->getPreferredDelivery()->getId());
+ }
+
+ /**
+ * 参照先の Payment / Delivery を削除すると, 外部キーの ON DELETE SET NULL により未設定へ戻る.
+ */
+ public function testPreferredResetToNullWhenReferenceDeleted(): void
+ {
+ // SQLite は既定で外部キー制約(ON DELETE SET NULL)を強制しないため, この検証は対象外とする.
+ // 実 DB (PostgreSQL / MySQL) では FK により未設定へ戻ることを担保する.
+ if ($this->entityManager->getConnection()->getDriver()->getDatabasePlatform()->getName() === 'sqlite') {
+ $this->markTestSkipped('SQLite は外部キーの ON DELETE SET NULL を既定で強制しないためスキップします.');
+ }
+
+ $Customer = $this->createCustomer();
+ $Delivery = static::getContainer()->get(Generator::class)->createDelivery();
+ $Payment = $this->createPayment($Delivery, 'テスト支払い方法');
+
+ $Customer->setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+ $this->entityManager->flush();
+
+ // 参照先を SQL で削除する(関連レコードを先に削除).
+ $conn = $this->entityManager->getConnection();
+ $conn->executeStatement('DELETE FROM dtb_payment_option WHERE delivery_id = :id', ['id' => $Delivery->getId()]);
+ $conn->executeStatement('DELETE FROM dtb_delivery_fee WHERE delivery_id = :id', ['id' => $Delivery->getId()]);
+ $conn->executeStatement('DELETE FROM dtb_delivery_time WHERE delivery_id = :id', ['id' => $Delivery->getId()]);
+ $conn->executeStatement('DELETE FROM dtb_payment WHERE id = :id', ['id' => $Payment->getId()]);
+ $conn->executeStatement('DELETE FROM dtb_delivery WHERE id = :id', ['id' => $Delivery->getId()]);
+
+ $this->entityManager->clear();
+
+ /** @var Customer $found */
+ $found = $this->entityManager->getRepository(Customer::class)->find($Customer->getId());
+ $this->assertNotInstanceOf(Payment::class, $found->getPreferredPayment());
+ $this->assertNotInstanceOf(Delivery::class, $found->getPreferredDelivery());
+ }
+}
diff --git a/tests/Eccube/Tests/Web/ShoppingControllerPreferredShippingPaymentTest.php b/tests/Eccube/Tests/Web/ShoppingControllerPreferredShippingPaymentTest.php
new file mode 100644
index 00000000000..18e134516e4
--- /dev/null
+++ b/tests/Eccube/Tests/Web/ShoppingControllerPreferredShippingPaymentTest.php
@@ -0,0 +1,473 @@
+setPreferredPayment($Payment);
+ $Customer->setPreferredDelivery($Delivery);
+ $this->entityManager->flush();
+ }
+
+ private function findPayment(int $id): Payment
+ {
+ $Payment = $this->entityManager->getRepository(Payment::class)->find($id);
+ $this->assertInstanceOf(Payment::class, $Payment);
+
+ return $Payment;
+ }
+
+ private function findDelivery(int $id): Delivery
+ {
+ $Delivery = $this->entityManager->getRepository(Delivery::class)->find($id);
+ $this->assertInstanceOf(Delivery::class, $Delivery);
+
+ return $Delivery;
+ }
+
+ private function findProcessingOrder(Customer $Customer): Order
+ {
+ $Order = $this->entityManager->getRepository(Order::class)->findOneBy(['Customer' => $Customer]);
+ $this->assertInstanceOf(Order::class, $Order);
+
+ return $Order;
+ }
+
+ /**
+ * 非会員購入フローで注文手続き画面まで進める.
+ *
+ * @return array
+ */
+ private function createNonmemberFormData(): array
+ {
+ $faker = $this->getFaker();
+ $email = $faker->safeEmail;
+ $form = $this->createShippingFormData();
+ $form['email'] = [
+ 'first' => $email,
+ 'second' => $email,
+ ];
+
+ return $form;
+ }
+
+ private function scenarioConfirmAsGuest(): Crawler
+ {
+ $this->scenarioCartIn();
+ $this->scenarioInput($this->createNonmemberFormData());
+ $this->client->followRedirect();
+
+ return $this->scenarioConfirm();
+ }
+
+ /**
+ * 数量2の商品を2つのお届け先に分割し, 複数配送先の受注を作成する.
+ */
+ private function createMultiShippingOrder(Customer $Customer): Order
+ {
+ $Customer->addCustomerAddress($this->createCustomerAddress($Customer));
+
+ $this->scenarioCartIn($Customer);
+ $this->scenarioCartIn($Customer);
+ $this->scenarioConfirm($Customer);
+
+ $crawler = $this->client->request(Request::METHOD_GET, $this->generateUrl('shopping_shipping_multiple'));
+ $shippings = $crawler->filter('#form_shipping_multiple_0_shipping_0_customer_address > option')->each(
+ fn ($node, $i) => [
+ 'customer_address' => $node->attr('value'),
+ 'quantity' => 1,
+ ]
+ );
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_shipping_multiple'),
+ ['form' => [
+ 'shipping_multiple' => [0 => ['shipping' => $shippings]],
+ '_token' => 'dummy',
+ ]]
+ );
+
+ $Order = $this->findProcessingOrder($Customer);
+ $this->assertCount(2, $Order->getShippings());
+
+ return $Order;
+ }
+
+ /**
+ * 保存情報がある会員は注文手続き画面に情報ボックスと復元ボタンが表示される.
+ */
+ public function testIndexWithPreferredShowsInfoBox(): void
+ {
+ $Customer = $this->createCustomer();
+ $Payment = $this->findPayment(3);
+ $Delivery = $this->findDelivery(1);
+ $this->setPreferred($Customer, $Payment, $Delivery);
+
+ $this->scenarioCartIn($Customer);
+ $crawler = $this->scenarioConfirm($Customer);
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $preferredBox = $crawler->filter('.ec-orderPreferred');
+ $this->assertCount(1, $preferredBox);
+ $this->assertStringContainsString('保存された設定があります', (string) $preferredBox->text());
+ $this->assertStringContainsString($Delivery->getName(), (string) $preferredBox->text());
+ $this->assertStringContainsString($Payment->getMethod(), (string) $preferredBox->text());
+ $this->assertStringContainsString('この設定を使用する', (string) $preferredBox->text());
+ }
+
+ /**
+ * 保存情報がない会員には情報ボックスが表示されない.
+ */
+ public function testIndexWithoutPreferredHidesInfoBox(): void
+ {
+ $Customer = $this->createCustomer();
+
+ $this->scenarioCartIn($Customer);
+ $crawler = $this->scenarioConfirm($Customer);
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $this->assertCount(0, $crawler->filter('.ec-orderPreferred'));
+ }
+
+ /**
+ * ゲストユーザーには情報ボックスが表示されない.
+ */
+ public function testIndexWithGuestHidesInfoBox(): void
+ {
+ $crawler = $this->scenarioConfirmAsGuest();
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $this->assertCount(0, $crawler->filter('.ec-orderPreferred'));
+ }
+
+ /**
+ * 保存情報が利用できない場合, 注文手続き画面の初期表示で警告が表示され復元ボタンは出ない.
+ */
+ public function testIndexWithUnavailablePreferredShowsWarningWithoutButton(): void
+ {
+ $Customer = $this->createCustomer();
+ $Payment = $this->findPayment(3);
+ $this->setPreferred($Customer, $Payment, $this->findDelivery(1));
+
+ // 保存済みの支払い方法を非公開にする.
+ $Payment->setVisible(false);
+ $this->entityManager->flush();
+
+ $this->scenarioCartIn($Customer);
+ $crawler = $this->scenarioConfirm($Customer);
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $preferredBox = $crawler->filter('.ec-orderPreferred');
+ $this->assertCount(1, $preferredBox);
+ $this->assertStringContainsString('保存された支払い方法が現在利用できません', (string) $preferredBox->text());
+ // 復元ボタン・成功表示は出ない.
+ $this->assertStringNotContainsString('この設定を使用する', (string) $preferredBox->text());
+ $this->assertStringNotContainsString('保存された設定があります', (string) $preferredBox->text());
+ }
+
+ /**
+ * 復元で保存された配送方法・支払い方法が受注へ適用され, 成功メッセージが表示される.
+ */
+ public function testRestorePreferred(): void
+ {
+ $Customer = $this->createCustomer();
+ $Payment = $this->findPayment(3);
+ $Delivery = $this->findDelivery(1);
+ $this->setPreferred($Customer, $Payment, $Delivery);
+
+ $this->scenarioCartIn($Customer);
+ $this->scenarioConfirm($Customer);
+
+ // 保存値と異なる支払い方法へ変更しておく.
+ $Order = $this->findProcessingOrder($Customer);
+ $OtherPayment = $this->findPayment(4);
+ $Order->setPayment($OtherPayment);
+ $Order->setPaymentMethod($OtherPayment->getMethod());
+ // 復元前にお届け時間を設定しておく(配送方法の差し替えでクリアされるべき).
+ $ShippingBefore = $Order->getShippings()->first();
+ $this->assertNotFalse($ShippingBefore);
+ $ShippingBefore->setTimeId(99);
+ $ShippingBefore->setShippingDeliveryTime('サンプルお届け時間');
+ $this->entityManager->flush();
+
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_restore_preferred'),
+ ['_token' => '_dummy']
+ );
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('shopping')));
+
+ $this->entityManager->refresh($Order);
+ $this->assertSame($Payment->getId(), $Order->getPayment()->getId());
+ $this->assertSame($Payment->getMethod(), $Order->getPaymentMethod());
+ $Shipping = $Order->getShippings()->first();
+ $this->assertNotFalse($Shipping);
+ $this->entityManager->refresh($Shipping);
+ $this->assertSame($Delivery->getId(), $Shipping->getDelivery()->getId());
+ $this->assertSame($Delivery->getName(), $Shipping->getShippingDeliveryName());
+ // 配送方法の差し替えに伴い, お届け時間はクリアされる.
+ $this->assertNull($Shipping->getTimeId());
+ $this->assertNull($Shipping->getShippingDeliveryTime());
+
+ // リダイレクト後の画面に成功メッセージが表示される.
+ $crawler = $this->client->followRedirect();
+ $this->assertStringContainsString('保存された設定を適用しました', $crawler->html());
+ }
+
+ /**
+ * 保存された支払い方法が非公開の場合は復元されず, 警告メッセージが表示される.
+ */
+ public function testRestorePreferredWithInvisiblePayment(): void
+ {
+ $Customer = $this->createCustomer();
+ $Payment = $this->findPayment(3);
+ $Delivery = $this->findDelivery(1);
+ $this->setPreferred($Customer, $Payment, $Delivery);
+
+ $Payment->setVisible(false);
+ $this->entityManager->flush();
+
+ $this->scenarioCartIn($Customer);
+ $this->scenarioConfirm($Customer);
+
+ $Order = $this->findProcessingOrder($Customer);
+ $beforePaymentId = $Order->getPayment()->getId();
+
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_restore_preferred'),
+ ['_token' => '_dummy']
+ );
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('shopping')));
+
+ $this->entityManager->refresh($Order);
+ $this->assertSame($beforePaymentId, $Order->getPayment()->getId());
+
+ $crawler = $this->client->followRedirect();
+ $this->assertStringContainsString('保存された支払い方法が現在利用できません', $crawler->html());
+ }
+
+ /**
+ * ゲストユーザーは復元エンドポイントへアクセスできない(403).
+ */
+ public function testRestorePreferredForbiddenForGuest(): void
+ {
+ $this->scenarioConfirmAsGuest();
+
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_restore_preferred'),
+ ['_token' => '_dummy']
+ );
+
+ $this->assertSame(Response::HTTP_FORBIDDEN, $this->client->getResponse()->getStatusCode(), (string) $this->client->getResponse()->getContent());
+ }
+
+ /**
+ * 複数配送先の場合, 情報ボックスと注記は表示されるが復元ボタンは表示されない.
+ */
+ public function testIndexWithMultipleShippingShowsInfoBoxWithoutButton(): void
+ {
+ $Customer = $this->createCustomer();
+ $this->setPreferred($Customer, $this->findPayment(3), $this->findDelivery(1));
+ $this->createMultiShippingOrder($Customer);
+
+ $crawler = $this->scenarioConfirm($Customer);
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $preferredBox = $crawler->filter('.ec-orderPreferred');
+ $this->assertCount(1, $preferredBox);
+ $this->assertStringContainsString('保存された設定があります', (string) $preferredBox->text());
+ $this->assertStringContainsString('複数配送先指定時は保存設定の復元はできません', (string) $preferredBox->text());
+ $this->assertStringNotContainsString('この設定を使用する', (string) $preferredBox->text());
+ }
+
+ /**
+ * 複数配送先の場合, 復元処理はスキップされ注記メッセージが表示される.
+ */
+ public function testRestorePreferredWithMultipleShippingSkips(): void
+ {
+ $Customer = $this->createCustomer();
+ $this->setPreferred($Customer, $this->findPayment(3), $this->findDelivery(1));
+ $Order = $this->createMultiShippingOrder($Customer);
+
+ $this->scenarioConfirm($Customer);
+ $this->entityManager->refresh($Order);
+ $beforePaymentId = $Order->getPayment()->getId();
+
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_restore_preferred'),
+ ['_token' => '_dummy']
+ );
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('shopping')));
+
+ $this->entityManager->refresh($Order);
+ $this->assertSame($beforePaymentId, $Order->getPayment()->getId());
+
+ $crawler = $this->client->followRedirect();
+ $this->assertStringContainsString('複数配送先指定時は保存設定の復元はできません', $crawler->html());
+ }
+
+ /**
+ * 複数配送先の場合, 確認画面にチェックボックスは表示されず,
+ * チェックボックス値を細工して送信しても注文は完了し保存はスキップされる.
+ */
+ public function testCheckoutWithMultipleShippingSkipsSave(): void
+ {
+ $Customer = $this->createCustomer();
+ $this->createMultiShippingOrder($Customer);
+ $this->scenarioConfirm($Customer);
+
+ // 確認画面: チェックボックスが表示されない.
+ $crawler = $this->scenarioComplete($Customer, $this->generateUrl('shopping_confirm'), [
+ ['Delivery' => 1, 'DeliveryTime' => 1],
+ ['Delivery' => 1, 'DeliveryTime' => 1],
+ ]);
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $this->assertCount(0, $crawler->filter('input[name="_shopping_order[save_preferred_shipping_payment]"]'));
+
+ // チェックボックス値を細工して送信しても注文は完了する.
+ $this->loginTo($Customer);
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_checkout'),
+ [
+ '_shopping_order' => [
+ '_token' => 'dummy',
+ 'save_preferred_shipping_payment' => '1',
+ ],
+ ]
+ );
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('shopping_complete')));
+
+ // 保存はスキップされる.
+ $this->entityManager->clear();
+ /** @var Customer $found */
+ $found = $this->entityManager->getRepository(Customer::class)->find($Customer->getId());
+ $this->assertNotInstanceOf(Payment::class, $found->getPreferredPayment());
+ $this->assertNotInstanceOf(Delivery::class, $found->getPreferredDelivery());
+ }
+
+ /**
+ * 会員かつ単一配送先の場合, 注文確認画面に保存チェックボックスが表示される.
+ */
+ public function testConfirmShowsSaveCheckboxForMember(): void
+ {
+ $Customer = $this->createCustomer();
+
+ $this->scenarioCartIn($Customer);
+ $this->scenarioConfirm($Customer);
+ $crawler = $this->scenarioComplete($Customer, $this->generateUrl('shopping_confirm'));
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $checkbox = $crawler->filter('input[name="_shopping_order[save_preferred_shipping_payment]"]');
+ $this->assertCount(1, $checkbox);
+ $this->assertStringContainsString('この配送方法と支払い方法を保存する', (string) $crawler->html());
+ }
+
+ /**
+ * ゲストユーザーには保存チェックボックスが表示されない.
+ */
+ public function testConfirmHidesSaveCheckboxForGuest(): void
+ {
+ $this->scenarioConfirmAsGuest();
+ $crawler = $this->scenarioComplete(null, $this->generateUrl('shopping_confirm'));
+
+ $this->assertTrue($this->client->getResponse()->isSuccessful());
+ $this->assertCount(0, $crawler->filter('input[name="_shopping_order[save_preferred_shipping_payment]"]'));
+ }
+
+ /**
+ * チェックボックスONで注文確定すると配送方法・支払い方法が保存され, 既存値は上書きされる.
+ */
+ public function testCheckoutWithSaveOnPersistsPreferred(): void
+ {
+ $Customer = $this->createCustomer();
+ // 既存の保存値(上書きされることを確認するため, 確定時と異なる支払い方法を設定).
+ $this->setPreferred($Customer, $this->findPayment(4), $this->findDelivery(1));
+
+ $this->scenarioCartIn($Customer);
+ $this->scenarioConfirm($Customer);
+ $this->scenarioComplete($Customer, $this->generateUrl('shopping_confirm'));
+
+ $this->loginTo($Customer);
+ $this->client->request(
+ Request::METHOD_POST,
+ $this->generateUrl('shopping_checkout'),
+ [
+ '_shopping_order' => [
+ '_token' => 'dummy',
+ 'save_preferred_shipping_payment' => '1',
+ ],
+ ]
+ );
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('shopping_complete')));
+
+ $this->entityManager->clear();
+ /** @var Customer $found */
+ $found = $this->entityManager->getRepository(Customer::class)->find($Customer->getId());
+ $this->assertInstanceOf(Payment::class, $found->getPreferredPayment());
+ $this->assertInstanceOf(Delivery::class, $found->getPreferredDelivery());
+ // scenarioComplete は Payment=3, Delivery=1 で注文する.
+ $this->assertSame(3, $found->getPreferredPayment()->getId());
+ $this->assertSame(1, $found->getPreferredDelivery()->getId());
+ }
+
+ /**
+ * チェックボックスOFFで注文確定しても保存されない.
+ */
+ public function testCheckoutWithoutSaveDoesNotPersistPreferred(): void
+ {
+ $Customer = $this->createCustomer();
+
+ $this->scenarioCartIn($Customer);
+ $this->scenarioConfirm($Customer);
+ $this->scenarioComplete($Customer, $this->generateUrl('shopping_confirm'));
+ $this->scenarioCheckout($Customer);
+
+ $this->assertTrue($this->client->getResponse()->isRedirect($this->generateUrl('shopping_complete')));
+
+ $this->entityManager->clear();
+ /** @var Customer $found */
+ $found = $this->entityManager->getRepository(Customer::class)->find($Customer->getId());
+ $this->assertNotInstanceOf(Payment::class, $found->getPreferredPayment());
+ $this->assertNotInstanceOf(Delivery::class, $found->getPreferredDelivery());
+ }
+}
 }})
+