Merge branch 'style' into ST24PRJ-127

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

@@ -36,8 +36,8 @@
 						<col width="6%"/>
 						<col width="10%"/>
 						<col width="10%"/>
-						<col width="6%"/>
 						<col width="14%"/>
+						<col width="6%"/>
 						<col width="7%"/>
 						<col width="9%"/>
 						<col width="12%"/>
@@ -52,8 +52,8 @@
 							<th>웹구분</th>
 							<th>제휴몰</th>
 							<th>주문일시</th>
-							<th>주문번호</th>
 							<th>제휴몰주문번호</th>
+							<th>주문번호</th>
 							<th>주문자</th>
 							<th>휴대폰번호</th>
 							<th>이메일</th>
@@ -71,8 +71,8 @@
 							<td th:text="${orderInfo[0].frontGbNm}"></td>
 							<td th:text="${orderInfo[0].extmallNm}"></td>
 							<td th:text="${orderInfo[0].ordDt}"></td>
-							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].extmallOrderId}"></td>
+							<td th:text="${orderInfo[0].ordNo}"></td>
 							<td th:text="${orderInfo[0].ordNm}"></td>
 							<td>
 								<a href="script:void(0)" class="lmsPop" th:attr="orderPhnno=${orderInfo[0].ordPhnno}"><th:block th:text="${orderInfo[0].ordPhnno}"></th:block></a>
@@ -419,6 +419,7 @@ var columnDefsGoodsInfo = [
 					return option;
 				}
 			},
+			{ headerName: "배송구분", field: "shotDelvGb", width: 80, cellClass: 'text-center' },
 			{headerName: "브랜드"		, field: "brandGroupNm"	, width: 80, cellClass: 'text-center'},
 			{headerName: "옵션1"		, field: "colorNm"		, width: 60, cellClass: 'text-center'},
 			{headerName: "옵션2"		, field: "optCd2"		, width: 60, cellClass: 'text-center'},
@@ -774,7 +775,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);
 
@@ -1206,7 +1208,7 @@ var fnSetGridHeightInit = function () {
 <script th:inline="javascript">
 var pgGb 			= orderInfo[0].pgGb;
 var payMeans 		= orderInfo[0].payMeans;
-// var payMeansNm		= orderInfo[0].payMeansNm;
+var payMeansNm		= orderInfo[0].payMeansNm;
 var cardNm			= orderInfo[0].cardNm;
 var custNo			= orderInfo[0].custNo;
 
@@ -1291,6 +1293,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원이하이면 '-' 처리 삭제 함수
@@ -1513,12 +1526,11 @@ $(document).ready(function () {
 	$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
 	$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
 	$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
-	if (parseInt(orginalOrdPayInfo.realDelvAmt) > 0) {
-		var delvFeeDesc = '';
-		if (!gagajf.isNull(orginalOrdPayInfo.delvFeeDesc)) delvFeeDesc += '<li>배송비 : ' + orginalOrdPayInfo.delvFeeDesc + '</li>';
-		if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) delvFeeDesc += '<li>배송비 쿠폰 : ' + orginalOrdPayInfo.delvFeeCpnDesc + '</li>';
-		$('.delvFeeDesc').html(delvFeeDesc);
-	}
+	
+	var delvFeeDesc = '';
+	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeDesc)) delvFeeDesc += '<li>배송비 : ' + orginalOrdPayInfo.delvFeeDesc + '</li>';
+	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) delvFeeDesc += '<li>배송비 쿠폰 : ' + orginalOrdPayInfo.delvFeeCpnDesc + '</li>';
+	$('.delvFeeDesc').html(delvFeeDesc);
 	
 	$('.gfcdUseAmt').html('<a href="javascript:void(0);" onclick="fnOrderGiftcardHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.gfcdUseAmt.addComma() + '원</u></a>');