Merge branch 'develop' into jmh

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/webapp/WEB-INF/views/order/ExchangeRequestForm.html

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