Merge remote-tracking branch 'origin/ST24PRJ-671' into develop

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

@@ -95,8 +95,8 @@
 				</table>
 				<!-- //TABLE -->
 
-				<h4>주문결제내역</h4>
-				<table class="frmStyle">
+				<h4 th:if="${orginalOrdPayInfo != null}">주문결제내역</h4>
+				<table class="frmStyle" th:if="${orginalOrdPayInfo != null}">
 					<colgroup>
 						<col width="10%"/>
 						<col width="10%"/>
@@ -1519,116 +1519,118 @@ $(document).ready(function () {
 // 	$(".pgGbNm").text(pgGbNm);
 // 	$(".cardNm").text(cardGbNm);
 	
-	// 원주문 결제내역 정보
-	$('.totPayAmt').text(orginalOrdPayInfo.totPayAmt.addComma() + '원');
-	$('.ordCurrAmt').text(orginalOrdPayInfo.ordCurrAmt.addComma() + '원');
-	$('.payMeansNm').text(orginalOrdPayInfo.payMeansNm);
-	$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
-	$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
-	$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
-	
-	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 = '';
-	if (parseInt(orginalOrdPayInfo.gfcdUseAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.gfcdUseDesc)) {
-		if (orginalOrdPayInfo.gfcdUseDesc.indexOf('!@!') > -1) {
-			var arrGfcdUseDesc = orginalOrdPayInfo.gfcdUseDesc.split('!@!');
-			for (var j = 0; j < arrGfcdUseDesc.length; j++) {
-				gfcdUseDesc += '<li>' + arrGfcdUseDesc[j] + '</li>\n';
-			}
-		} else {
-			gfcdUseDesc += '<li>' + orginalOrdPayInfo.gfcdUseDesc + '</li>\n';
-		}
-	}
-	$('.gfcdUseDesc').html(gfcdUseDesc);
-	
-	$('.totDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.totDcAmt) + '원');
-	$('.pntDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.pntDcAmt.addComma() + '원</u></a>');
-	$('.cpn1DcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.cpn1DcAmt) + '원');
-	
-	var cpn1CpnDcDesc = '';
-	if (parseInt(orginalOrdPayInfo.cpn1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cpn1CpnDcDesc)) {
-		if (orginalOrdPayInfo.cpn1CpnDcDesc.indexOf('!@!') > -1) {
-			var arrCpn1CpnDcDesc = orginalOrdPayInfo.cpn1CpnDcDesc.split('!@!');
-			for (var j = 0; j < arrCpn1CpnDcDesc.length; j++) {
-				cpn1CpnDcDesc += '<li>' + arrCpn1CpnDcDesc[j] + '</li>\n';
+	if (!gagajf.isNull(orginalOrdPayInfo)) {
+		// 원주문 결제내역 정보
+		$('.totPayAmt').text(orginalOrdPayInfo.totPayAmt.addComma() + '원');
+		$('.ordCurrAmt').text(orginalOrdPayInfo.ordCurrAmt.addComma() + '원');
+		$('.payMeansNm').text(orginalOrdPayInfo.payMeansNm);
+		$('.mainPayAmt').text((orginalOrdPayInfo.realOrdAmt - orginalOrdPayInfo.pgCpnAmt - orginalOrdPayInfo.npayPntAmt).addComma() + '원');
+		$('.payMeansDesc').text(orginalOrdPayInfo.payMeansDesc);
+		$('.realDelvAmt').text(orginalOrdPayInfo.realDelvAmt.addComma() + '원');
+		
+		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 = '';
+		if (parseInt(orginalOrdPayInfo.gfcdUseAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.gfcdUseDesc)) {
+			if (orginalOrdPayInfo.gfcdUseDesc.indexOf('!@!') > -1) {
+				var arrGfcdUseDesc = orginalOrdPayInfo.gfcdUseDesc.split('!@!');
+				for (var j = 0; j < arrGfcdUseDesc.length; j++) {
+					gfcdUseDesc += '<li>' + arrGfcdUseDesc[j] + '</li>\n';
+				}
+			} else {
+				gfcdUseDesc += '<li>' + orginalOrdPayInfo.gfcdUseDesc + '</li>\n';
 			}
-		} else {
-			cpn1CpnDcDesc += '<li>' + orginalOrdPayInfo.cpn1CpnDcDesc + '</li>\n';
 		}
-	}
-	$('.cpn1CpnDcDesc').html(cpn1CpnDcDesc);
-	
-	$('.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>');
-	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];
+		$('.gfcdUseDesc').html(gfcdUseDesc);
+		
+		$('.totDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.totDcAmt) + '원');
+		$('.pntDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.pntDcAmt.addComma() + '원</u></a>');
+		$('.cpn1DcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.cpn1DcAmt) + '원');
+		
+		var cpn1CpnDcDesc = '';
+		if (parseInt(orginalOrdPayInfo.cpn1DcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cpn1CpnDcDesc)) {
+			if (orginalOrdPayInfo.cpn1CpnDcDesc.indexOf('!@!') > -1) {
+				var arrCpn1CpnDcDesc = orginalOrdPayInfo.cpn1CpnDcDesc.split('!@!');
+				for (var j = 0; j < arrCpn1CpnDcDesc.length; j++) {
+					cpn1CpnDcDesc += '<li>' + arrCpn1CpnDcDesc[j] + '</li>\n';
 				}
 			} else {
-				tmtb1Desc += orginalOrdPayInfo.tmtb1Desc;
+				cpn1CpnDcDesc += '<li>' + orginalOrdPayInfo.cpn1CpnDcDesc + '</li>\n';
 			}
 		}
-		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];
+		$('.cpn1CpnDcDesc').html(cpn1CpnDcDesc);
+		
+		$('.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>');
+		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 {
-				tmtb2Desc += orginalOrdPayInfo.tmtb2Desc;
 			}
+			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;
+				}
+			}
+			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 = '';
-	if (parseInt(orginalOrdPayInfo.goodsCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.goodsCpnDcDesc)) {
-		if (orginalOrdPayInfo.goodsCpnDcDesc.indexOf('!@!') > -1) {
-			var arrGoodsCpnDcDesc = orginalOrdPayInfo.goodsCpnDcDesc.split('!@!');
-			for (var j = 0; j < arrGoodsCpnDcDesc.length; j++) {
-				goodsCpnDcDesc += '<li>' + arrGoodsCpnDcDesc[j] + '</li>\n';
+		
+		$('.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 = '';
+		if (parseInt(orginalOrdPayInfo.goodsCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.goodsCpnDcDesc)) {
+			if (orginalOrdPayInfo.goodsCpnDcDesc.indexOf('!@!') > -1) {
+				var arrGoodsCpnDcDesc = orginalOrdPayInfo.goodsCpnDcDesc.split('!@!');
+				for (var j = 0; j < arrGoodsCpnDcDesc.length; j++) {
+					goodsCpnDcDesc += '<li>' + arrGoodsCpnDcDesc[j] + '</li>\n';
+				}
+			} else {
+				goodsCpnDcDesc += '<li>' + orginalOrdPayInfo.goodsCpnDcDesc + '</li>\n';
 			}
-		} else {
-			goodsCpnDcDesc += '<li>' + orginalOrdPayInfo.goodsCpnDcDesc + '</li>\n';
 		}
-	}
-	$('.goodsCpnDcDesc').html(goodsCpnDcDesc);
-	
-	$('.savePntAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.savePntAmt.addComma() + '</u>원</a>');
-	$('.cartCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.cartCpnDcAmt) + '원</u></span></a>');
-	
-	var cartCpnDcDesc = '';
-	if (parseInt(orginalOrdPayInfo.cartCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cartCpnDcDesc)) {
-		if (orginalOrdPayInfo.cartCpnDcDesc.indexOf('!@!') > -1) {
-			var arrCartCpnDcDesc = orginalOrdPayInfo.cartCpnDcDesc.split('!@!');
-			for (var j = 0; j < arrCartCpnDcDesc.length; j++) {
-				cartCpnDcDesc += '<li>' + arrCartCpnDcDesc[j] + '</li>\n';
+		$('.goodsCpnDcDesc').html(goodsCpnDcDesc);
+		
+		$('.savePntAmt').html('<a href="javascript:void(0);" onclick="fnOrderPointHst(' + ordNo + ');"><u>' + orginalOrdPayInfo.savePntAmt.addComma() + '</u>원</a>');
+		$('.cartCpnDcAmt').html('<a href="javascript:void(0);" onclick="fnOrderCouponHst(' + ordNo + ');"><span class="cRed"><u>' + getZeroMinusDelAmt(orginalOrdPayInfo.cartCpnDcAmt) + '원</u></span></a>');
+		
+		var cartCpnDcDesc = '';
+		if (parseInt(orginalOrdPayInfo.cartCpnDcAmt) > 0 && !gagajf.isNull(orginalOrdPayInfo.cartCpnDcDesc)) {
+			if (orginalOrdPayInfo.cartCpnDcDesc.indexOf('!@!') > -1) {
+				var arrCartCpnDcDesc = orginalOrdPayInfo.cartCpnDcDesc.split('!@!');
+				for (var j = 0; j < arrCartCpnDcDesc.length; j++) {
+					cartCpnDcDesc += '<li>' + arrCartCpnDcDesc[j] + '</li>\n';
+				}
+			} else {
+				cartCpnDcDesc += '<li>' + orginalOrdPayInfo.cartCpnDcDesc + '</li>\n';
 			}
-		} else {
-			cartCpnDcDesc += '<li>' + orginalOrdPayInfo.cartCpnDcDesc + '</li>\n';
 		}
+		$('.cartCpnDcDesc').html(cartCpnDcDesc);
+		
+		$('.cashReceipReqYn').text(orginalOrdPayInfo.cashReceipReqYn);
+		$('.prePntDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.prePntDcAmt) + '원');
 	}
-	$('.cartCpnDcDesc').html(cartCpnDcDesc);
-	
-	$('.cashReceipReqYn').text(orginalOrdPayInfo.cashReceipReqYn);
-	$('.prePntDcAmt').text(getZeroMinusDelAmt(orginalOrdPayInfo.prePntDcAmt) + '원');
 });
 </script>