fix : 쇼핑몰 주문완료 화면 - 구독서비스 주문완료 분기 추가

This commit is contained in:
이대환
2026-03-27 11:49:32 +09:00
parent 3007f0780d
commit 5aa87c2526
8 changed files with 238 additions and 71 deletions

View File

@@ -58,7 +58,10 @@
/* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */
$('#btnOrdrList').on('click', function() {
location.href = '<c:url value="/sopmal/mpage/ordr/selectMbrOrdrListInqire"/>';
const subsvcAt = '${data.order.subsvcAt}';
location.href = subsvcAt === 'Y'
? '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm"/>'
: '<c:url value="/sopmal/mpage/ordr/selectMbrOrdrListInqire"/>';
});
}
@@ -94,6 +97,90 @@
<h2 class="cartOrder__title">주문완료</h2>
<div class="sub-right-content">
<c:choose>
<c:when test="${order.subsvcAt eq 'Y'}">
<div class="sub-right-content__section">
<div class="sub-right-content__section">
<div class="cartOrder__list">
<div class="table-wrapper">
<table class="table vertical">
<caption>주문상세내역</caption>
<colgroup>
<col style="width: auto;">
<col style="width: 40px;">
<col style="width: 10%;">
</colgroup>
<thead>
<tr>
<th>상품명</th>
<th>수량</th>
<th>상품금액</th>
<th>할인금액</th>
<th>할인적용금액</th>
<th>적립금</th>
</tr>
</thead>
<tbody>
<c:choose>
<c:when test="${not empty data.goodsList}">
<c:forEach var="goods" items="${data.goodsList}">
<tr>
<td>
<div class="cartItem">
<div class="cartItem__image">
<img src="<c:out value="${cdnurl}${goods.goodsImgCours}"/>" onerror="this.src='/pc/images/image_placeholder.png'" alt="<c:out value="${goods.goodsNm}"/>">
</div>
<div class="cartItem__productInfo">
<a href="javascript:void(0);" class="cartItem__productTitle"><c:out value="${goods.goodsNm}"/></a>
<span class="cartItem__productOption"><span class="option-badge">옵션</span> <c:out value="${goods.optnNm}"/></span>
<c:if test="${not empty goods.inputOptnText}">
<span class="cartItem__productOption"><c:out value="${goods.inputOptnText}"/></span>
</c:if>
</div>
</div>
</td>
<td>
<span><fmt:formatNumber value="${goods.ordrQy}" pattern="#,###"/></span>
<input type="hidden" class="goodsInnb" name="goodsInnb" value ="${goods.goodsInnb}"/>
</td>
<td>
<span class="cartItem__normalPrice">
<span class=" comma"><fmt:formatNumber value="${goods.slepric}" pattern="#,###"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</td>
<td>
<span class="cartItem__discountPrice">
<span class="cartItem__discountMinus">(-)</span>
<span class="comma"><fmt:formatNumber value="${goods.dscntAmt}" pattern="#,###"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</td>
<td>
<span class="cartItem__afterPrice">
<span class="comma"><fmt:formatNumber value="${goods.applyDscntAmt}" pattern="#,###"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</td>
<td>
<span class="cartItem__mileage">
<span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span>
<span class="priceUnit">${curUnit}</span>
</span>
</td>
</tr>
</c:forEach>
</c:when>
<c:otherwise>
<tr><td colspan="100%" ><spring:message code="common.nodata"/></td></tr>
</c:otherwise>
</c:choose>
</tbody>
</table>
</div>
</div>
</div>
</div>
</c:when>
<c:when test="${'04' == order.ordrTyCd || '05' == order.ordrTyCd}">
<div class="sub-right-content__section">
<c:choose>
@@ -335,44 +422,45 @@
</c:otherwise>
</c:choose>
<c:if test="${'04' != order.ordrTyCd && '05' != order.ordrTyCd}">
<c:if test="${order.subsvcAt eq 'Y' || '04' != order.ordrTyCd && '05' != order.ordrTyCd}">
<div class="sub-right-content__section">
<h3 class="sub-right-content__innerTitle">배송지 정보</h3>
<c:choose>
<c:when test="${not empty data.shippingList}">
<c:forEach var="shipping" items="${data.shippingList}" varStatus="status">
<div class="table-wrapper orderDetail__table">
<table class="table">
<caption>배송지 정보</caption>
<colgroup>
<col style="width: 220px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th>받는분</th>
<td><c:out value="${shipping.recpntNm}"/></td>
</tr>
<tr>
<th>주소</th>
<td>
<c:out value="${not empty shipping.dlvylcZip ? '(' += shipping.dlvylcZip += ')' : ''}"/>
<c:out value="${shipping.adres}"/>
<c:out value="${shipping.dlvylcAdresDtl}"/>
</td>
</tr>
<tr>
<th>휴대폰번호</th>
<td><c:out value="${shipping.recpntMbtlnb}"/></td>
</tr>
<tr>
<th>배송 시 요청사항</th>
<td><c:out value="${shipping.dlvyMssageCn}"/></td>
</tr>
</tbody>
</table>
</div>
<c:if test="${order.subsvcAt ne 'Y' || status.first}">
<div class="table-wrapper orderDetail__table">
<table class="table">
<caption>배송지 정보</caption>
<colgroup>
<col style="width: 220px;">
<col style="width: auto;">
</colgroup>
<tbody>
<tr>
<th>받는분</th>
<td><c:out value="${shipping.recpntNm}"/></td>
</tr>
<tr>
<th>주소</th>
<td>
<c:out value="${not empty shipping.dlvylcZip ? '(' += shipping.dlvylcZip += ')' : ''}"/>
<c:out value="${shipping.adres}"/>
<c:out value="${shipping.dlvylcAdresDtl}"/>
</td>
</tr>
<tr>
<th>휴대폰번호</th>
<td><c:out value="${shipping.recpntMbtlnb}"/></td>
</tr>
<tr>
<th>배송 시 요청사항</th>
<td><c:out value="${shipping.dlvyMssageCn}"/></td>
</tr>
</tbody>
</table>
</div>
</c:if>
</c:forEach>
</c:when>
<c:otherwise>