수정

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

@@ -100,7 +100,7 @@
 					<colgroup>
 						<col width="10%"/>
 						<col width="10%"/>
-						<col width="20%"/>
+						<col width="30%"/>
 						<col width="10%"/>
 						<col width="10%"/>
 						<col/>
@@ -126,14 +126,12 @@
 						</tr>
 						<tr>
 							<th class="payMeansNm"></th>
-							<td class="realOrdAmt"></td>
+							<td class="mainPayAmt"></td>
 							<td class="payMeansDesc"></td>
 							<th>배송비 합산(B)</th>
 							<td class="realDelvAmt"></td>
 							<td>
-								<ul class="notice">
-									<li>배송비 : <span class="delvFeeDesc"></span></li>
-									<li>배송비 쿠폰 : <span class="delvFeeCpnDesc"></span></li>
+								<ul class="notice delvFeeDesc">
 								</ul>
 							</td>
 						</tr>
@@ -173,7 +171,7 @@
 						<tr>
 							<th>마일리지</th>
 							<td class="npayPntAmt"></td>
-							<td></td>
+							<td class="npayPntDesc"></td>
 							<th><i class="fa fa-level-up fa-rotate-90" aria-hidden="true"></i>&nbsp;상품쿠폰&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</th>
 							<td class="cRed goodsCpnDcAmt"></td>
 							<td>
@@ -1502,11 +1500,16 @@ $(document).ready(function () {
 	$('.totPayAmt').text(orginalOrdPayInfo.totPayAmt.addComma() + '원');
 	$('.ordCurrAmt').text(orginalOrdPayInfo.ordCurrAmt.addComma() + '원');
 	$('.payMeansNm').text(orginalOrdPayInfo.payMeansNm);
-	$('.realOrdAmt').text(orginalOrdPayInfo.realOrdAmt.addComma() + '원');
+	$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
 	$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
 	$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
-	$('.delvFeeDesc').text(orginalOrdPayInfo.delvFeeDesc);
-	if (!gagajf.isNull(orginalOrdPayInfo.delvFeeCpnDesc)) $('.delvFeeCpnDesc').text(orginalOrdPayInfo.delvFeeCpnDesc);
+	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);
+	}
+	
 	$('.gfcdUseAmt').html('<a href="javascript:void(0);" onclick="fnOrderGiftcardHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.gfcdUseAmt.addComma() + '원</u></a>');
 	
 	var gfcdUseDesc = '';
@@ -1541,34 +1544,36 @@ $(document).ready(function () {
 	
 	$('.pgCpnAmt').text(orginalOrdPayInfo.pgCpnAmt.addComma() + '원');
 	$('.tmtbDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderTmtbHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtbDcAmt) + '원</u></span></a>');
-	
-	var tmtb1Desc = '';
-	if (parseInt(orginalOrdPayInfo.tmtb1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb1Desc)) {
-		if (orginalOrdPayInfo.tmtb1Desc.indexOf('!@!') > -1) {
-			var arrTmtb1Desc = orginalOrdPayInfo.tmtb1Desc.split('!@!');
-			for (var j = 0; j < arrTmtb1Desc.length; j++) {
-				tmtb1Desc += arrTmtb1Desc[j];
+	if (parseInt(orginalOrdPayInfo.tmtbDcAmt) > 0) {
+		var tmtb1Desc = '';
+		if (parseInt(orginalOrdPayInfo.tmtb1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb1Desc)) {
+			if (orginalOrdPayInfo.tmtb1Desc.indexOf('!@!') > -1) {
+				var arrTmtb1Desc = orginalOrdPayInfo.tmtb1Desc.split('!@!');
+				for (var j = 0; j < arrTmtb1Desc.length; j++) {
+					tmtb1Desc += arrTmtb1Desc[j];
+				}
+			} else {
+				tmtb1Desc += orginalOrdPayInfo.tmtb1Desc;
 			}
-		} else {
-			tmtb1Desc += orginalOrdPayInfo.tmtb1Desc;
 		}
-	}
-	var tmtb2Desc = '';
-	if (parseInt(orginalOrdPayInfo.tmtb2DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb2Desc)) {
-		if (orginalOrdPayInfo.tmtb2Desc.indexOf('!@!') > -1) {
-			var arrTmtb2Desc = orginalOrdPayInfo.tmtb2Desc.split('!@!');
-			for (var j = 0; j < arrTmtb2Desc.length; j++) {
-				tmtb2Desc += arrTmtb2Desc[j];
+		var tmtb2Desc = '';
+		if (parseInt(orginalOrdPayInfo.tmtb2DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.tmtb2Desc)) {
+			if (orginalOrdPayInfo.tmtb2Desc.indexOf('!@!') > -1) {
+				var arrTmtb2Desc = orginalOrdPayInfo.tmtb2Desc.split('!@!');
+				for (var j = 0; j < arrTmtb2Desc.length; j++) {
+					tmtb2Desc += arrTmtb2Desc[j];
+				}
+			} else {
+				tmtb2Desc += orginalOrdPayInfo.tmtb2Desc;
 			}
-		} else {
-			tmtb2Desc += orginalOrdPayInfo.tmtb2Desc;
 		}
+		var tmtbDcDesc = '<li>수량 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb1DcAmt) + '원' + (!gagajf.isNull(tmtb1Desc) ? " (" : "") + tmtb1Desc + (!gagajf.isNull(tmtb1Desc) ? ")" : "") + '</li>';
+		tmtbDcDesc += '<li>금액 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb2DcAmt) + '원' + (!gagajf.isNull(tmtb2Desc) ? " (" : "") + tmtb2Desc + (!gagajf.isNull(tmtb2Desc) ? ")" : "") + '</li>';
+		$(".tmtbDcDesc").html(tmtbDcDesc);
 	}
-	var tmtbDcDesc = '<li>수량 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb1DcAmt) + '원' + (!gagajf.isNull(tmtb1Desc) ? " (" : "") + tmtb1Desc + (!gagajf.isNull(tmtb1Desc) ? ")" : "") + '</li>';
-	tmtbDcDesc += '<li>금액 할인 : ' + getZeroMinusDelAmt(orginalOrdPayInfo.tmtb2DcAmt) + '원' + (!gagajf.isNull(tmtb2Desc) ? " (" : "") + tmtb2Desc + (!gagajf.isNull(tmtb2Desc) ? ")" : "") + '</li>';
-	$(".tmtbDcDesc").html(tmtbDcDesc);
 	
 	$('.npayPntAmt').text(orginalOrdPayInfo.npayPntAmt.addComma() + '원');
+	$('.npayPntDesc').text(orginalOrdPayInfo.npayPntDesc);
 	$('.goodsCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.goodsCpnDcAmt) + '원</u></span></a>');
 	
 	var goodsCpnDcDesc = '';