Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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

@@ -148,9 +148,10 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.set("ordNo"			, cnclReq.getOrdNo());
 		mav.set("ordChgSq"		, cnclReq.getOrdChgSq());
 		
-		// 2.취소요청철회 
+		// 2.취소요청철회
 		mav = coreOrderChangeService.cnclReqCancel(mav, userNo);
-		
+		// coreNaverPayService.sendNaverPayRejectReturn(cnclReq, userNo);
+
 		return super.ok("성공");
 	}
 	

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

@@ -85,7 +85,7 @@
 					<!-- //TABLE -->
 				</div>
 				
-				<h4>주문정보</h4>
+				<h4 id="orderInfoTitle">주문정보</h4>
 				<div id="gridOrderCancelRequestList" style="width:100%; height: 200px;" class="ag-theme-balham"></div>
 
 				<h4 id="h4OrderCancelRequestToBeList">취소정보</h4>
@@ -1225,6 +1225,7 @@ $(document).ready(function() {
 	if(pgGb == "NAVER_ORDER") {
 		$("#cnclReqBtn").css("display", "none");
 		$("#cnclCompleteBtn").css("display", "none");
+		$("#orderInfoTitle").append('<span style="color: red; margin-left: 20px;">네이버페이 주문형은 취소 철회시 네이버페이센터에서도 철회해주셔야합니다.</span>');
 	}
 	
 	// 6. 취소사유 선택