Merge branch 'develop' into bin2107

src/main/java/com/style24/admin/biz/web/TsaCustomerController.java

@@ -4,12 +4,14 @@ import java.util.Collection;
 
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.security.GagaPasswordEncoder;
+import com.gagaframework.web.util.GagaCryptoUtil;
 import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.admin.biz.service.TsaCustomerService;
 import com.style24.admin.biz.service.TsaKakaoService;
 import com.style24.admin.biz.service.TsaSystemService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.core.support.session.TscSession;
+import com.style24.core.support.util.CryptoUtils;
 import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustContactHst;
 import com.style24.persistence.domain.CustGrade;
@@ -719,6 +721,11 @@ public class TsaCustomerController extends TsaBaseController {
 	@PostMapping("/delivery/addr/save")
 	@ResponseBody
 	public GagaResponse saveCustomerDeliveryAddr(@RequestBody Delivery delivery) {
+		delivery.setRecipNm(CryptoUtils.encryptAES(delivery.getRecipNm()));
+		delivery.setRecipTelno(CryptoUtils.encryptAES(delivery.getRecipTelno()));
+		delivery.setRecipPhnno(CryptoUtils.encryptAES(delivery.getRecipPhnno()));
+		delivery.setRecipDtlAddr(CryptoUtils.encryptAES(delivery.getRecipDtlAddr()));
+		delivery.setRecipBaseAddr(CryptoUtils.encryptAES(delivery.getRecipBaseAddr()));
 		customerService.saveCustomerDeliveryAddr(delivery);
 		return super.ok(message.getMessage("SUCC_0001"));
 	}

src/main/webapp/WEB-INF/views/customer/CustomerDetailForm.html

@@ -158,16 +158,7 @@
 									<tr>
 										<th class="dashR">휴대전화번호<em class="required" title="필수"></em></th>
 										<td class="dashR">
-											<input type="hidden" name="cellPhnno" data-valid-name="휴대전화"/>
-											<select id="firstNo" name="firstNo">
-												<option value="">선택</option>
-												<option th:if="${nationalHpNumberList}" th:each="oneData, status : ${nationalHpNumberList}"
-														th:value="${oneData.cd}" th:text="|${oneData.cd}|"></option>
-											</select> -
-											<input type="text" id="middleNo" name="middleNo" class="w50" maxlength="4" required="required"
-												   data-valid-type="numeric" data-valid-name="휴대전화번호"/> -
-											<input type="text" id="lastNo" name="lastNo" class="w50" maxlength="4" required="required"
-												   data-valid-type="numeric" data-valid-name="휴대전화번호"/>
+											<input type="text" name="cellPhnno" class="w130" readonly="readonly"/>
 											<button type="button" id="btnCustSendLms" class="btn btn-info btn-lg">LMS전송</button>
 											<button type="button" id="btnCustCrtfd" class="btn btn-info btn-lg">번호변경</button>
 										</td>
@@ -181,9 +172,9 @@
 										<th class="dashR">이메일<em class="required" title="필수"></em></th>
 										<td class="dashR">
 											<input type="hidden" name="email" data-valid-name="이메일"/>
-											<input type="text" id="emailId" name="emailId" class="w300"/>
+											<input type="text" id="emailId" name="emailId" class="w200" maxlength="30"/>
 											@
-											<input type="text" id="emailDomain" name="emailDomain" class="w150"/>
+											<input type="text" id="emailDomain" name="emailDomain" class="w150" maxlength="20"/>
 											<select id="emailDomainList" name="emailDomainList">
 												<option value="">선택하세요</option>
 												<option th:if="${emailDomainList}" th:each="oneData, status : ${emailDomainList}" th:value="${oneData.cd}"
@@ -1344,13 +1335,6 @@
 	// 휴대전화 유효성 체크 및 데이터 셋팅
 	var fnCheckValidationPhnno = function (formId) {
 		let result = true;
-
-		let firstNo = $(formId + ' select[name=firstNo]').val();
-		let middleNo = $(formId + ' input[name=middleNo]').val();
-		let lastNo = $(formId + ' input[name=lastNo]').val();
-		let cellPhnno = firstNo + '-' + middleNo + '-' + lastNo;
-		$(formId + ' input[name=cellPhnno]').val(cellPhnno);
-
 		if (!gagajf.testRegexp($(formId + ' input[name=cellPhnno]'), /^(01(?:0|1|[6-9])-(?:\d{3}|\d{4})-\d{4})$/)) {
 			result = false;
 		}
@@ -1403,12 +1387,7 @@
 
 	// 휴대전화번호
 	var fnDisplayCellPhnno = function (cellPhnno) {
-		if (!gagajf.isNull(cellPhnno)) {
-			let cellPhSplit = cellPhnno.split("-");
-			$('#firstNo').val(cellPhSplit[0]);
-			$('#middleNo').val(cellPhSplit[1]);
-			$('#lastNo').val(cellPhSplit[2]);
-		}
+		$('#custInfoForm input[name=cellPhnno]').val(cellPhnno);
 	};
 
 	// 이메일

src/main/webapp/ux/plugins/gaga/gaga.paging.js

@@ -185,7 +185,7 @@ var gagaPaging = {
 				pageTag += "<a class=\"arrow\" href=\"#pageNo="+ (getPageGroup()-1) * pageUnit + "\"><i class=\"fa fa-angle-left\" alt=\"이전페이지\"></i></a>\n"
 			}
 
-			for (let i = firstCount; i < loopCount; i++) {
+			for (var i = firstCount; i < loopCount; i++) {
 				if (pageNo == i) {
 					pageTag += "<a class=\"num on\" href=\"#\">"+ i + "</a>\n";
 				} else {