Merge branch 'card007' into style

src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml

@@ -171,6 +171,7 @@
 		        WHERE RP.REVIEW_SQ <![CDATA[<]]> #{reviewSq} 
 		        AND RP.GOODS_CD = R.GOODS_CD 
 		        AND RP.DEL_YN = 'N'
+		        AND RP.CONFIRM_YN = 'Y'
 		        <if test='bestYn != null and bestYn == "Y"'>
 		        AND RP.BEST_YN = 'Y'
 		        </if>
@@ -191,6 +192,7 @@
 		        WHERE RN.REVIEW_SQ > #{reviewSq}
 		        AND RN.GOODS_CD = R.GOODS_CD 
 		        AND RN.DEL_YN = 'N'
+		        AND RN.CONFIRM_YN = 'Y'
 		        <if test='bestYn != null and bestYn == "Y"'>
 		        AND RN.BEST_YN = 'Y'
 		        </if>

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

@@ -384,6 +384,10 @@ var fnCancel = function() {
 		} else {
 			chk = true;
 		}
+	} else {
+		accountNo = null;
+		accountNm = null;
+		bankCd = null;
 	}
 
 	// 취소요청 데이터 설정

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

@@ -608,6 +608,10 @@ var fnReturn = function() {
 		} else {
 			chk = true
 		}
+	} else {
+		accountNo = null;
+		accountNm = null;
+		bankCd = null;
 	}
 
 	// 추가배송비 PG 처리
@@ -619,9 +623,9 @@ var fnReturn = function() {
 	data.ordChgSq 			= 0;
 	data.chgReason 			= chgReason;
 	data.chgMemo 			= $('#returnForm textarea[name=chgMemo]').val();
-	data.accountNo 			= $('#returnForm input[name=accountNo]').val();
-	data.accountNm 			= $('#returnForm input[name=accountNm]').val();
-	data.bankCd 			= $('#returnForm input[name=bankCd]').val();
+	data.accountNo 			= accountNo;
+	data.accountNm 			= accountNm;
+	data.bankCd 			= bankCd;
 	data.isCustomer 		= isCustomer;
 	data.wdGb 				= wdGb;
 	data.chgerNm 			= wdGb == 'W' ? $('#returnForm input[name=chgerNm]').val() : '';

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -288,6 +288,10 @@
 			} else {
 				chk = true;
 			}
+		} else {
+			accountNo = null;
+			accountNm = null;
+			bankCd = null;
 		}
 
 		// 취소요청 데이터 설정

src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -454,6 +454,10 @@
 			} else {
 				chk = true;
 			}
+		} else {
+			accountNo = null;
+			accountNm = null;
+			bankCd = null;
 		}
 
 		// 추가배송비 PG 처리
@@ -465,9 +469,9 @@
 		data.ordChgSq 			= 0;
 		data.chgReason 			= chgReason;
 		data.chgMemo 			= $('#returnForm textarea[name=chgMemo]').val();
-		data.accountNo 			= $('#returnForm input[name=accountNo]').val();
-		data.accountNm 			= $('#returnForm input[name=accountNm]').val();
-		data.bankCd 			= $('#returnForm input[name=bankCd]').val();
+		data.accountNo 			= accountNo;
+		data.accountNm 			= accountNm;
+		data.bankCd 			= bankCd;
 		data.isCustomer 		= isCustomer;
 		data.wdGb 				= wdGb;
 		data.chgerNm 			= wdGb == 'W' ? $('#chgerNm').text() : '';