오류 수정 임시 커밋

src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html

@@ -224,6 +224,9 @@
 
 <!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
 <div id="refundAccountPop" class="popup_box refundAccountPop">
+	<input type="hidden" name="confirmedAccountNo"/>
+	<input type="hidden" name="confirmedAccountNm"/>
+	<input type="hidden" name="confirmedBankCd"/>
 	<div class="lap">
 		<div class="popup_close">카테고리닫기</div>
 		<div class="popup_head sr-only">
@@ -265,7 +268,7 @@
 								<th>계좌번호</th>
 								<td>
 									<div class="input_wrap certi_wrap">
-										<input type="tel" class="form_control" value="" placeholder="">
+										<input type="tel" name="accountNo" class="form_control" value="" placeholder="">
 										<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button>
 									</div>
 								</td>
@@ -297,7 +300,7 @@
 		<div class="popup_con">
 			<div class="button_list clear">
 				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
-					<button type="button" th:id="|bankCd_${oneData.cd}|"><span th:text="${oneData.cdNm}"></span></button>
+					<button type="button" th:id="|bankCd_${oneData.cd}|" th:attr="bankCd=${oneData.cd}, bankNm=${oneData.cdNm}"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
 			</div>
 		</div>
@@ -493,11 +496,22 @@ $('#btn_bank_certi').on('click', function () {
 		return false;
 	}
 	
+	// 승인된 계좌 정보
+	let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+	let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+	let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+	
+	// 계좌정보
+	let accountNm 			= $('#refundAccountPop input[name=accountNm]').val();
+	let accountNo 			= $('#refundAccountPop input[name=accountNo]').val();
+	let bankCd 				= $('#refundAccountPop input[name=bankCd]').val();
+	
+	if (accountNm != confirmedAccountNm || accountNo != confirmedAccountNo || bankCd != confirmedBankCd) {
+		isValid = false;
+	}
+	
 	if (!isValid) {
 		let url 		= '/mypage/account/check';
-		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
-		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
-		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
 		let data = {};
 		data.accountNm 	= accountNm;
@@ -513,8 +527,13 @@ $('#btn_bank_certi').on('click', function () {
 			if (isValid) {
 				mcxDialog.alert('계좌인증에 성공했습니다.');
 				// 계좌인증 성공 시 Disabled 처리
-				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
-				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				//$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				//$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				
+				$('#refundAccountPop input[name=confirmedAccountNm]').val(accountNm);
+				$('#refundAccountPop input[name=confirmedAccountNo]').val(accountNo);
+				$('#refundAccountPop input[name=confirmedBankCd]').val(bankCd);
+				
 				return false;
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
@@ -527,20 +546,30 @@ $('#btn_bank_certi').on('click', function () {
 //계좌등록 후 환불신청 버튼 클릭 이벤트
 $('#btn_bank_return').click(function() {
 	if (isValid) {
+		// 승인된 계좌 정보
+		let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+		let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+		let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+		
+		// 계좌정보
 		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
 		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
 		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
-		// 부모창의 input 값으로 환불계좌정보 설정
-		$('#returnForm input[name=accountNo]').val(accountNo);
-		$('#returnForm input[name=accountNm]').val(accountNm);
-		$('#returnForm input[name=bankCd]').val(bankCd);
-
-		// 팝업 닫기
-		$(".close-modal").trigger("click");
-		
-		// 취소신청
-		fnCancel();
+		if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
+			// 부모창의 input 값으로 환불계좌정보 설정
+			$('#returnForm input[name=accountNo]').val(accountNo);
+			$('#returnForm input[name=accountNm]').val(accountNm);
+			$('#returnForm input[name=bankCd]').val(bankCd);
+			
+			// 팝업 닫기
+			$("#refundAccountPop .popup_close").trigger("click");
+			
+			// 취소신청
+			fnCancel();
+		} else {
+			mcxDialog.alert('인증받은 계좌정보와 다릅니다.');
+		}
 	} else {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
@@ -593,9 +622,15 @@ $('.refundBankPop .popup_close').on("click",function(){
 
 //210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
 $(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	let bankCd = $(this).attr('bankCd');
+	let bankNm = $(this).attr('bankNm');
+	
+	$('#refundAccountPop input[name=bankCd]').val(bankCd);
+	$('#refundAccountPop .select_custom.select_bank .combo .select').text(bankNm);
+	
 	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
 	$("body").css({"overflow":"visible"});
-})
+});
 
 
 $(document).ready(function(){

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -371,6 +371,9 @@
 
 <!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
 <div id="refundAccountPop" class="popup_box refundAccountPop">
+	<input type="hidden" name="confirmedAccountNo"/>
+	<input type="hidden" name="confirmedAccountNm"/>
+	<input type="hidden" name="confirmedBankCd"/>
 	<div class="lap">
 		<div class="popup_close">카테고리닫기</div>
 		<div class="popup_head sr-only">
@@ -443,7 +446,7 @@
 		<div class="popup_con">
 			<div class="button_list clear">
 				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
-					<button type="button" th:id="${oneData.cd}"><span th:text="${oneData.cdNm}"></span></button>
+					<button type="button" th:attr="bankCd=${oneData.cd}, bankNm=${oneData.cdNm}"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
 			</div>
 		</div>
@@ -502,12 +505,12 @@ $('#returnForm input[name=wdGb]').on('change', function() {
 });
 
 // 은행목록 버튼 기능
-$("#refundBankPop .button_list button").each(function(){
-	$(this).on("click", function(){
-		$("#refundAccountPop input[name=bankCd]").val($(this).attr("id"));
-		$("#refundAccountPop .select_custom.select_bank .select").text($(this).find("span").text());
-	});
-});
+//$("#refundBankPop .button_list button").each(function(){
+//	$(this).on("click", function(){
+//		$("#refundAccountPop input[name=bankCd]").val($(this).attr("id"));
+//		$("#refundAccountPop .select_custom.select_bank .select").text($(this).find("span").text());
+//	});
+//});
 
 // 반품 처리
 var fnReturn = function() {
@@ -762,11 +765,22 @@ $('#btn_bank_certi').on('click', function () {
 		return false;
 	}
 	
+	// 승인된 계좌 정보
+	let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+	let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+	let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+	
+	// 계좌정보
+	let accountNm 			= $('#refundAccountPop input[name=accountNm]').val();
+	let accountNo 			= $('#refundAccountPop input[name=accountNo]').val();
+	let bankCd 				= $('#refundAccountPop input[name=bankCd]').val();
+	
+	if (accountNm != confirmedAccountNm || accountNo != confirmedAccountNo || bankCd != confirmedBankCd) {
+		isValid = false;
+	}
+	
 	if (!isValid) {
 		let url 		= '/mypage/account/check';
-		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
-		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
-		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
 		let data = {};
 		data.accountNm 	= accountNm;
@@ -782,34 +796,49 @@ $('#btn_bank_certi').on('click', function () {
 			if (isValid) {
 				mcxDialog.alert('계좌인증에 성공했습니다.');
 				// 계좌인증 성공 시 Disabled 처리
-				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
-				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				//$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				//$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				
+				$('#refundAccountPop input[name=confirmedAccountNm]').val(accountNm);
+				$('#refundAccountPop input[name=confirmedAccountNo]').val(accountNo);
+				$('#refundAccountPop input[name=confirmedBankCd]').val(bankCd);
+				
 				return false;
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
 				return false;
 			}
-		});
+		}, true);
 	}
 });
 
 // 계좌등록 후 환불신청 버튼 클릭 이벤트
 $('#btn_bank_return').click(function() {
 	if (isValid) {
+		// 승인된 계좌 정보
+		let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+		let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+		let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+		
+		// 계좌정보
 		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
 		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
 		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
-		// 부모창의 input 값으로 환불계좌정보 설정
-		$('#returnForm input[name=accountNo]').val(accountNo);
-		$('#returnForm input[name=accountNm]').val(accountNm);
-		$('#returnForm input[name=bankCd]').val(bankCd);
-
-		// 팝업 닫기
-		$(".close-modal").trigger("click");
-		
-		// 반품신청
-		fnReturn();
+		if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
+			// 부모창의 input 값으로 환불계좌정보 설정
+			$('#returnForm input[name=accountNo]').val(accountNo);
+			$('#returnForm input[name=accountNm]').val(accountNm);
+			$('#returnForm input[name=bankCd]').val(bankCd);
+			
+			// 팝업 닫기
+			$("#refundAccountPop .popup_close").trigger("click");
+			
+			// 반품신청
+			fnReturn();
+		} else {
+			mcxDialog.alert('인증받은 계좌정보와 다릅니다.');
+		}
 	} else {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
@@ -852,22 +881,20 @@ function handleOnInput(el, maxlength) {
 	}
 }
 
-// 210408_ 추가 : 환불계좌등록 팝업 스크립트
+//210408_ 추가 : 환불계좌등록 팝업 스크립트
 $(document).on("click","#btn_refund_pop",function(e){
 	$('#refundAccountPop').show().addClass("active");
 	$("body").css({"overflow":"hidden"});
 });
 
-// 210408_ 추가 : 은행선택 팝업 스크립트
+//210408_ 추가 : 은행선택 팝업 스크립트
 $(document).on("click","#refundAccountPop .select_bank",function(e){
-	if (isValid == false) {
-		$('#refundBankPop').show().addClass("active");
-		$('#refundBankPop').css({"z-index":"1000"});
-		$("body").css({"overflow":"hidden"});
-	}
+	$('#refundBankPop').show().addClass("active");
+	$('#refundBankPop').css({"z-index":"1000"});
+	$("body").css({"overflow":"hidden"});
 });
 
-// 210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
 $('.refundAccountPop .popup_close').on("click",function(){
 	$('.refundAccountPop').hide().removeClass('active');
 	$("body").css({"overflow":"visible"});
@@ -877,6 +904,18 @@ $('.refundAccountPop .popup_close').on("click",function(){
 $('.refundBankPop .popup_close').on("click",function(){
 	$('.refundBankPop').hide().removeClass('active');
 });
+
+//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
+$(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	let bankCd = $(this).attr('bankCd');
+	let bankNm = $(this).attr('bankNm');
+	
+	$('#refundAccountPop input[name=bankCd]').val(bankCd);
+	$('#refundAccountPop .select_custom.select_bank .combo .select').text(bankNm);
+	
+	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
 </script>
 
 </th:block>

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCancelFormMob.html

@@ -532,6 +532,7 @@ $('#btn_bank_certi').on('click', function () {
 				$('#refundAccountPop input[name=confirmedAccountNm]').val(accountNm);
 				$('#refundAccountPop input[name=confirmedAccountNo]').val(accountNo);
 				$('#refundAccountPop input[name=confirmedBankCd]').val(bankCd);
+				
 				return false;
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberReturnFormMob.html

@@ -370,6 +370,9 @@
 
 <!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
 <div id="refundAccountPop" class="popup_box refundAccountPop">
+	<input type="hidden" name="confirmedAccountNo"/>
+	<input type="hidden" name="confirmedAccountNm"/>
+	<input type="hidden" name="confirmedBankCd"/>
 	<div class="lap">
 		<div class="popup_close">카테고리닫기</div>
 		<div class="popup_head sr-only">
@@ -442,7 +445,7 @@
 		<div class="popup_con">
 			<div class="button_list clear">
 				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
-					<button type="button" th:id="${oneData.cd}"><span th:text="${oneData.cdNm}"></span></button>
+					<button type="button" th:attr="bankCd=${oneData.cd}, bankNm=${oneData.cdNm}"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
 			</div>
 		</div>
@@ -504,15 +507,15 @@ $('#returnForm input[name=wdGb]').on('change', function() {
 });
 
 // 은행목록 버튼 기능
-$("#refundBankPop .button_list button").each(function(){
-	$(this).on("click", function(){
-		$("#refundAccountPop input[name=bankCd]").val($(this).attr("id"));
-		$("#refundAccountPop .select_custom.select_bank .select").text($(this).find("span").text());
-	});
-
-	// 팝업 닫기
-	$(".popup_close").trigger("click");
-});
+//$("#refundBankPop .button_list button").each(function(){
+//	$(this).on("click", function(){
+//		$("#refundAccountPop input[name=bankCd]").val($(this).attr("id"));
+//		$("#refundAccountPop .select_custom.select_bank .select").text($(this).find("span").text());
+//	});
+//
+//	// 팝업 닫기
+//	$(".popup_close").trigger("click");
+//});
 
 // 반품 처리
 var fnReturn = function() {
@@ -767,11 +770,22 @@ $('#btn_bank_certi').on('click', function () {
 		return false;
 	}
 	
+	// 승인된 계좌 정보
+	let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+	let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+	let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+	
+	// 계좌정보
+	let accountNm 			= $('#refundAccountPop input[name=accountNm]').val();
+	let accountNo 			= $('#refundAccountPop input[name=accountNo]').val();
+	let bankCd 				= $('#refundAccountPop input[name=bankCd]').val();
+	
+	if (accountNm != confirmedAccountNm || accountNo != confirmedAccountNo || bankCd != confirmedBankCd) {
+		isValid = false;
+	}
+	
 	if (!isValid) {
 		let url 		= '/noMember/account/check';
-		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
-		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
-		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
 		let data = {};
 		data.accountNm 	= accountNm;
@@ -787,8 +801,13 @@ $('#btn_bank_certi').on('click', function () {
 			if (isValid) {
 				mcxDialog.alert('계좌인증에 성공했습니다.');
 				// 계좌인증 성공 시 Disabled 처리
-				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
-				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				//$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				//$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				
+				$('#refundAccountPop input[name=confirmedAccountNm]').val(accountNm);
+				$('#refundAccountPop input[name=confirmedAccountNo]').val(accountNo);
+				$('#refundAccountPop input[name=confirmedBankCd]').val(bankCd);
+				
 				return false;
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
@@ -801,20 +820,30 @@ $('#btn_bank_certi').on('click', function () {
 // 계좌등록 후 환불신청 버튼 클릭 이벤트
 $('#btn_bank_return').click(function() {
 	if (isValid) {
+		// 승인된 계좌 정보
+		let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+		let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+		let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+		
+		// 계좌정보
 		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
 		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
 		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
 		
-		// 부모창의 input 값으로 환불계좌정보 설정
-		$('#returnForm input[name=accountNo]').val(accountNo);
-		$('#returnForm input[name=accountNm]').val(accountNm);
-		$('#returnForm input[name=bankCd]').val(bankCd);
-
-		// 팝업 닫기
-		$(".close-modal").trigger("click");
-		
-		// 반품신청
-		fnReturn();
+		if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
+			// 부모창의 input 값으로 환불계좌정보 설정
+			$('#returnForm input[name=accountNo]').val(accountNo);
+			$('#returnForm input[name=accountNm]').val(accountNm);
+			$('#returnForm input[name=bankCd]').val(bankCd);
+			
+			// 팝업 닫기
+			$("#refundAccountPop .popup_close").trigger("click");
+			
+			// 반품신청
+			fnReturn();
+		} else {
+			mcxDialog.alert('인증받은 계좌정보와 다릅니다.');
+		}
 	} else {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
@@ -857,22 +886,20 @@ function handleOnInput(el, maxlength) {
 	}
 }
 
-// 210408_ 추가 : 환불계좌등록 팝업 스크립트
+//210408_ 추가 : 환불계좌등록 팝업 스크립트
 $(document).on("click","#btn_refund_pop",function(e){
 	$('#refundAccountPop').show().addClass("active");
 	$("body").css({"overflow":"hidden"});
 });
 
-// 210408_ 추가 : 은행선택 팝업 스크립트
+//210408_ 추가 : 은행선택 팝업 스크립트
 $(document).on("click","#refundAccountPop .select_bank",function(e){
-	if (isValid == false) {
-		$('#refundBankPop').show().addClass("active");
-		$('#refundBankPop').css({"z-index":"1000"});
-		$("body").css({"overflow":"hidden"});
-	}
+	$('#refundBankPop').show().addClass("active");
+	$('#refundBankPop').css({"z-index":"1000"});
+	$("body").css({"overflow":"hidden"});
 });
 
-// 210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
 $('.refundAccountPop .popup_close').on("click",function(){
 	$('.refundAccountPop').hide().removeClass('active');
 	$("body").css({"overflow":"visible"});
@@ -882,6 +909,18 @@ $('.refundAccountPop .popup_close').on("click",function(){
 $('.refundBankPop .popup_close').on("click",function(){
 	$('.refundBankPop').hide().removeClass('active');
 });
+
+//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
+$(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	let bankCd = $(this).attr('bankCd');
+	let bankNm = $(this).attr('bankNm');
+	
+	$('#refundAccountPop input[name=bankCd]').val(bankCd);
+	$('#refundAccountPop .select_custom.select_bank .combo .select').text(bankNm);
+	
+	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
 </script>
 
 </th:block>