Merge branch 'develop' into card007

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

@@ -593,7 +593,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 			String pgGb = refundPreInfo.getString("pgGb");
 			if(TscConstants.PgGb.NAVER_ORDER.value().equals(pgGb)) {
 				// 네이버페이 주문형 알림톡, 메일 송부 X
-				return super.ok("성공");
+				return super.ok(message.getMessage("RETURN_0001"));
 			}
 
 			// 반품 알림톡 관련 정보 조회
@@ -621,7 +621,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 			}
 		}
 		
-		return super.ok("성공");
+		return super.ok(message.getMessage("RETURN_0001"));
 	}
 	
 	/**
@@ -649,7 +649,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 		// 2.취소요청철회 
 		mav = coreOrderChangeService.rtnReqCancel(mav, userNo);
 		
-		return super.ok("성공");
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 	
 	/**
@@ -933,7 +933,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		// 처리 결과 코드에 따른 메세지 설정
 		if (result.get("status").equals(GagaResponseStatus.SUCCESS.getCode())) {
-			result.set("message", message.getMessage("SUCC_0004"));
+			result.set("message", message.getMessage("EXCHANGE_0001"));
 		} else {
 			result.set("message", message.getMessage("FAIL_0004"));
 		}
@@ -1001,7 +1001,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		orderChangeService.returnToExchange(orderChange);
 
-		return super.ok();
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
 	/**
@@ -1023,7 +1023,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		orderChangeService.returnToReturn(orderChange);
 
-		return super.ok();
+		return super.ok(message.getMessage("SUCC_0004")); 
 	}
 
 	/**
@@ -1045,7 +1045,7 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		orderChangeService.exchangeToExchange(orderChange);
 
-		return super.ok();
+		return super.ok(message.getMessage("SUCC_0004"));
 	}
 
 	/**

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

@@ -469,6 +469,7 @@
 		            WHEN LEAF_CATE_NO = CATE1_NO THEN 1
 		       END                             AS CLS_LVL     /*분류레벨*/
 		     , REPLACE(FULL_CATE_NO,' > ','/') AS TREE_PATH   /*AG-GRID트리패스(ag-Grid미사용시 필요 없음)*/
+		     , (SELECT LEAF_YN FROM TB_CATE2 C2 WHERE C2.CATE2_NO = C4.CATE2_NO AND C2.CATE2_NO = C4.LEAF_CATE_NO) AS LEAF_YN /*카테고리2 LEAF_YN 여부*/
 		FROM   TB_CATE_4SRCH C4
 		WHERE  CATE_GB = #{cateGb}
 		AND    CATE_TYPE = 'G031_10' /*상품분류카테고리*/

src/main/webapp/WEB-INF/views/display/ItemkindCategoryForm.html

@@ -209,8 +209,12 @@
 		var applyData = [];
 		
 		selectedData.forEach(function(item) {
-			if (item.clsLvl >= 3) {
+			if (item.clsLvl == 2 && item.leafYn == "Y" ) {
 				applyData.push(item);
+			}else{
+				if (item.clsLvl >= 3) {
+					applyData.push(item);
+				}
 			}
 		});
 		//2021-06-28 체크박스 해제 로직 추가

src/main/webapp/WEB-INF/views/marketing/ReviewDetailForm.html

@@ -92,7 +92,8 @@
 						
 						<dl class="rvTxt">
 							<dt>구매후기</dt>
-							<dd th:utext="*{reviewContent}"></dd>
+							<dd th:utext="*{#strings.replace(reviewContent, T(System).getProperty('line.separator'), '&lt;br /&gt;')}"></dd>
+							<!-- <dd th:utext="*{reviewContent}"></dd> -->
 						</dl>
 						<!-- //리뷰 파일 -->
 						

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -883,7 +883,7 @@ var fnExchange = function () {
 	}
 
 	mcxDialog.confirm('교환요청하시겠습니까?', {
-		cancelBtnText		: "반품",
+		cancelBtnText		: "취소",
 		sureBtnClick		: function(){
 			// 교환 실행
 			gagajf.ajaxJsonSubmit(