Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfReviewService.java

@@ -289,7 +289,7 @@ public class TsfReviewService {
 		
 		// 첨부파일
 		for(Review loopReview : reviewList) {
-			loopReview.setRvAtcSq(review.getRvAtcSq());
+			/* loopReview.setRvAtcSq(review.getRvAtcSq()); */
 			loopReview.setReviewAttachList(reviewDao.getReviewAttachList(loopReview));
 			loopReview.setGoodsOptionList(reviewDao.getReviewGoodsOptionList(loopReview));
 		}
@@ -310,12 +310,14 @@ public class TsfReviewService {
 		review.setRegNo(TsfSession.getInfo().getCustNo());
 		review.setUpdNo(TsfSession.getInfo().getCustNo());		
 		review.setConfirmYn("Y");
+		review.setReviewGb("R");
 		reviewDao.updateMypageReview(review);
 		reviewDao.reviewAttachDelete(review);
 		
 		//이미지등록
 		if(!StringUtils.isAllEmpty(review.getOrgFileNmArr())) {
 			review.setConfirmYn("Y");
+			review.setReviewGb("P");
 			ReviewAttach fileReview = new ReviewAttach();
 			fileReview.setRegNo(TsfSession.getInfo().getCustNo());
 			fileReview.setUpdNo(TsfSession.getInfo().getCustNo());

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

@@ -1477,6 +1477,7 @@
 		      ,DATE_FORMAT(ENTRY_DT,'%e') AS ENTRY_DT 
 		FROM TB_PLAN_ENTRY
 		WHERE 1=1 
+		AND DATE_FORMAT(ENTRY_DT,'%Y-%m') IN (SELECT DATE_FORMAT(P.DISP_STDT, '%Y-%m')  FROM TB_PLAN P WHERE PLAN_SQ = #{planSq})
 		AND PLAN_SQ = #{planSq}
 		AND ENTRY_CUST_NO = #{custNo}
 	</select>

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

@@ -298,10 +298,10 @@
 		     OR
 		     FILE_GB = 'M' AND R.CONFIRM_YN = 'Y'  AND  NULLIF(KMC_KEY,'') IS NOT NULL
 		    )
-		<if test="rvAtcSq != null and rvAtcSq != ''">
+		<!-- <if test="rvAtcSq != null and rvAtcSq != ''">
 		ORDER BY FIELD(A.RV_ATC_SQ, #{rvAtcSq})DESC
 		        ,RV_ATC_SQ ASC 
-		</if>
+		</if> -->
 	</select>
 	
 	<!-- 상품평 상품 옵션 목록 -->

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -813,6 +813,11 @@
 		let $target = $('#cartForm input[name=cea]');
 		let targetSize = $target.length;	//선택성품 갯수
 		
+		if (targetSize <= 0){
+			mcxDialog.alert("옵션을 선택해 주세요.");
+			return false;
+		}
+		
 		$target.each(function() {
 			
 			let ea = parseInt($(this).val());

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -136,7 +136,7 @@
 								<input type="radio" name="opt"  th:id="${goodsOption2.optCd}" th:disabled="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" 
 										th:attr="addPrice=${goodsOption2.addPrice}, optCd1=${goodsOption2.optCd1}, optCd2=${goodsOption2.optCd2}, optCd=${goodsOption2.optCd}"/>
 								<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}">
-								<label th:for="${goodsOption2.optCd}">90</span></label>
+								<label th:for="${goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" >90</span></label>
 								</th:block>
 								<th:block th:unless="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}">
 								<label th:for="${goodsOption2.optCd}" th:onclick="fnViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption2.optCd}]],[[${goodsOption2.optCd1}]],[[${goodsOption2.optCd2}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )"><span th:text="${goodsOption2.optCd2}">90</span></label>
@@ -1841,10 +1841,16 @@
 			
 		}else { 
 			
-			let cartGoodsList = [];
-			
 			let target = $('#cartForm input[name=cea]');
 			
+			let targetSize = target.length;
+			if (targetSize <= 0){
+				mcxDialog.alert("옵션을 선택해 주세요.");
+				return false;
+			}
+			
+			let cartGoodsList = [];
+			
 			if (goodsType == 'G056_N'){
 				let compsList = [];
 				target.each(function() {

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailQnaFormMob.html

@@ -112,14 +112,14 @@
 			tag += '	<div class="fold_cont">\n';
 			tag += '		<div class="fold_detail">\n'; //문의 내용
 			tag += '			<div>\n';
-			tag += '				<p>' + item.questContent.replaceAll("\n", "</br>").escapeHtml() + '</p>\n';
+			tag += '				<p>' + item.questContent.escapeHtml() + '</p>\n';
 			tag += '			</div>\n';
 			tag += '		</div>\n';
 			
 			if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
 				tag += '	<div class="fold_answer">\n'; //문의 답변
 				tag += '		<div>\n';
-				tag += '			<div class="answer_body">' + item.ansContent.replaceAll("\n", "</br>") + '</div>\n';
+				tag += '			<div class="answer_body">' + item.ansContent + '</div>\n';
 				tag += '			<div class="answer_foot"><span class="data">' + item.ansDt + '</span>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';

src/main/webapp/WEB-INF/views/mob/goods/GoodsSizeInfoFormMob.html

@@ -25,7 +25,7 @@
 					<ul>
 						<li th:if="${measurementList != null and !measurementList.empty}" th:class="${(measurementList != null and !measurementList.empty) ? 'active': ''}"><a href="javascript:void(0);" >실측 사이즈</a></li>
 						<li th:if="${(commonSizeInfoList != null and !commonSizeInfoList.empty) or (brandSizeInfoList != null and !brandSizeInfoList.empty)}" th:class="${(measurementList == null or measurementList.empty) ? 'active': ''}"><a href="javascript:void(0);" >표준 사이즈</a></li>
-						<li th:if="${measurementSizeInfoList != null and !measurementSizeInfoList.empty}"><a href="javascript:void(0);" >측정 사이즈</a></li>
+						<li th:if="${measurementSizeInfoList != null and !measurementSizeInfoList.empty}"><a href="javascript:void(0);" >측정 가이드</a></li>
 					</ul>
 				</div>
 				<div class="tab_cont_wrap">

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

@@ -425,7 +425,7 @@ var reviewUpdate = function() {
 		return;
 	}
 	
-	mcxDialog.confirm('리뷰를 수정하시겠습니까"?', {
+	mcxDialog.confirm('리뷰를 수정하시겠습니까?', {
      cancelBtnText: "취소",
      sureBtnText: "확인",
      sureBtnClick: function(){
@@ -555,8 +555,8 @@ $(function(){
 								"<br/><span class=\"removes\">Removes image</span>" +
 								"</span>").insertBefore(".fileAdd");
 					}else{
-						$("<span class=\"pics\">" +
-								"<img class=\"picsThumbs\" />" +
+						$("<span class=\"pics mov\">" +
+								"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/poster/' + reviewAttach[i].kmcKey + "\"/>" +
 								"<input type='hidden' name='kmcKeyArr' value='" + reviewAttach[i].kmcKey + "'>" + 
 								"<input type='hidden' name='kufKeyArr' value='" + reviewAttach[i].kufKey + "'>" + 
 								"<br/><span class=\"removes\">Removes image</span>" +

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailQnaFormWeb.html

@@ -119,15 +119,15 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n'; //문의 내용
-				tag += '			<div>\n';
-				tag += '				<p>' + item.questContent.replaceAll("\n", "</br>").escapeHtml() + '</p>\n';
+				tag += '			<div>\n'; debugger;
+				tag += '				<p>' + item.questContent.escapeHtml() + '</p>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';
 				
 				if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
 					tag += '	<div class="fold_answer">\n'; //문의 답변
 					tag += '		<div class="answer_head">답변이 등록되었습니다.</div>\n';
-					tag += '		<div class="answer_body">' + item.ansContent.replaceAll("\n", "</br>") + '</div>\n';
+					tag += '		<div class="answer_body">' + item.ansContent + '</div>\n';
 					tag += '		<span class="data">' + item.ansDt + '</span>\n';
 					tag += '	</div>\n';
 				}

src/main/webapp/WEB-INF/views/web/goods/GoodsSizeInfoFormWeb.html

@@ -25,7 +25,7 @@
 					<ul>
 						<li th:if="${measurementList != null and !measurementList.empty}" th:class="${(measurementList != null and !measurementList.empty) ? 'active': ''}"><a href="javascript:void(0);" >실측 사이즈</a></li>
 						<li th:if="${(commonSizeInfoList != null and !commonSizeInfoList.empty) or (brandSizeInfoList != null and !brandSizeInfoList.empty)}" th:class="${(measurementList == null or measurementList.empty) ? 'active': ''}"><a href="javascript:void(0);" >표준 사이즈</a></li>
-						<li th:if="${measurementSizeInfoList != null and !measurementSizeInfoList.empty}"><a href="javascript:void(0);" >측정 사이즈</a></li>
+						<li th:if="${measurementSizeInfoList != null and !measurementSizeInfoList.empty}"><a href="javascript:void(0);" >측정 가이드</a></li>
 					</ul>
 				</div>
 				<div class="tab_cont_wrap">

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

@@ -512,7 +512,7 @@ var reviewUpdate = function() {
 		return;
 	}
 	
-	mcxDialog.confirm('리뷰를 수정하시겠습니까"?', {
+	mcxDialog.confirm('리뷰를 수정하시겠습니까?', {
         cancelBtnText: "취소",
         sureBtnText: "확인",
         sureBtnClick: function(){
@@ -702,8 +702,8 @@ $(document).ready(function() {
 								"<br/><span class=\"removes\">Removes image</span>" +
 								"</span>").insertAfter("#fileAdd");
 					}else{
-						$("<span class=\"pics\">" +
-								"<img class=\"picsThumbs\" />" +
+						$("<span class=\"pics mov\">" +
+								"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/poster/' + reviewAttach[i].kmcKey + "\"/>" +
 								"<input type='hidden' name='kmcKeyArr' value='" + reviewAttach[i].kmcKey + "'>" + 
 								"<input type='hidden' name='kufKeyArr' value='" + reviewAttach[i].kufKey + "'>" + 
 								"<br/><span class=\"removes\">Removes image</span>" +

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -1031,6 +1031,10 @@ $(document).ready( function() {
 	$('.btn_copy').bind('click', function() {
 		copyToClipboard();
 	});
+	
+	$('#replyText').bind('input paste', function() {
+		  $(this).trigger('keyup');
+	});
 
 	//팝업 - 쿠폰사용안내
 	$(document).on('click','#btn_couponInfo_pop',function(e){

src/main/webapp/biz/payment.js

@@ -43,7 +43,6 @@ function call_pay_form()
 	if(v_frm.encoding_trans == undefined) {
 		v_frm.action = PayUrl;
 	} else if(v_frm.encoding_trans.value == "UTF-8") {
-		alert(PayUrl);
 		v_frm.action = PayUrl.substring(0, PayUrl.lastIndexOf("/")) + "/jsp/encodingFilter/encodingFilter.jsp";
 		v_frm.PayUrl.value = PayUrl;
 	} else {

src/main/webapp/ux/style24_link.js

@@ -1312,7 +1312,7 @@ function cfMypageReviewDetail(goodsCd, photoYn, reviewSq, rvAtcSq) {
 	var params = '?goodsCd=' + goodsCd;
 	params += '&reviewSq=' + reviewSq;
 	params += '&photoYn=' + photoYn;
-	if (typeof (rvAtcSq) != 'undefined') params += "&rvAtcSq=" + rvAtcSq;
+	if (typeof (rvAtcSq) != 'undefined') params += "&attachSq=" + rvAtcSq;
 	
 	cfnOpenLayer(_PAGE_MYPAGE_REVIEW_DETAIL_LAYER+params, 'layer_review_best');
 }