From 3f40c8405dd1d9e69aef9f4e2b320d01aef6077e Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Fri, 19 Jan 2024 10:26:46 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=B9=9C?=
 =?UTF-8?q?=EA=B5=AC=ED=86=A1=20=EB=B0=9C=EC=86=A1=20=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=EB=90=9C=20=EB=B2=84=ED=8A=BC=20=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=EC=8B=9C=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20?=
 =?UTF-8?q?=EC=B9=9C=EA=B5=AC=ED=86=A1=20=EB=82=B4=EC=9A=A9=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=EC=8B=9C=20=EB=8C=80=EC=B2=B4=EB=AC=B8=EC=9E=90=20?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=EB=8F=84=20=ED=95=A8=EA=BB=98=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgdata/ft/KakaoFriendsTalkMsgDataView.jsp     | 14 ++++++++------
 src/main/webapp/js/kakao/templateComm.js           |  3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
index 69850ec3..1a848ef5 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
@@ -170,7 +170,7 @@ function initFormChk(){
 	$('.side_info_text').hide();		//부가정보 내용
 	$('.channel_info_text').hide();		//채널추가 텍스트 내용
 	$('.btnAd').hide();					//샘플 채널추가 버튼
-	$('.btnEmpty').hide();				//샘플 버튼
+	//$('.btnEmpty').hide();				//샘플 버튼
 	
 	//채널ID 정보 미리보기에 표시해주기
 	fnAgentCodeChg();
@@ -1189,12 +1189,14 @@ function fn_sendMsgData(){
 				
 				if("fail" == returnData.result){
 					alert(returnData.message);
+					spamChk = false;
 					return false;
 				}else if("loginFail" == returnData.result){
 					alert(returnData.message);
+					spamChk = false;
 					return false;
 				}else if("spams" == returnData.result){
-					alert("전송 내용에  스팸문구가 포함되어 있습니다.")
+					//alert("전송 내용에  스팸문구가 포함되어 있습니다.")
 					$("#spamStatus").val("Y");
 					return false;
 				}else{
@@ -1469,7 +1471,7 @@ function msgSuccessClose(obj){
 				<input type="hidden" id="templateImageUrl" name="templateImageUrl" value="<c:out value='${resultTemplateVO.templateImageUrl}'/>">
 				<input type="hidden" id="tmpFriendId" name="friendId" value="<c:out value='${resultTemplateVO.friendId}'/>">
 				<input type="hidden" id="templateName" name="templateName" value=""/>
-				<input type="hidden" id="adFlag" name="adFlag" value=""/>
+				<input type="hidden" id="adFlag" name="adFlag" value="N"/>
 				<input type="hidden" id="templateContent" name="templateContent" value=""/>
 				
 				<!-- 예약발송 여부 -->
@@ -1501,8 +1503,8 @@ function msgSuccessClose(obj){
 				
 				<!-- 친구톡 발송 단가 정보 -->
 				<input type="hidden" id="kakaoFtPrice" name="kakaoFtPrice" value="<c:out value='${sendPrice.kakaoFtPrice}' />"/>
-				<input type="hidden" id="eachPrice" name="eachPrice" value=""/>
-				<input type="hidden" id="totPrice" name="totalPrice" value=""/>
+				<input type="hidden" id="eachPrice" name="eachPrice" value="0"/>
+				<input type="hidden" id="totPrice" name="totalPrice" value="0"/>
 				
 				<!-- 친구톡 발송 json 파일 필요 유무 -->
 				<input type="hidden" id="bizJsonYn" name="bizJsonYn" value="N"/>
@@ -2074,7 +2076,7 @@ function msgSuccessClose(obj){
 										<p class="template_text">내용 미리보기</p>
 										<div class="btnViewArea">
 											<c:forEach var="buttonList" items="${resultTemplateVO.buttonVOList}" varStatus="status">
-	                                    		<button type="button" class="btn_kakao_type"  style="display:block;"><c:out value="${buttonList.name}"/></button>
+	                                    		<button type="button" class="btn_kakao_type btnEmpty"  style="display:block;"><c:out value="${buttonList.name}"/></button>
 	                                    	</c:forEach>
 										</div>
 									</div>
diff --git a/src/main/webapp/js/kakao/templateComm.js b/src/main/webapp/js/kakao/templateComm.js
index 793eb7bb..a327838e 100644
--- a/src/main/webapp/js/kakao/templateComm.js
+++ b/src/main/webapp/js/kakao/templateComm.js
@@ -88,6 +88,9 @@ function setContentsLengForFriends(contents){
 	$('.template_text').show();
 	if(repContent != ''){
 		$('.template_text').html(repContent);
+		$('#smsTxtArea').val(
+				$('.template_text').html().trim().replace(/(<br>|<br\/>|<br \/>)/g, '\r\n')
+			);
 	}else{
 		$('.template_text').html("내용 미리보기");
 	}