住所や会員情報を国際標準へ対応 #2598

app/config/eccube/packages/eccube.yaml

@@ -83,10 +83,8 @@ parameters:
     eccube_product_order_newer: 2
     eccube_product_order_price_higher: 3
     eccube_price_max: 2147483647
-    eccube_tel_len: 5
-    eccube_tel_len_min: 1
-    eccube_zip01_len: 3
-    eccube_zip02_len: 4
+    eccube_tel_len_max: 14
+    eccube_postal_code: 8
     eccube_password_min_len: 8
     eccube_password_max_len: 32
     eccube_composer_memory_limit: 1536

codeception/_support/Page/Admin/CustomerEditPage.php

@@ -53,15 +53,10 @@ public function 入力_メイ($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'admin_customer_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'admin_customer_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'admin_customer_zip_zip02'], $value);
         return $this;
     }
 
@@ -89,21 +84,10 @@ public function 入力_Eメール($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
-    {
-        $this->tester->fillField(['id' => 'admin_customer_tel_tel01'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号2($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'admin_customer_tel_tel02'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'admin_customer_phone_number'], $value);
 
-    public function 入力_電話番号3($value)
-    {
-        $this->tester->fillField(['id' => 'admin_customer_tel_tel03'], $value);
         return $this;
     }
 
@@ -125,4 +109,4 @@ public function 登録()
         return $this;
     }
 
-}
+}

codeception/_support/Page/Admin/CustomerManagePage.php

@@ -42,7 +42,7 @@ public function 詳細検索_電話番号($value = '')
     {
         $this->tester->click(self::$詳細検索ボタン);
         $this->tester->wait(1);
-        $this->tester->fillField(['id' => 'admin_search_customer_tel'], $value);
+        $this->tester->fillField(['id' => 'admin_search_customer_phone_number'], $value);
         $this->tester->click(self::$検索ボタン);
         $this->tester->see('会員マスター会員管理', '.c-pageTitle');
         return $this;

codeception/_support/Page/Admin/OrderEditPage.php

@@ -63,15 +63,10 @@ public function 入力_メイ($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'order_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'order_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'order_zip_zip02'], $value);
         return $this;
     }
 
@@ -93,21 +88,10 @@ public function 入力_番地_ビル名($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
-    {
-        $this->tester->fillField(['id' => 'order_tel_tel01'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号2($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'order_tel_tel02'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'order_phone_number'], $value);
 
-    public function 入力_電話番号3($value)
-    {
-        $this->tester->fillField(['id' => 'order_tel_tel03'], $value);
         return $this;
     }
 

codeception/_support/Page/Admin/OrderManagePage.php

@@ -41,7 +41,7 @@ public function 詳細検索_電話番号($value = '')
     {
         $this->tester->click(self::$詳細検索ボタン);
         $this->tester->wait(1);
-        $this->tester->fillField(['id' => 'admin_search_order_tel'], $value);
+        $this->tester->fillField(['id' => 'admin_search_order_phone_number'], $value);
         $this->tester->click('#search_form #search_submit');
         return $this;
     }

codeception/_support/Page/Admin/ShippingEditPage.php

@@ -70,15 +70,10 @@ public function 入力_メイ($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'shipping_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'shipping_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'shipping_zip_zip02'], $value);
         return $this;
     }
 
@@ -100,21 +95,10 @@ public function 入力_番地_ビル名($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
-    {
-        $this->tester->fillField(['id' => 'shipping_tel_tel01'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号2($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'shipping_tel_tel02'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'shipping_phone_number'], $value);
 
-    public function 入力_電話番号3($value)
-    {
-        $this->tester->fillField(['id' => 'shipping_tel_tel03'], $value);
         return $this;
     }
 

codeception/_support/Page/Admin/ShippingManagePage.php

@@ -41,7 +41,7 @@ public function 詳細検索_電話番号($value = '')
     {
         $this->tester->click(self::$詳細検索ボタン);
         $this->tester->wait(1);
-        $this->tester->fillField(['id' => 'admin_search_shipping_tel'], $value);
+        $this->tester->fillField(['id' => 'admin_search_shipping_phone_number'], $value);
         $this->tester->click('#search_form > div.c-outsideBlock__contents.mb-3 > button');
         return $this;
     }

codeception/_support/Page/Admin/TradelawSettingPage.php

@@ -31,15 +31,10 @@ public function 入力_運営責任者($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'tradelaw_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'tradelaw_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'tradelaw_zip_zip02'], $value);
         return $this;
     }
 
@@ -61,21 +56,10 @@ public function 入力_番地_ビル名($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
-    {
-        $this->tester->fillField(['id' => 'tradelaw_tel_tel01'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号2($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'tradelaw_tel_tel02'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'tradelaw_phone_number'], $value);
 
-    public function 入力_電話番号3($value)
-    {
-        $this->tester->fillField(['id' => 'tradelaw_tel_tel03'], $value);
         return $this;
     }
 

codeception/_support/Page/Front/CustomerAddressAddPage.php

@@ -1,4 +1,5 @@
 <?php
+
 /*
  * This file is part of EC-CUBE
  *
@@ -62,15 +63,10 @@ public function 入力_メイ($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'shopping_shipping_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'shopping_shipping_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'shopping_shipping_zip_zip02'], $value);
         return $this;
     }
 
@@ -92,26 +88,15 @@ public function 入力_番地_ビル名($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'shopping_shipping_tel_tel01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'shopping_shipping_phone_number'], $value);
 
-    public function 入力_電話番号2($value)
-    {
-        $this->tester->fillField(['id' => 'shopping_shipping_tel_tel02'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号3($value)
-    {
-        $this->tester->fillField(['id' => 'shopping_shipping_tel_tel03'], $value);
         return $this;
     }
 
     public function 登録する()
     {
         $this->tester->click('#detail_box__insert_button > button');
     }
-}
+}

codeception/_support/Page/Front/CustomerAddressEditPage.php

@@ -62,15 +62,10 @@ public function 入力_メイ($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'customer_address_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'customer_address_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'customer_address_zip_zip02'], $value);
         return $this;
     }
 
@@ -92,26 +87,15 @@ public function 入力_番地_ビル名($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
-    {
-        $this->tester->fillField(['id' => 'customer_address_tel_tel01'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号2($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'customer_address_tel_tel02'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'customer_address_phone_number'], $value);
 
-    public function 入力_電話番号3($value)
-    {
-        $this->tester->fillField(['id' => 'customer_address_tel_tel03'], $value);
         return $this;
     }
 
     public function 登録する()
     {
         $this->tester->click('div.ec-RegisterRole__actions button');
     }
-}
+}

codeception/_support/Page/Front/ShoppingNonmemberPage.php

@@ -58,15 +58,10 @@ public function 入力_メイ($value)
         return $this;
     }
 
-    public function 入力_郵便番号1($value)
+    public function 入力_郵便番号($value)
     {
-        $this->tester->fillField(['id' => 'nonmember_zip_zip01'], $value);
-        return $this;
-    }
+        $this->tester->fillField(['id' => 'nonmember_postal_code'], $value);
 
-    public function 入力_郵便番号2($value)
-    {
-        $this->tester->fillField(['id' => 'nonmember_zip_zip02'], $value);
         return $this;
     }
 
@@ -100,21 +95,9 @@ public function 入力_Eメール確認($value)
         return $this;
     }
 
-    public function 入力_電話番号1($value)
-    {
-        $this->tester->fillField(['id' => 'nonmember_tel_tel01'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号2($value)
-    {
-        $this->tester->fillField(['id' => 'nonmember_tel_tel02'], $value);
-        return $this;
-    }
-
-    public function 入力_電話番号3($value)
+    public function 入力_電話番号($value)
     {
-        $this->tester->fillField(['id' => 'nonmember_tel_tel03'], $value);
+        $this->tester->fillField(['id' => 'nonmember_phone_number'], $value);
         return $this;
     }
 

codeception/acceptance/EA04OrderCest.php

@@ -110,14 +110,11 @@ public function order_受注編集(\AcceptanceTester $I)
             ->入力_姓('aaa')
             ->入力_セイ('アアア')
             ->入力_メイ('アアア')
-            ->入力_郵便番号1('060')
-            ->入力_郵便番号2('0000')
+            ->入力_郵便番号('060-0000')
             ->入力_都道府県(['1' => '北海道'])
             ->入力_市区町村名('bbb')
             ->入力_番地_ビル名('bbb')
-            ->入力_電話番号1('111')
-            ->入力_電話番号2('111')
-            ->入力_電話番号3('111')
+            ->入力_電話番号('111-111-111')
             ->入力_番地_ビル名('address 2')
             ->入力_支払方法(['4' => '郵便振替'])
             ->受注情報登録();
@@ -250,18 +247,15 @@ public function order_受注登録(\AcceptanceTester $I)
             ->入力_名('order1')
             ->入力_セイ('アアア')
             ->入力_メイ('アアア')
-            ->入力_郵便番号1('060')
-            ->入力_郵便番号2('0000')
+            ->入力_郵便番号('060-0000')
             ->入力_都道府県(['1' => '北海道'])
             ->入力_市区町村名('bbb')
             ->入力_番地_ビル名('bbb')
             ->入力_Eメール('test@test.com')
-            ->入力_電話番号1('111')
-            ->入力_電話番号2('111')
-            ->入力_電話番号3('111')
+            ->入力_電話番号('111-111-111')
             ->商品検索('パーコレーター')
             ->商品検索結果_選択(1)
-            ->入力_支払方法(['4'=> '郵便振替'])
+            ->入力_支払方法(['4' => '郵便振替'])
             ->受注情報登録();
 
         $I->see('受注情報を保存しました。', OrderEditPage::$登録完了メッセージ);