Merge branch 'ST24PRJ-491' into develop

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

@@ -774,7 +774,8 @@ var columnDefsDeliveryInfo = [
 	},
 	{headerName: "주소(기본)"		, field: "recipBaseAddr"	, width: 220, cellClass: 'text-left'},
 	{headerName: "주소(상세)"		, field: "recipDtlAddr"		, width: 220, cellClass: 'text-left', editable: true},
-	{headerName: "배송메모"		, field: "delvMemo"			, width: 250, cellClass: 'text-left', editable: true}
+	{headerName: "배송메모"		, field: "delvMemo"			, width: 250, cellClass: 'text-left', editable: true},
+	{headerName: "주소입력기한"		, field: "giftLimitDt"		, width: 200, cellClass: 'text-center'}
 ];
 var gridOptionsDeliveryInfo = gagaAgGrid.getGridOptions(columnDefsDeliveryInfo);
 
@@ -1291,6 +1292,17 @@ $(document).ready(function () {
 	}
 
 	gagaAgGrid.showOrHideColumn(gridOptionsPaymentInfo, 'vaNm', payMeansChk);
+	
+	// 선물하기 정보 처리
+	let giftPackYn = orderDeliveryAddrInfo[0].giftPackYn;
+	let giftAddrInpYn = orderDeliveryAddrInfo[0].giftAddrInpYn;
+	if (giftPackYn == 'Y') {
+		if (giftAddrInpYn == 'Y') {
+			gagaAgGrid.setColumnHeaderName(gridOptionsDeliveryInfo, 'giftLimitDt', '주소입력일자');
+		}
+	} else {
+		gagaAgGrid.showOrHideColumn(gridOptionsDeliveryInfo, 'giftLimitDt', false);
+	}
 });
 
 //0원이하이면 '-' 처리 삭제 함수