Merge remote-tracking branch '112.172.147.34/style' into ST24PRJ-198(다다익선등록오류)

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

@@ -1206,7 +1206,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;
 
@@ -1513,12 +1513,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>');