設定値に基づいてフォームのカナを必須項目かどうか決定

EC-CUBE · Aug 11, 2020 · f38f876 · f38f876
1 parent d677265
commit f38f876
Show file tree

Hide file tree

Showing 13 changed files with 60 additions and 58 deletions.
diff --git a/src/Eccube/Controller/NonMemberShoppingController.php b/src/Eccube/Controller/NonMemberShoppingController.php
@@ -13,7 +13,9 @@
 
 namespace Eccube\Controller;
 
+use Eccube\Entity\BaseInfo;
 use Eccube\Entity\Customer;
+use Eccube\Repository\BaseInfoRepository;
 use Eccube\Event\EccubeEvents;
 use Eccube\Event\EventArgs;
 use Eccube\Form\Type\Front\NonMemberType;
@@ -49,21 +51,29 @@ class NonMemberShoppingController extends AbstractShoppingController
      */
     protected $cartService;
 
+    /**
+     * @var BaseInfo
+     */
+    protected $baseInfo;
+
     /**
      * NonMemberShoppingController constructor.
      *
      * @param ValidatorInterface $validator
+     * @param BaseInfoRepository $baseInfoRepository
      * @param PrefRepository $prefRepository
      * @param OrderHelper $orderHelper
      * @param CartService $cartService
      */
     public function __construct(
         ValidatorInterface $validator,
+        BaseInfoRepository $baseInfoRepository,
         PrefRepository $prefRepository,
         OrderHelper $orderHelper,
         CartService $cartService
     ) {
         $this->validator = $validator;
+        $this->baseInfo = $baseInfoRepository->get();
         $this->prefRepository = $prefRepository;
         $this->orderHelper = $orderHelper;
         $this->cartService = $cartService;
@@ -269,24 +279,20 @@ protected function customerValidation(array &$data)
             ]
         );
 
-        $data['customer_kana01'] = mb_convert_kana($data['customer_kana01'], 'CV', 'utf-8');
-        $errors[] = $this->validator->validate(
-            $data['customer_kana01'],
-            [
-                new Assert\NotBlank(),
+        $kanaValidators = [
                 new Assert\Length(['max' => $this->eccubeConfig['eccube_kana_len']]),
                 new Assert\Regex(['pattern' => '/^[ァ-ヶｦ-ﾟー]+$/u']),
-            ]
-        );
-        $data['customer_kana02'] = mb_convert_kana($data['customer_kana02'], 'CV', 'utf-8');
-        $errors[] = $this->validator->validate(
-            $data['customer_kana02'],
-            [
-                new Assert\NotBlank(),
-                new Assert\Length(['max' => $this->eccubeConfig['eccube_kana_len']]),
-                new Assert\Regex(['pattern' => '/^[ァ-ヶｦ-ﾟー]+$/u']),
-            ]);
+        ];
 
+        if ($this->baseInfo->isOptionRequireKana()) {
+            $kanaValidators []= new Assert\NotBlank();
+        }
+
+        $data['customer_kana01'] = mb_convert_kana($data['customer_kana01'], 'CV', 'utf-8');
+        $errors[] = $this->validator->validate($data['customer_kana01'], $kanaValidators);
+
+        $data['customer_kana02'] = mb_convert_kana($data['customer_kana02'], 'CV', 'utf-8');
+        $errors[] = $this->validator->validate($data['customer_kana02'], $kanaValidators);
         $errors[] = $this->validator->validate(
             $data['customer_company_name'],
             [

diff --git a/src/Eccube/Form/Type/Admin/CustomerType.php b/src/Eccube/Form/Type/Admin/CustomerType.php
@@ -64,9 +64,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', NameType::class, [
                 'required' => true,
             ])
-            ->add('kana', KanaType::class, [
-                'required' => true,
-            ])
+            ->add('kana', KanaType::class)
             ->add('company_name', TextType::class, [
                 'required' => false,
                 'constraints' => [

diff --git a/src/Eccube/Form/Type/Admin/OrderType.php b/src/Eccube/Form/Type/Admin/OrderType.php
@@ -99,14 +99,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     ],
                 ],
             ])
-            ->add('kana', KanaType::class, [
-                'required' => false,
-                'options' => [
-                    'constraints' => [
-                        new Assert\NotBlank(),
-                    ],
-                ],
-            ])
+            ->add('kana', KanaType::class)
             ->add('company_name', TextType::class, [
                 'required' => false,
                 'constraints' => [

diff --git a/src/Eccube/Form/Type/Admin/ShippingType.php b/src/Eccube/Form/Type/Admin/ShippingType.php
@@ -90,22 +90,8 @@ public function __construct(
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
-            ->add('name', NameType::class, [
-                'required' => false,
-                'options' => [
-                    'constraints' => [
-                        new Assert\NotBlank(),
-                    ],
-                ],
-            ])
-            ->add('kana', KanaType::class, [
-                'required' => false,
-                'options' => [
-                    'constraints' => [
-                        new Assert\NotBlank(),
-                    ],
-                ],
-            ])
+            ->add('name', NameType::class)
+            ->add('kana', KanaType::class)
             ->add('company_name', TextType::class, [
                 'required' => false,
                 'constraints' => [

diff --git a/src/Eccube/Form/Type/Front/ContactType.php b/src/Eccube/Form/Type/Front/ContactType.php
@@ -52,9 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', NameType::class, [
                 'required' => true,
             ])
-            ->add('kana', KanaType::class, [
-                'required' => false,
-            ])
+            ->add('kana', KanaType::class)
             ->add('postal_code', PostalType::class, [
                 'required' => false,
             ])

diff --git a/src/Eccube/Form/Type/Front/CustomerAddressType.php b/src/Eccube/Form/Type/Front/CustomerAddressType.php
@@ -49,9 +49,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', NameType::class, [
                 'required' => true,
             ])
-            ->add('kana', KanaType::class, [
-                'required' => true,
-            ])
+            ->add('kana', KanaType::class)
             ->add('company_name', TextType::class, [
                 'required' => false,
                 'constraints' => [

diff --git a/src/Eccube/Form/Type/Front/EntryType.php b/src/Eccube/Form/Type/Front/EntryType.php
@@ -61,7 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', NameType::class, [
                 'required' => true,
             ])
-            ->add('kana', KanaType::class, [])
+            ->add('kana', KanaType::class)
             ->add('company_name', TextType::class, [
                 'required' => false,
                 'constraints' => [

diff --git a/src/Eccube/Form/Type/Front/NonMemberType.php b/src/Eccube/Form/Type/Front/NonMemberType.php
@@ -14,6 +14,7 @@
 namespace Eccube\Form\Type\Front;
 
 use Eccube\Common\EccubeConfig;
+use Eccube\Repository\BaseInfoRepository;
 use Eccube\Form\Type\AddressType;
 use Eccube\Form\Type\KanaType;
 use Eccube\Form\Type\NameType;
@@ -51,9 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', NameType::class, [
                 'required' => true,
             ])
-            ->add('kana', KanaType::class, [
-                'required' => true,
-            ])
+            ->add('kana', KanaType::class)
             ->add('company_name', TextType::class, [
                 'required' => false,
                 'constraints' => [

diff --git a/src/Eccube/Form/Type/KanaType.php b/src/Eccube/Form/Type/KanaType.php
@@ -14,6 +14,8 @@
 namespace Eccube\Form\Type;
 
 use Eccube\Common\EccubeConfig;
+use Eccube\Entity\BaseInfo;
+use Eccube\Repository\BaseInfoRepository;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -22,18 +24,25 @@
 class KanaType extends AbstractType
 {
     /**
-     * @var \Eccube\Common\EccubeConfig
+     * @var EccubeConfig
      */
     protected $eccubeConfig;
 
+    /**
+     * @var BaseInfo
+     */
+    protected $baseInfo;
+
     /**
      * KanaType constructor.
      *
      * @param EccubeConfig $eccubeConfig
+     * @param BaseInfoRepository $baseInfoRepository
      */
-    public function __construct(EccubeConfig $eccubeConfig)
+    public function __construct(EccubeConfig $eccubeConfig, BaseInfoRepository $baseInfoRepository)
     {
         $this->eccubeConfig = $eccubeConfig;
+        $this->baseInfo = $baseInfoRepository->get();
     }
 
     /**
@@ -52,6 +61,7 @@ public function buildForm(FormBuilderInterface $builder, array $options)
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
+            'required' => $this->baseInfo->isOptionRequireKana(),
             'lastname_options' => [
                 'attr' => [
                     'placeholder' => 'common.last_name_kana',

diff --git a/src/Eccube/Resource/template/admin/Customer/edit.twig b/src/Eccube/Resource/template/admin/Customer/edit.twig
@@ -87,7 +87,9 @@ file that was distributed with this source code.
                                 <div class="row mb-2">
                                     <div class="col-3">
                                         <span>{{ 'admin.common.kana'|trans }}</span>
+                                        {% if BaseInfo.option_require_kana %}
                                         <span class="badge badge-primary ml-1">{{ 'admin.common.required'|trans }}</span>
+                                        {% endif %}
                                     </div>
                                     <div class="col">
                                         <div class="row">

diff --git a/src/Eccube/Resource/template/admin/Order/edit.twig b/src/Eccube/Resource/template/admin/Order/edit.twig
@@ -409,7 +409,12 @@ file that was distributed with this source code.
                                             </div>
                                         </div>
                                         <div class="row form-group">
-                                            <label class="col-3 col-form-label">{{ 'admin.common.kana'|trans }}<span class="badge badge-primary ml-1">{{ 'admin.common.required'|trans }}</span></label>
+                                            <label class="col-3 col-form-label">
+                                                {{- 'admin.common.kana'|trans -}}
+                                                {%- if BaseInfo.option_require_kana -%}
+                                                <span class="badge badge-primary ml-1">{{ 'admin.common.required'|trans }}</span>
+                                                {%- endif -%}
+                                            </label>
                                             <div class="col">
                                                 <div class="row">
                                                     <div class="col">
@@ -552,7 +557,12 @@ file that was distributed with this source code.
                                                 </div>
                                             </div>
                                             <div class="row form-group">
-                                                <label class="col-3 col-form-label">{{ 'admin.common.kana'|trans }}<span class="badge badge-primary ml-1">{{ 'admin.common.required'|trans }}</span></label>
+                                                <label class="col-3 col-form-label">
+                                                    {{- 'admin.common.kana'|trans -}}
+                                                    {%- if BaseInfo.option_require_kana -%}
+                                                    <span class="badge badge-primary ml-1">{{ 'admin.common.required'|trans }}</span>
+                                                    {%- endif -%}
+                                                </label>
                                                 <div class="col">
                                                     <div class="row">
                                                         <div class="col">

diff --git a/src/Eccube/Resource/template/admin/Order/shipping.twig b/src/Eccube/Resource/template/admin/Order/shipping.twig
@@ -335,10 +335,12 @@ file that was distributed with this source code.
                                             </div>
                                             <div class="row form-group">
                                                 <label class="col-3 col-form-label">
-                                                    {{ 'admin.common.kana'|trans }}
+                                                    {{- 'admin.common.kana'|trans -}}
+                                                    {%- if BaseInfo.option_require_kana -%}
                                                     <span class="badge badge-primary ml-1">
                                                         {{ 'admin.common.required'|trans }}
                                                     </span>
+                                                    {%- endif -%}
                                                 </label>
                                                 <div class="col">
                                                     <div class="row">

diff --git a/src/Eccube/Resource/template/default/Shopping/index.twig b/src/Eccube/Resource/template/default/Shopping/index.twig
@@ -187,7 +187,7 @@ file that was distributed with this source code.
                             <dl>
                                 <dt>
                                     <label class="ec-label required">{{ 'common.kana'|trans }}</label>
-                                    <span class="ec-required">{{ 'common.required'|trans }}</span>
+                                    <span class="{{ BaseInfo.option_require_kana ? 'ec-required' }}">{{ BaseInfo.option_require_kana ? 'common.required'|trans }}</span>
                                 </dt>
                                 <dd>
                                     <div class="ec-halfInput">