회원상세 발송취소, 예약 문구 위치 변경
This commit is contained in:
parent
3bb1f11a5a
commit
5e067677dc
@ -3904,10 +3904,10 @@ function kakaoATDelayCancel(msgGroupId){
|
|||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
||||||
<span style="color: red;">
|
<span style="color: red;">
|
||||||
<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
|
|
||||||
[예약]
|
|
||||||
</c:if>
|
|
||||||
[발송취소]<br />
|
[발송취소]<br />
|
||||||
|
<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
|
||||||
|
[예약]<br />
|
||||||
|
</c:if>
|
||||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
|
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="MM-dd HH:mm"/>
|
||||||
</span>
|
</span>
|
||||||
</c:when>
|
</c:when>
|
||||||
@ -4114,10 +4114,10 @@ function kakaoATDelayCancel(msgGroupId){
|
|||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
<c:when test="${mjonMsgSentList.delayYn eq 'Y' && mjonMsgSentList.delayCompleteYn eq 'Y' && not empty mjonMsgSentList.cancelDate}">
|
||||||
<span style="color: red;">
|
<span style="color: red;">
|
||||||
<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
|
|
||||||
[예약]
|
|
||||||
</c:if>
|
|
||||||
[발송취소]<br />
|
[발송취소]<br />
|
||||||
|
<c:if test="${mjonMsgSentList.reserveYn eq 'Y'}">
|
||||||
|
[예약]<br />
|
||||||
|
</c:if>
|
||||||
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
|
<fmt:formatDate value="${mjonMsgSentList.cancelDate}" pattern="yyyy-MM-dd HH:mm"/>
|
||||||
</span>
|
</span>
|
||||||
</c:when>
|
</c:when>
|
||||||
@ -4533,10 +4533,10 @@ function kakaoATDelayCancel(msgGroupId){
|
|||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
|
<c:when test="${kakaoResultList.atDelayYn eq 'Y' && kakaoResultList.atDelayCompleteYn eq 'Y' && not empty kakaoResultList.cancelDate}">
|
||||||
<span style="color: red;">
|
<span style="color: red;">
|
||||||
<c:if test="${kakaoResultList.reserveYn eq 'Y'}">
|
|
||||||
[예약]
|
|
||||||
</c:if>
|
|
||||||
[발송취소]<br />
|
[발송취소]<br />
|
||||||
|
<c:if test="${kakaoResultList.reserveYn eq 'Y'}">
|
||||||
|
[예약]<br />
|
||||||
|
</c:if>
|
||||||
<fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
<fmt:parseDate value="${kakaoResultList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||||
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
||||||
</span>
|
</span>
|
||||||
@ -4671,6 +4671,9 @@ function kakaoATDelayCancel(msgGroupId){
|
|||||||
<c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
|
<c:when test="${kakaoReserveList.atDelayYn eq 'Y' && kakaoReserveList.atDelayCompleteYn eq 'Y' && not empty kakaoReserveList.cancelDate}">
|
||||||
<span style="color: red;">
|
<span style="color: red;">
|
||||||
[발송취소]<br />
|
[발송취소]<br />
|
||||||
|
<c:if test="${kakaoReserveList.reserveYn eq 'Y'}">
|
||||||
|
[예약]<br />
|
||||||
|
</c:if>
|
||||||
<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
<fmt:parseDate value="${kakaoReserveList.cancelDate}" var="cancelDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
||||||
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
<fmt:formatDate value="${cancelDateValue}" pattern="MM-dd HH:mm"/>
|
||||||
</span>
|
</span>
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user