Merge pull request 'dev' (#595) from dev into prd-deploy

Reviewed-on: #595

src/components/auth/Join.jsx

@@ -33,6 +33,11 @@ export default function Join() {
 
   // 가입 신청 유효성 검사
   const joinValidation = (formData) => {
+
+    // 전화번호/FAX 정규식 (일본 형식: 0으로 시작, 하이픈 포함)
+    const telRegex = /^0\d{1,4}-\d{1,4}-\d{4}$/
+
+
     // 판매대리점 정보 - 판매대리점명
     const storeQcastNm = formData.get('storeQcastNm')
     if (!isObjectNotEmpty(storeQcastNm)) {
@@ -65,12 +70,34 @@ export default function Join() {
       return false
     }
 
+
     // 판매대리점 정보 - 전화번호
     const telNo = formData.get('telNo')
     if (!isObjectNotEmpty(telNo)) {
       alert(getMessage('common.message.required.data', [getMessage('join.sub1.telNo')]))
       telNoRef.current.focus()
       return false
+    } else if (!telRegex.test(telNo)) {
+      alert(getMessage('join.validation.check1', [getMessage('join.sub1.telNo')]))
+      telNoRef.current.focus()
+      return false
+    }
+
+    //
+    // // 판매대리점 정보 - 전화번호
+    // const telNo = formData.get('telNo')
+    // if (!isObjectNotEmpty(telNo)) {
+    //   alert(getMessage('common.message.required.data', [getMessage('join.sub1.telNo')]))
+    //   telNoRef.current.focus()
+    //   return false
+    // }
+
+    // 판매대리점 정보 - FAX 번호
+    const fax = formData.get('fax')
+    if (!isObjectNotEmpty(fax)) {
+      alert(getMessage('common.message.required.data', [getMessage('join.sub1.fax')]))
+      faxRef.current.focus()
+      return false
     }
 
     const bizNo = formData.get('bizNo')
@@ -122,16 +149,38 @@ export default function Join() {
     }
 
     // 담당자 정보 - 전화번호
+    // const userTelNo = formData.get('userTelNo')
+    // if (!isObjectNotEmpty(userTelNo)) {
+    //   alert(getMessage('common.message.required.data', [getMessage('join.sub2.telNo')]))
+    //   userTelNoRef.current.focus()
+    //   return false
+    // }
+
+
     const userTelNo = formData.get('userTelNo')
     if (!isObjectNotEmpty(userTelNo)) {
-      alert(getMessage('common.message.required.data', [getMessage('join.sub2.telNo')]))
+      alert(getMessage('common.message.required.data', [getMessage('join.sub1.telNo')]))
       userTelNoRef.current.focus()
       return false
+    } else if (!telRegex.test(userTelNo)) {
+      alert(getMessage('join.validation.check1', [getMessage('join.sub1.telNo')]))
+      userTelNoRef.current.focus()
+      return false
+    }
+
+    // 담당자 정보 - FAX 번호
+    const userFax = formData.get('userFax')
+    if (!isObjectNotEmpty(userFax)) {
+      alert(getMessage('common.message.required.data', [getMessage('join.sub2.fax')]))
+      userFaxRef.current.focus()
+      return false
     }
 
     return true
   }
 
+
+
   // 가입 신청
   const joinProcess = async (e) => {
     e.preventDefault()
@@ -288,7 +337,8 @@ export default function Join() {
                             name="telNo"
                             className="input-light"
                             maxLength={15}
-                            onChange={inputNumberCheck}
+                            placeholder={getMessage('join.sub1.telNo_placeholder')}
+                            onChange={inputTelNumberCheck}
                             ref={telNoRef}
                           />
                         </div>
@@ -296,7 +346,7 @@ export default function Join() {
                     </tr>
                     {/* FAX 번호 */}
                     <tr>
-                      <th>{getMessage('join.sub1.fax')}</th>
+                      <th>{getMessage('join.sub1.fax')}<span className="important">*</span></th>
                       <td>
                         <div className="input-wrap" style={{ width: '200px' }}>
                           <input type="text" id="fax" name="fax" className="input-light" maxLength={15} onChange={inputNumberCheck} ref={faxRef} />
@@ -398,7 +448,8 @@ export default function Join() {
                             name="userTelNo"
                             className="input-light"
                             maxLength={15}
-                            onChange={inputNumberCheck}
+                            placeholder={getMessage('join.sub1.telNo_placeholder')}
+                            onChange={inputTelNumberCheck}
                             ref={userTelNoRef}
                           />
                         </div>
@@ -406,7 +457,7 @@ export default function Join() {
                     </tr>
                     {/* FAX 번호 */}
                     <tr>
-                      <th>{getMessage('join.sub2.fax')}</th>
+                      <th>{getMessage('join.sub2.fax')}<span className="important">*</span></th>
                       <td>
                         <div className="input-wrap" style={{ width: '200px' }}>
                           <input

src/locales/ja.json

@@ -683,9 +683,9 @@
   "join.sub1.addr": "住所",
   "join.sub1.addr_placeholder": "全角50文字以内",
   "join.sub1.telNo": "電話番号",
-  "join.sub1.telNo_placeholder": "00 0000 0000",
+  "join.sub1.telNo_placeholder": "00-0000-0000",
   "join.sub1.fax": "FAX番号",
-  "join.sub1.fax_placeholder": "00 0000 0000",
+  "join.sub1.fax_placeholder": "00-0000-0000",
   "join.sub1.bizNo": "法人番号",
   "join.sub2.title": "担当者情報",
   "join.sub2.userNm": "担当者名",

src/locales/ko.json

@@ -683,7 +683,7 @@
   "join.sub1.addr": "주소",
   "join.sub1.addr_placeholder": "전각50자이내",
   "join.sub1.telNo": "전화번호",
-  "join.sub1.telNo_placeholder": "00 0000 0000",
+  "join.sub1.telNo_placeholder": "000-0000-0000",
   "join.sub1.fax": "FAX 번호",
   "join.sub1.fax_placeholder": "00 0000 0000",
   "join.sub1.bizNo": "법인번호",