fix : 게시글 등록 - 반품 안내문구
fix : 주문/배송조회 > 주문상세 - 무효/취소/반품 내역 제거
This commit is contained in:
@@ -343,11 +343,12 @@
|
||||
</c:choose>
|
||||
<div class="table-wrapper">
|
||||
<form id="bbsRegForm">
|
||||
<div class="refund-clause ck-content">
|
||||
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
|
||||
<br><br>
|
||||
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
|
||||
</div>
|
||||
<%--구독취소 유의사항--%>
|
||||
<%-- <div class="refund-clause ck-content">--%>
|
||||
<%-- <c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>--%>
|
||||
<%-- <br><br>--%>
|
||||
<%-- <c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>--%>
|
||||
<%-- </div>--%>
|
||||
<table class="table write">
|
||||
<caption>게시글 등록</caption>
|
||||
<colgroup>
|
||||
|
||||
@@ -292,11 +292,13 @@
|
||||
<div class="table-wrapper">
|
||||
<form id="bbsRegForm">
|
||||
<input type='hidden' name='bbsTyCd' id='bbsTyCd' value='<c:out value="${bbsInfo.bbsTyCd}"/>'>
|
||||
<div class="refund-clause ck-content">
|
||||
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
|
||||
<br><br>
|
||||
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
|
||||
</div>
|
||||
<c:if test="${bbsInfo.bbsTyCd eq '12'}">
|
||||
<div class="refund-clause ck-content">
|
||||
<c:out value="${clauseList[0].stplatNm}" escapeXml="false"/>
|
||||
<br><br>
|
||||
<c:out value="${clauseList[0].stplatCn}" escapeXml="false"/>
|
||||
</div>
|
||||
</c:if>
|
||||
<table class="table write">
|
||||
<caption>게시글 등록</caption>
|
||||
<colgroup>
|
||||
|
||||
@@ -49,6 +49,9 @@
|
||||
<c:when test="${order.ordrSttusCd == 75}">
|
||||
<span class="orderList__status complete"><c:out value="${order.ordrSttusNm}"/></span>
|
||||
</c:when>
|
||||
<c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">
|
||||
<a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>
|
||||
</c:when>
|
||||
</c:choose>
|
||||
<c:if test="${ order.ordrTyCd == '04'}">
|
||||
<br/>
|
||||
|
||||
@@ -1735,61 +1735,61 @@
|
||||
</c:forEach>
|
||||
|
||||
<%-- <c:if test="${not empty data.refundList }">--%>
|
||||
<c:if test="${showSection}">
|
||||
<div class="sub-right-content__section">
|
||||
<h3 class="sub-right-content__title">무효/취소/반품 내역</h3>
|
||||
<div class="sub-right-content__section">
|
||||
<div class="table-wrapper">
|
||||
<table class="table vertical">
|
||||
<caption>주문상세내역</caption>
|
||||
<colgroup>
|
||||
<col style="width: auto;">
|
||||
<col style="width: 20%;">
|
||||
<col style="width: 20%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 12%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>무효/취소/반품</th>
|
||||
<th>접수일시</th>
|
||||
<th>처리일시</th>
|
||||
<th>처리수량</th>
|
||||
<th>처리금액</th>
|
||||
<th>처리상태</th>
|
||||
<th>보기</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach var="refund" items="${data.refundList}">
|
||||
<c:if test="${ refund.useAt eq 'Y' }">
|
||||
<tr>
|
||||
<td> <c:out value="${refund.refundTyNm}"/></td>
|
||||
<td><c:out value="${refund.refundReqstDt}"/></td>
|
||||
<td><c:out value="${refund.refundComptDt}"/></td>
|
||||
<td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>
|
||||
<td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>
|
||||
<td>
|
||||
<c:out value="${refund.refundProcsSttusNm }"/>
|
||||
</td>
|
||||
<td>
|
||||
<c:if test = "${order.ordrSttusCd ne '95'}">
|
||||
<button type="button" class="btn sm outline"
|
||||
onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">
|
||||
상세보기
|
||||
</button>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<%-- <c:if test="${showSection}">--%>
|
||||
<%-- <div class="sub-right-content__section">--%>
|
||||
<%-- <h3 class="sub-right-content__title">무효/취소/반품 내역</h3>--%>
|
||||
<%-- <div class="sub-right-content__section">--%>
|
||||
<%-- <div class="table-wrapper">--%>
|
||||
<%-- <table class="table vertical">--%>
|
||||
<%-- <caption>주문상세내역</caption>--%>
|
||||
<%-- <colgroup>--%>
|
||||
<%-- <col style="width: auto;">--%>
|
||||
<%-- <col style="width: 20%;">--%>
|
||||
<%-- <col style="width: 20%;">--%>
|
||||
<%-- <col style="width: 12%;">--%>
|
||||
<%-- <col style="width: 12%;">--%>
|
||||
<%-- <col style="width: 12%;">--%>
|
||||
<%-- </colgroup>--%>
|
||||
<%-- <thead>--%>
|
||||
<%-- <tr>--%>
|
||||
<%-- <th>무효/취소/반품</th>--%>
|
||||
<%-- <th>접수일시</th>--%>
|
||||
<%-- <th>처리일시</th>--%>
|
||||
<%-- <th>처리수량</th>--%>
|
||||
<%-- <th>처리금액</th>--%>
|
||||
<%-- <th>처리상태</th>--%>
|
||||
<%-- <th>보기</th>--%>
|
||||
<%-- </tr>--%>
|
||||
<%-- </thead>--%>
|
||||
<%-- <tbody>--%>
|
||||
<%-- <c:forEach var="refund" items="${data.refundList}">--%>
|
||||
<%-- <c:if test="${ refund.useAt eq 'Y' }">--%>
|
||||
<%-- <tr>--%>
|
||||
<%-- <td> <c:out value="${refund.refundTyNm}"/></td>--%>
|
||||
<%-- <td><c:out value="${refund.refundReqstDt}"/></td>--%>
|
||||
<%-- <td><c:out value="${refund.refundComptDt}"/></td>--%>
|
||||
<%-- <td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>--%>
|
||||
<%-- <td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>--%>
|
||||
<%-- <td>--%>
|
||||
<%-- <c:out value="${refund.refundProcsSttusNm }"/>--%>
|
||||
<%-- </td>--%>
|
||||
<%-- <td>--%>
|
||||
<%-- <c:if test = "${order.ordrSttusCd ne '95'}">--%>
|
||||
<%-- <button type="button" class="btn sm outline"--%>
|
||||
<%-- onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">--%>
|
||||
<%-- 상세보기--%>
|
||||
<%-- </button>--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </td>--%>
|
||||
<%-- </tr>--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </c:forEach>--%>
|
||||
<%-- </tbody>--%>
|
||||
<%-- </table>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </c:if>--%>
|
||||
|
||||
<div class="sub-bottom-btn-container">
|
||||
<a href="javascript:void(0);" id="btnOrdrList" class="btn xl outline theme">주문 목록</a>
|
||||
|
||||
@@ -55,8 +55,8 @@
|
||||
}
|
||||
});
|
||||
|
||||
/* 주문/배송 목록 화면 이동 버튼 선택 이벤트 */
|
||||
$('#btnOrdrList').on('click', function() {
|
||||
/* 구독서비스 주문/배송 목록 화면 이동 버튼 선택 이벤트 */
|
||||
$('#btnSubsvcOrdrList').on('click', function() {
|
||||
const params = ${paramVO};
|
||||
const keys = Object.keys(params);
|
||||
|
||||
@@ -64,7 +64,7 @@
|
||||
|
||||
newForm.attr('name', 'newForm');
|
||||
newForm.attr('method', 'post');
|
||||
newForm.attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrOrdrListInqire"/>');
|
||||
newForm.attr('action', '<c:url value="/sopmal/mpage/ordr/selectMbrSubsvcOrdrListInqireRForm"/>');
|
||||
|
||||
for (let i=0; i<keys.length; i++) {
|
||||
const key = keys[i];
|
||||
@@ -1531,64 +1531,64 @@
|
||||
</c:forEach>
|
||||
|
||||
<%-- <c:if test="${not empty data.refundList }">--%>
|
||||
<c:if test="${showSection}">
|
||||
<div class="sub-right-content__section">
|
||||
<h3 class="sub-right-content__title">무효/취소/반품 내역</h3>
|
||||
<div class="sub-right-content__section">
|
||||
<div class="table-wrapper">
|
||||
<table class="table vertical">
|
||||
<caption>구독서비스 주문상세내역</caption>
|
||||
<colgroup>
|
||||
<col style="width: auto;">
|
||||
<col style="width: 20%;">
|
||||
<col style="width: 20%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 12%;">
|
||||
<col style="width: 12%;">
|
||||
</colgroup>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>무효/취소/반품</th>
|
||||
<th>접수일시</th>
|
||||
<th>처리일시</th>
|
||||
<th>처리수량</th>
|
||||
<th>처리금액</th>
|
||||
<th>처리상태</th>
|
||||
<th>보기</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach var="refund" items="${data.refundList}">
|
||||
<c:if test="${ refund.useAt eq 'Y' }">
|
||||
<tr>
|
||||
<td> <c:out value="${refund.refundTyNm}"/></td>
|
||||
<td><c:out value="${refund.refundReqstDt}"/></td>
|
||||
<td><c:out value="${refund.refundComptDt}"/></td>
|
||||
<td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>
|
||||
<td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>
|
||||
<td>
|
||||
<c:out value="${refund.refundProcsSttusNm }"/>
|
||||
</td>
|
||||
<td>
|
||||
<c:if test = "${order.ordrSttusCd ne '95'}">
|
||||
<button type="button" class="btn sm outline"
|
||||
onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">
|
||||
상세보기
|
||||
</button>
|
||||
</c:if>
|
||||
</td>
|
||||
</tr>
|
||||
</c:if>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:if>
|
||||
<%-- <c:if test="${showSection}">--%>
|
||||
<%-- <div class="sub-right-content__section">--%>
|
||||
<%-- <h3 class="sub-right-content__title">무효/취소/반품 내역</h3>--%>
|
||||
<%-- <div class="sub-right-content__section">--%>
|
||||
<%-- <div class="table-wrapper">--%>
|
||||
<%-- <table class="table vertical">--%>
|
||||
<%-- <caption>구독서비스 주문상세내역</caption>--%>
|
||||
<%-- <colgroup>--%>
|
||||
<%-- <col style="width: auto;">--%>
|
||||
<%-- <col style="width: 20%;">--%>
|
||||
<%-- <col style="width: 20%;">--%>
|
||||
<%-- <col style="width: 12%;">--%>
|
||||
<%-- <col style="width: 12%;">--%>
|
||||
<%-- <col style="width: 12%;">--%>
|
||||
<%-- </colgroup>--%>
|
||||
<%-- <thead>--%>
|
||||
<%-- <tr>--%>
|
||||
<%-- <th>무효/취소/반품</th>--%>
|
||||
<%-- <th>접수일시</th>--%>
|
||||
<%-- <th>처리일시</th>--%>
|
||||
<%-- <th>처리수량</th>--%>
|
||||
<%-- <th>처리금액</th>--%>
|
||||
<%-- <th>처리상태</th>--%>
|
||||
<%-- <th>보기</th>--%>
|
||||
<%-- </tr>--%>
|
||||
<%-- </thead>--%>
|
||||
<%-- <tbody>--%>
|
||||
<%-- <c:forEach var="refund" items="${data.refundList}">--%>
|
||||
<%-- <c:if test="${ refund.useAt eq 'Y' }">--%>
|
||||
<%-- <tr>--%>
|
||||
<%-- <td> <c:out value="${refund.refundTyNm}"/></td>--%>
|
||||
<%-- <td><c:out value="${refund.refundReqstDt}"/></td>--%>
|
||||
<%-- <td><c:out value="${refund.refundComptDt}"/></td>--%>
|
||||
<%-- <td><fmt:formatNumber value="${refund.refundQy}" pattern="#,###"/></td>--%>
|
||||
<%-- <td><fmt:formatNumber value="${refund.refundAmt}" pattern="#,###"/></td>--%>
|
||||
<%-- <td>--%>
|
||||
<%-- <c:out value="${refund.refundProcsSttusNm }"/>--%>
|
||||
<%-- </td>--%>
|
||||
<%-- <td>--%>
|
||||
<%-- <c:if test = "${order.ordrSttusCd ne '95'}">--%>
|
||||
<%-- <button type="button" class="btn sm outline"--%>
|
||||
<%-- onclick="fn_move_dtlupdt('<c:out value="${refund.orderRefundInnb}"/>','<c:out value="${refund.ordrInnb}"/>');">--%>
|
||||
<%-- 상세보기--%>
|
||||
<%-- </button>--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </td>--%>
|
||||
<%-- </tr>--%>
|
||||
<%-- </c:if>--%>
|
||||
<%-- </c:forEach>--%>
|
||||
<%-- </tbody>--%>
|
||||
<%-- </table>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </div>--%>
|
||||
<%-- </c:if>--%>
|
||||
|
||||
<div class="sub-bottom-btn-container">
|
||||
<a href="javascript:void(0);" id="btnOrdrList" class="btn xl outline theme">주문 목록</a>
|
||||
<a href="javascript:void(0);" id="btnSubsvcOrdrList" class="btn xl outline theme">주문 목록</a>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user