Merge pull request EC-CUBE#1788 from izayoi256/issue/1766

フリガナ項目でカナ変換を行なうよう変更
nanasess · Oct 17, 2016 · 851875c · 851875c
2 parents f8b6ca6 + 97ca49c
commit 851875c
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 36 deletions.
diff --git a/src/Eccube/Form/Type/Admin/SearchOrderType.php b/src/Eccube/Form/Type/Admin/SearchOrderType.php
@@ -59,15 +59,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
             ->add('name', 'text', array(
                 'required' => false,
             ))
-            ->add('kana', 'text', array(
-                'required' => false,
-                'constraints' => array(
-                    new Assert\Regex(array(
-                        'pattern' => "/^[ァ-ヶｦ-ﾟー]+$/u",
-                        'message' => 'form.type.admin.notkanastyle',
-                    )),
-                ),
-            ))
             ->add('email', 'email', array(
                 'required' => false,
             ))
@@ -169,6 +160,20 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                 'required' => false,
             ))
         ;
+
+        $builder->add(
+            $builder
+                ->create('kana', 'text', array(
+                    'required' => false,
+                    'constraints' => array(
+                        new Assert\Regex(array(
+                            'pattern' => "/^[ァ-ヶｦ-ﾟー]+$/u",
+                            'message' => 'form.type.admin.notkanastyle',
+                        )),
+                    ),
+                ))
+                ->addEventSubscriber(new \Eccube\EventListener\ConvertKanaListener('CV'))
+        );
     }
 
     /**

diff --git a/src/Eccube/Form/Type/Admin/ShopMasterType.php b/src/Eccube/Form/Type/Admin/ShopMasterType.php
@@ -53,19 +53,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     )),
                 )
             ))
-            ->add('company_kana', 'text', array(
-                'label' => '会社名(フリガナ)',
-                'required' => false,
-                'constraints' => array(
-                    // todo カナへの変換
-                    new Assert\Regex(array(
-                        'pattern' => "/^[ァ-ヶｦ-ﾟー]+$/u",
-                    )),
-                    new Assert\Length(array(
-                        'max' => $config['stext_len'],
-                    )),
-                ),
-            ))
             ->add('shop_name', 'text', array(
                 'label' => '店名',
                 'required' => true,
@@ -76,19 +63,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     )),
                 )
             ))
-            ->add('shop_kana', 'text', array(
-                'label' => '店名(フリガナ)',
-                'required' => false,
-                'constraints' => array(
-                    new Assert\Length(array(
-                        'max' => $config['stext_len'],
-                    )),
-                    // todo カナへの変換
-                    new Assert\Regex(array(
-                        'pattern' => "/^[ァ-ヶｦ-ﾟー]+$/u",
-                    )),
-                )
-            ))
             ->add('shop_name_eng', 'text', array(
                 'label' => '店名(英語表記)',
                 'required' => false,
@@ -288,8 +262,41 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                         'message' => 'admin.shop.longitude.invalid'))
                 ),
             ))
-
         ;
+
+        $builder->add(
+            $builder
+                ->create('company_kana', 'text', array(
+                    'label' => '会社名(フリガナ)',
+                    'required' => false,
+                    'constraints' => array(
+                        new Assert\Regex(array(
+                            'pattern' => "/^[ァ-ヶｦ-ﾟー]+$/u",
+                        )),
+                        new Assert\Length(array(
+                            'max' => $config['stext_len'],
+                        )),
+                    ),
+                ))
+                ->addEventSubscriber(new \Eccube\EventListener\ConvertKanaListener('CV'))
+        );
+
+        $builder->add(
+            $builder
+                ->create('shop_kana', 'text', array(
+                    'label' => '店名(フリガナ)',
+                    'required' => false,
+                    'constraints' => array(
+                        new Assert\Length(array(
+                            'max' => $config['stext_len'],
+                        )),
+                        new Assert\Regex(array(
+                            'pattern' => "/^[ァ-ヶｦ-ﾟー]+$/u",
+                        )),
+                    )
+                ))
+                ->addEventSubscriber(new \Eccube\EventListener\ConvertKanaListener('CV'))
+        );
     }
 
     /**