Merge branch '5401_배포전테스트'
@7af9d5db72d1315055812827b2262876ddf02f9b
--- src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
+++ src/main/java/itn/let/kakao/user/sent/web/KakaoSentController.java
... | ... | @@ -1128,6 +1128,6 @@ |
| 1128 | 1128 |
e.printStackTrace(); |
| 1129 | 1129 |
// TODO: handle exception |
| 1130 | 1130 |
} |
| 1131 |
- return "web/kakao/sent/KakaoSentDetailPopAjax"; |
|
| 1131 |
+ return "web/kakao/sent/KakaoSentDetailPhoneAjax"; |
|
| 1132 | 1132 |
} |
| 1133 | 1133 |
} |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
... | ... | @@ -3645,8 +3645,6 @@ |
| 3645 | 3645 |
AND A.MSG_GROUP_ID = B.MSG_GROUP_ID |
| 3646 | 3646 |
AND A.USER_ID = #userId# |
| 3647 | 3647 |
AND B.USER_ID = #userId# |
| 3648 |
- AND B.DEL_FLAG = 'N' |
|
| 3649 |
- AND IFNULL(B.DEL_FLAG,'N') = 'N' |
|
| 3650 | 3648 |
AND B.RESERVE_C_YN = 'N' |
| 3651 | 3649 |
|
| 3652 | 3650 |
<isNotEmpty property="startDate"> |
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailPhoneAjax.jsp
... | ... | @@ -0,0 +1,155 @@ |
| 1 | +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> | |
| 2 | +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> | |
| 3 | +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> | |
| 4 | +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> | |
| 5 | +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> | |
| 6 | +<% pageContext.setAttribute("newLineChar", "\n"); %> | |
| 7 | + | |
| 8 | +<div class="phone"> | |
| 9 | + <!-- 탭스타일 --> | |
| 10 | + <div class="list_tab_wrap2 type5 kakao_rev_tab"> | |
| 11 | + <ul class="tabType3" id="tabType" name="tabType"> | |
| 12 | + <li class="tab active"><button type="button" onclick="phoneTab(this,'1');" title="선택됨">카카오톡</button></li> | |
| 13 | + <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}"> | |
| 14 | + <li class="tab"><button type="button" onclick="phoneTab(this,'2');">대체문자</button></li> | |
| 15 | + </c:if> | |
| 16 | + </ul> | |
| 17 | + </div> | |
| 18 | + <!--// 탭스타일 --> | |
| 19 | + | |
| 20 | + <!-- 카카오 알림톡 미리보기 --> | |
| 21 | +<!-- <div class="tab_phone current" id="tab_phone_1"> --> | |
| 22 | +<!-- <div class="phone_kakako friendtalk"> --> | |
| 23 | + <div class="tab_phone current kakao_wrap" id="tab_phone_1"> | |
| 24 | + <div class="phone_kakako friendtalk"> | |
| 25 | + <div class="phoneIn"> | |
| 26 | + <p class="prev_p"><img src="/publish/images/content/kakao_prev_icon.png" alt=""><c:out value="${searchVO.yellowId}"/></p> | |
| 27 | + <!-- 텍스트 미리보기 --> | |
| 28 | + <div class="text_preview"> | |
| 29 | + <%--< div class="allimtalk_title"> | |
| 30 | + <img src="/publish/images/content/icon_allimtalk.png" alt=""> | |
| 31 | + <c:choose> | |
| 32 | + <c:when test="${msgType eq '8'}">알림톡 도착</c:when> | |
| 33 | + <c:when test="${msgType eq '9'}">친구톡 도착</c:when> | |
| 34 | + </c:choose> | |
| 35 | + </div> --%> | |
| 36 | + <c:if test="${resultMsgDetail.adFlag eq 'Y'}"> | |
| 37 | + <p class="friend_talk_title"><span>(광고)</span></p> | |
| 38 | + </c:if> | |
| 39 | + <div class="allimtalk_content"> | |
| 40 | + <c:choose> | |
| 41 | + <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'TEXT'}"> | |
| 42 | + <p class="emphasis_side_text"><c:out value="${kakaoTemplateInfo.templateSubtitle}"/></p> | |
| 43 | + <p class="emphasis_title_text"><c:out value="${kakaoTemplateInfo.templateTitle}"/></p> | |
| 44 | + </c:when> | |
| 45 | + <c:when test="${kakaoTemplateInfo.templateEmphasizeType eq 'IMAGE'}"> | |
| 46 | + <div class="kakao_image"> | |
| 47 | + <img src="<c:url value='${kakaoTemplateInfo.templateImageUrl}'/>" alt=""> | |
| 48 | + </div> | |
| 49 | + </c:when> | |
| 50 | + </c:choose> | |
| 51 | + | |
| 52 | + <p class="template_text"> | |
| 53 | + <c:out value="${fn:replace(fn:replace(kakaoTemplateInfo.templateContent, newLineChar, '<br/>'), newLineChar2, '<br/>')}" escapeXml="false"/> | |
| 54 | + </p> | |
| 55 | + | |
| 56 | + <c:choose> | |
| 57 | + <c:when test="${kakaoTemplateInfo.templateMessageType eq 'EX'}"> | |
| 58 | + <p class="side_info_text"><c:out value="${kakaoTemplateInfo.templateExtra}"/></p> | |
| 59 | + </c:when> | |
| 60 | + <c:when test="${kakaoTemplateInfo.templateMessageType eq 'AD'}"> | |
| 61 | + <p class="channel_info_text"><c:out value="${kakaoTemplateInfo.templateAd}"/></p> | |
| 62 | + </c:when> | |
| 63 | + </c:choose> | |
| 64 | + | |
| 65 | + <c:forEach var="templatInfoButtonList" items="${kakaoTemplateInfo.buttonList}" varStatus="status"> | |
| 66 | + <c:choose> | |
| 67 | + <c:when test="${templatInfoButtonList.name eq '채널 추가'}"> | |
| 68 | + <button type="button" class="btn_kakao_channel"><img src="/publish/images/content/icon_kakao_channel_plus.png" alt=""> 채널추가</button> | |
| 69 | + </c:when> | |
| 70 | + <c:otherwise> | |
| 71 | + <button type="button" class="btn_kakao_type"><c:out value="${templatInfoButtonList.name}"/></button> | |
| 72 | + </c:otherwise> | |
| 73 | + </c:choose> | |
| 74 | + </c:forEach> | |
| 75 | + </div> | |
| 76 | + | |
| 77 | + <c:if test="${resultMsgDetail.adFlag eq 'Y'}"> | |
| 78 | + <p class="kakao_block_text">수신거부 : 홈 > 채널차단</p> | |
| 79 | + </c:if> | |
| 80 | + | |
| 81 | + </div> | |
| 82 | + </div> | |
| 83 | + <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> | |
| 84 | + </div> | |
| 85 | + </div> | |
| 86 | + <!--// 카카오 알림톡 미리보기 --> | |
| 87 | + | |
| 88 | + <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}"> | |
| 89 | + <!-- 문자 미리보기 --> | |
| 90 | + <div class="tab_phone" id="tab_phone_2" style="display: none;position:relative;"> | |
| 91 | +<!-- <div class="tab_phone" id="tab_phone_2" > --> | |
| 92 | +<!-- <div class="tab_phone" id="tab_phone_2" style="display:none" > --> | |
| 93 | + <div class="phoneIn"> | |
| 94 | + <div> | |
| 95 | + <p class="prev_p"><img src="/publish/images/search.png"> 문자내용</p> | |
| 96 | + <div class="text_length2 clearfix"> | |
| 97 | + <c:if test="${resultMsgDetail.bizKakaoResendYn eq 'Y'}"> | |
| 98 | + <c:choose> | |
| 99 | + <c:when test="${resultMsgDetail.bizKakaoResendType eq 'SMS'}"> | |
| 100 | + <span class="msg_com msg_short">단문</span> | |
| 101 | + </c:when> | |
| 102 | + <c:otherwise> | |
| 103 | + <span class="msg_com msg_long">장문</span> | |
| 104 | + </c:otherwise> | |
| 105 | + </c:choose> | |
| 106 | +<%-- <c:choose> | |
| 107 | + <c:when test="${resultMsgDetail.bizKakaoResendTypeCnt > 1}"> | |
| 108 | + <span class="msg_com msg_short">단문</span> | |
| 109 | + <span class="msg_com msg_long">장문</span> | |
| 110 | + </c:when> | |
| 111 | + <c:when test="${resultMsgDetail.bizKakaoResendTypeCnt < 2 | |
| 112 | + && resultMsgDetail.bizKakaoResendType eq 'SMS'}"> | |
| 113 | + <span class="msg_com msg_short">단문</span> | |
| 114 | + </c:when> | |
| 115 | + <c:otherwise> | |
| 116 | + <span class="msg_com msg_long">장문</span> | |
| 117 | + </c:otherwise> | |
| 118 | + </c:choose> --%> | |
| 119 | + </c:if> | |
| 120 | + <!-- <div> | |
| 121 | + <span>글자크기</span> | |
| 122 | + <button type="button" onclick="changeFontSize('plus');"><img src="/publish/images/content/font_plus.png"></button> | |
| 123 | + <button type="button" onclick="changeFontSize('minus');"><img src="/publish/images/content/font_minus.png"></button> | |
| 124 | + </div> --> | |
| 125 | + </div> | |
| 126 | + <div class="text_preview"> | |
| 127 | + <c:if test="${not empty fileInfos}"> | |
| 128 | + <div class="preiew_img"> | |
| 129 | + <c:forEach var="fileInfo" items="${fileInfos}"> | |
| 130 | + <div class="img_box"> | |
| 131 | + <img src="<c:url value='/cmm/fms/getImage2.do'/>?atchFileId=<c:out value="${fileInfo.atchFileId}"/>&fileSn=<c:out value="${fileInfo.fileSn}"/>" alt="발송된 그림문자 미리보기" style="width: 100%"> | |
| 132 | + </div> | |
| 133 | + </c:forEach> | |
| 134 | + </div> | |
| 135 | + </c:if> | |
| 136 | + <div class="preview_auto"> | |
| 137 | + | |
| 138 | + <c:if test="${resultMsgDetail.adFlag eq 'Y'}"> | |
| 139 | + <p class="ad_tit">(광고)</p> | |
| 140 | + </c:if> | |
| 141 | + <p class="realtime">${fn:replace(resultMsgDetail.bizKakaoResendOrgnlTxt, newLineChar, "<br/>")}</p> | |
| 142 | + | |
| 143 | + <c:if test="${resultMsgDetail.adFlag eq 'Y'}"> | |
| 144 | + <p class="deny_receipt">무료거부 0808800858</p> | |
| 145 | + </c:if> | |
| 146 | + </div> | |
| 147 | + </div> | |
| 148 | + </div> | |
| 149 | + </div> | |
| 150 | + <p class="addText">※ 단말기 설정에 따라 다르게 보일 수 있습니다</p> | |
| 151 | + </div> | |
| 152 | + </c:if> | |
| 153 | + <!--// 문자 미리보기 --> | |
| 154 | +</div> | |
| 155 | + (No newline at end of file) |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?