diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig index a7d40bef76c..a6d10eea338 100644 --- a/src/Eccube/Resource/template/admin/Customer/edit.twig +++ b/src/Eccube/Resource/template/admin/Customer/edit.twig @@ -139,7 +139,7 @@ {# FAX番号 #} -
+
{{ form_label(form.fax) }}
{{ form_widget(form.fax.fax01) }}-{{ form_widget(form.fax.fax02) }}-{{ form_widget(form.fax.fax03) }} diff --git a/tests/Eccube/Tests/Form/Type/Admin/OrderSearchTypeTest.php b/tests/Eccube/Tests/Form/Type/Admin/OrderSearchTypeTest.php index 7feece6a041..212dde0556f 100644 --- a/tests/Eccube/Tests/Form/Type/Admin/OrderSearchTypeTest.php +++ b/tests/Eccube/Tests/Form/Type/Admin/OrderSearchTypeTest.php @@ -53,7 +53,36 @@ public function testTel_ValidData() $this->form->submit($formData); $this->assertTrue($this->form->isValid()); } - + + public function testTelWithHyphenMiddle_ValidData() + { + $formData = array( + 'tel' => '012-345' + ); + + $this->form->submit($formData); + $this->assertTrue($this->form->isValid()); + } + public function testTelWithHyphenBefore_ValidData() + { + $formData = array( + 'tel' => '-345' + ); + + $this->form->submit($formData); + $this->assertTrue($this->form->isValid()); + } + + public function testTelWithHyphenAfter_ValidData() + { + $formData = array( + 'tel' => '012-' + ); + + $this->form->submit($formData); + $this->assertTrue($this->form->isValid()); + } + public function testTel_NotValidData() { //意味あんだか良くわからんが一応書いとく