fix : 구독서비스 주문/배송 - 적립금 관련 표시 제거
fix : 주문결제 > 배송지 정보 세팅 - 배송지역코드 관련 로직 추가
This commit is contained in:
이대환
@@ -33,11 +33,11 @@
|
||||
<div class="orderList__description__second">
|
||||
<span class="orderList__price"><span class="comma"><fmt:formatNumber value="${order.setleAmt}" pattern="#,###"/></span>${curUnit}</span>
|
||||
</div>
|
||||
<div class="orderList__description__third">
|
||||
<c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}">
|
||||
<span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>
|
||||
</c:if>
|
||||
</div>
|
||||
<%-- <div class="orderList__description__third">--%>
|
||||
<%-- <c:if test = "${!(order.ordrSttusCd > 84 && order.ordrSttusCd < 100)}">--%>
|
||||
<%-- <span class="orderList__mileage"><span class="comma">예상적립 <fmt:formatNumber value="${order.mlgAmt}" pattern="#,###"/></span>점</span>--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </div>--%>
|
||||
<div class="orderList__description__fourth">
|
||||
<c:choose>
|
||||
<c:when test="${order.ordrSttusCd > 14 && order.ordrSttusCd < 36}">
|
||||
|
||||
@@ -576,6 +576,7 @@
|
||||
|
||||
dlvylc['recpntNm'] = data.recpntNm;
|
||||
dlvylc['recpntMbtlnb'] = data.mbtlnb;
|
||||
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
|
||||
dlvylc['dlvylcZip'] = data.postcode;
|
||||
dlvylc['dlvylcAdresDvCd'] = data.addressType;
|
||||
dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
|
||||
@@ -589,10 +590,14 @@
|
||||
data:JSON.stringify(dlvylc),
|
||||
dataType:'json',
|
||||
success:function(data) {
|
||||
if (data.resBody != null) {
|
||||
alert('<spring:message code="success.common.update"/>');
|
||||
|
||||
location.reload();
|
||||
let result = JSON.parse(data.resBody.result);
|
||||
if (result != null) {
|
||||
if(result.status == 0) {
|
||||
alert('<spring:message code="success.common.update"/>');
|
||||
location.reload();
|
||||
} else {
|
||||
alert(result.message);
|
||||
}
|
||||
}
|
||||
},
|
||||
error:function(request, status, error) {
|
||||
@@ -1212,7 +1217,7 @@
|
||||
<col style="width: 10%;">
|
||||
<col style="width: 10%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 10%;">
|
||||
<%-- <col style="width: 10%;">--%>
|
||||
<col style="width: 10%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
@@ -1222,7 +1227,7 @@
|
||||
<th>상품금액</th>
|
||||
<th>할인금액</th>
|
||||
<th>할인적용금액</th>
|
||||
<th>적립금</th>
|
||||
<%-- <th>적립금</th>--%>
|
||||
<th>처리상태</th>
|
||||
</tr>
|
||||
</thead>
|
||||
@@ -1264,12 +1269,12 @@
|
||||
<span class="priceUnit">${curUnit}</span>
|
||||
</span>
|
||||
</td>
|
||||
<td>
|
||||
<%--<td>
|
||||
<span class="cartItem__mileage">
|
||||
<span class=" comma"><fmt:formatNumber value="${goods.mlgAmt}" pattern="#,###"/></span>
|
||||
<span class="priceUnit">점</span>
|
||||
</span>
|
||||
</td>
|
||||
</td>--%>
|
||||
<td>
|
||||
<a class="orderList__status">
|
||||
<c:choose>
|
||||
|
||||
@@ -163,7 +163,8 @@
|
||||
if (row.optnNm != null) {
|
||||
div += ' <p class="orderListItem__info__option">' + row.optnNm + '</p>';
|
||||
}
|
||||
div += ' <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';
|
||||
<%--div += ' <p class="orderListItem__info__quantity">' + row.orderCnt + '개<span class="orderListItem__info__dot">·</span><span class="comma">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';--%>
|
||||
div += ' <p class="orderListItem__info__quantity">' + (row.setleAmt).toLocaleString() + '</span>' + '${curUnit}';
|
||||
div += ' </p>';
|
||||
div += ' </div>';
|
||||
div += ' </div>';
|
||||
|
||||
@@ -271,6 +271,7 @@
|
||||
|
||||
dlvylc['recpntNm'] = data.recpntNm;
|
||||
dlvylc['recpntMbtlnb'] = data.mbtlnb;
|
||||
dlvylc['dlvylcAreaCd'] = data.dlvylcAreaCd;
|
||||
dlvylc['dlvylcZip'] = data.postcode;
|
||||
dlvylc['dlvylcAdresDvCd'] = data.addressType;
|
||||
dlvylc['dlvylcLnbAdres'] = data.jibunAddress;
|
||||
@@ -289,7 +290,16 @@
|
||||
data: JSON.stringify(dlvylc),
|
||||
dataType: 'json',
|
||||
success: function (data) {
|
||||
onSuccess();
|
||||
let result = JSON.parse(data.resBody.result);
|
||||
if (result != null) {
|
||||
if(result.status == 0) {
|
||||
onSuccess();
|
||||
} else {
|
||||
$("#customAlertCn").text(result.message);
|
||||
closeModal('confirm_updt_alert');
|
||||
openModal2("custom_alert");
|
||||
}
|
||||
}
|
||||
},
|
||||
error: function (request, status, error) {
|
||||
let message = JSON.parse(JSON.parse(request.responseText).resBody.message);
|
||||
@@ -815,64 +825,65 @@
|
||||
</c:forEach>
|
||||
</c:if>
|
||||
<%--주문취소, 결제취소시 미노출--%>
|
||||
<c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">
|
||||
<div class="sub-box">
|
||||
<div class="orderDetailProduct">
|
||||
<div class="orderDetailProduct__top" role="button" tabindex="0">
|
||||
<span class="orderDetailProduct__top__title">
|
||||
적립금<%--<span class="misc">(최대 390원)</span>--%>
|
||||
</span>
|
||||
<span class="orderDetailProduct__top__chevron"></span>
|
||||
</div>
|
||||
<div class="orderDetail__content">
|
||||
<div class="orderDetail__body">
|
||||
<div class="table-wrapper orderDetail__table">
|
||||
<table class="table">
|
||||
<colgroup>
|
||||
<col style="width: 40%">
|
||||
<col style="width: 60%">
|
||||
</colgroup>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>구매확정 시 적립예정</th>
|
||||
<td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>리뷰작성 시 적립예정</th>
|
||||
<td>
|
||||
<c:forEach var="ntc" items="${data.mlgAccmlNtcList}" varStatus="status">
|
||||
<c:choose>
|
||||
<c:when test="${'06' == ntc.bbsTyCd}">
|
||||
<c:if test="${not empty ntc.gnrlRvwAmt}">
|
||||
일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립
|
||||
</c:if>
|
||||
<c:if test="${not empty ntc.photoRvwAmt}">
|
||||
<br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립
|
||||
</c:if>
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}">
|
||||
<fmt:parseDate value="${ntc.bgnDe}" var="bgnDeDate" pattern="yyyyMMdd"/>
|
||||
<fmt:formatDate value="${bgnDeDate}" var="bgnDe" pattern="yyyy-MM-dd"/>
|
||||
<fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/>
|
||||
<fmt:formatDate value="${endDeDate}" var="endDe" pattern="yyyy-MM-dd"/>
|
||||
|
||||
<br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>점</i> 추가 적립)
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<%--적립금 표시 제거--%>
|
||||
<%-- <c:if test = "${order.ordrSttusCd ne '85' && order.ordrSttusCd ne '95'}">--%>
|
||||
<%-- <div class="sub-box">--%>
|
||||
<%-- <div class="orderDetailProduct">--%>
|
||||
<%-- <div class="orderDetailProduct__top" role="button" tabindex="0">--%>
|
||||
<%-- <span class="orderDetailProduct__top__title">--%>
|
||||
<%-- 적립금<%–<span class="misc">(최대 390원)</span>–%>--%>
|
||||
<%-- </span>--%>
|
||||
<%-- <span class="orderDetailProduct__top__chevron"></span>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- <div class="orderDetail__content">--%>
|
||||
<%-- <div class="orderDetail__body">--%>
|
||||
<%-- <div class="table-wrapper orderDetail__table">--%>
|
||||
<%-- <table class="table">--%>
|
||||
<%-- <colgroup>--%>
|
||||
<%-- <col style="width: 40%">--%>
|
||||
<%-- <col style="width: 60%">--%>
|
||||
<%-- </colgroup>--%>
|
||||
<%-- <tbody>--%>
|
||||
<%-- <tr>--%>
|
||||
<%-- <th>구매확정 시 적립예정</th>--%>
|
||||
<%-- <td>마일리지 <em><fmt:formatNumber value="${data.mlgAccmlAmt}" pattern="#,###"/>점</em></td>--%>
|
||||
<%-- </tr>--%>
|
||||
<%-- <tr>--%>
|
||||
<%-- <th>리뷰작성 시 적립예정</th>--%>
|
||||
<%-- <td>--%>
|
||||
<%-- <c:forEach var="ntc" items="${data.mlgAccmlNtcList}" varStatus="status">--%>
|
||||
<%-- <c:choose>--%>
|
||||
<%-- <c:when test="${'06' == ntc.bbsTyCd}">--%>
|
||||
<%-- <c:if test="${not empty ntc.gnrlRvwAmt}">--%>
|
||||
<%-- 일반리뷰 <em><c:out value="${ntc.gnrlRvwAmt}"/>점</em> 적립--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- <c:if test="${not empty ntc.photoRvwAmt}">--%>
|
||||
<%-- <br/>포토리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </c:when>--%>
|
||||
<%-- <c:otherwise>--%>
|
||||
<%-- <br/>한달리뷰 <em><c:out value="${ntc.photoRvwAmt}"/>점</em> 적립--%>
|
||||
<%-- </c:otherwise>--%>
|
||||
<%-- </c:choose>--%>
|
||||
<%-- <c:if test="${not empty ntc.bgnDe && not empty ntc.endDe}">--%>
|
||||
<%-- <fmt:parseDate value="${ntc.bgnDe}" var="bgnDeDate" pattern="yyyyMMdd"/>--%>
|
||||
<%-- <fmt:formatDate value="${bgnDeDate}" var="bgnDe" pattern="yyyy-MM-dd"/>--%>
|
||||
<%-- <fmt:parseDate value="${ntc.endDe}" var="endDeDate" pattern="yyyyMMdd"/>--%>
|
||||
<%-- <fmt:formatDate value="${endDeDate}" var="endDe" pattern="yyyy-MM-dd"/>--%>
|
||||
<%-- --%>
|
||||
<%-- <br/>(<c:out value="${bgnDe}"/> ~ <c:out value="${endDe}"/> 까지 <i><c:out value="${ntc.aditMlgAmt}"/>점</i> 추가 적립)--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </c:forEach>--%>
|
||||
<%-- </td>--%>
|
||||
<%-- </tr>--%>
|
||||
<%-- </tbody>--%>
|
||||
<%-- </table>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </c:if>--%>
|
||||
|
||||
<div class="sub-box">
|
||||
<div class="orderDetailProduct">
|
||||
|
||||
Reference in New Issue
Block a user