Merge branch 'returnAfterDecision' into develop

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

@@ -450,11 +450,13 @@ public class TsaOrderChangeController extends TsaBaseController {
 		String chgStat = "";
 
 		// 1. 반품가능 주문상세상탭값 설정
-		String[] ordDtlStatArr = new String[4];
+		// 2021.09.14 card007 구매확정 반품신청
+		String[] ordDtlStatArr = new String[5];
 		ordDtlStatArr[0] = TscConstants.OrderDetailStat.SHIPPING.value();
 		ordDtlStatArr[1] = TscConstants.OrderDetailStat.SHIP_COMPLETE.value();
 		ordDtlStatArr[2] = TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value();
 		ordDtlStatArr[3] = TscConstants.OrderDetailStat.DELIVERY_PREPARE.value();
+		ordDtlStatArr[4] = TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value();
 		order.setOrdDtlStatArr(ordDtlStatArr);
 
 		// 2. 변경신청된 주문상세번호를 체크 후 있으면 해당 취소가능수량값 업데이트
@@ -806,10 +808,12 @@ public class TsaOrderChangeController extends TsaBaseController {
 
 		if (ordChgSq == null || ordChgSq == 0) {
 			// 교환가능 주문상세상탭값 설정
-			String[] ordDtlStatArr = new String[3];
+			// 2021.09.14 card007 구매확정 교환신청 처리
+			String[] ordDtlStatArr = new String[4];
 			ordDtlStatArr[0] = TscConstants.OrderDetailStat.SHIPPING.value();
 			ordDtlStatArr[1] = TscConstants.OrderDetailStat.SHIP_COMPLETE.value();
 			ordDtlStatArr[2] = TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value();
+			ordDtlStatArr[3] = TscConstants.OrderDetailStat.PURCHASE_CONFIRM.value();
 			order.setOrdDtlStatArr(ordDtlStatArr);
 		}
 		

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

@@ -381,7 +381,7 @@ var columnDefsGoodsInfo = [
 					}
 					
 					// 배송중, 배송완료 (교환신청, 반품신청) 
-					if (params.value == 'G013_50' || params.value == 'G013_60') {
+					if (params.value == 'G013_50' || params.value == 'G013_60' || params.value == 'G013_70') {
 						if (params.data.ordQty > (params.data.cnclRtnQty + params.data.ordReqChgQty)) {
 							var paramData 	= params.data.ordNo;
 							paramData 		+= '@' + params.data.ordDtlNo;