Commit @ed83ac15db8c5cdc05ac594db37ec3065ca12c83

feb9d37

ed83ac1

src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java

--- src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java

+++ src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java


 			
 		}
 		
-		System.out.println("++++++++++++++ tmpContents ::: "+tmpContents);
-		
 		model.addAttribute("kakaoVO", kakaoVO);
 		
 		return "web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataTestPop";

feb9d37

ed83ac1

src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java

--- src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java

+++ src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java


 	//카카오 환불 처리 리스트
 	public void kakaoFailPayBack() throws Exception {
 		
+		//카카오 알림톡 환불 처리
 		kakaoAlimTalkService.selectKakaoAtSentRefundList();
 		
+		//카카오 친구톡 환불 처리
+		kakaoAlimTalkService.selectKakaoFtSentRefundList();
+		
 	}
 	
 }

feb9d37

ed83ac1

src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp


 }
 
 
+function msgResultLink(){
+	var reserYn = $("input[name=reserYn]:checked").val(); // 예약 발송 여부 확인
+	if(reserYn == 'Y'){
+		
+		location.href="/web/mjon/reservmsg/selectReservKaKaoView.do";
+		
+	}else{
+		location.href="/web/kakao/sent/selectKakaoSentView.do";
+	}
+}
+
 </script>
 
 <!-- 로딩바 -->

 									<th>광고포함 여부</th>
 									<td>
 										<input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" <c:if test="${resultTemplateVO.adFlag eq 'Y'}">checked</c:if> ><label for="ad_Y">광고성 정보 포함</label>
-										<input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label>
+										<%-- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label> --%>
 									</td>
 								</tr>
 								<tr>

feb9d37

ed83ac1

src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp


 	                            <tr>
 	                                <th>광고포함 여부</th>
 	                                <td>
-	                                    <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" <c:if test="${resultTemplateVO.adFlag eq 'Y'}">checked</c:if> ><label for="ad_Y">광고성 정보
-	                                        포함</label>
-	                                    <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label>
+	                                    <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" <c:if test="${resultTemplateVO.adFlag eq 'Y'}">checked</c:if> ><label for="ad_Y">광고성 정보 포함</label>
+	                                    <%-- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label> --%>
 	                                </td>
 	                            </tr>
 	                            <tr>

feb9d37

ed83ac1

src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp


 	                            <tr>
 	                                <th>광고포함 여부</th>
 	                                <td>
-	                                    <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" checked><label for="ad_Y">광고성 정보
-	                                        포함</label>
-	                                    <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N"><label for="ad_N">포함 안함</label>
+	                                    <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" checked><label for="ad_Y">광고성 정보  포함</label>
+	                                    <!-- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N"><label for="ad_N">포함 안함</label> -->
 	                                </td>
 	                            </tr>
 	                            <tr>

...	...	@@ -705,8 +705,6 @@
705	705
706	706	}
707	707
708		- System.out.println("++++++++++++++ tmpContents ::: "+tmpContents);
709		-
710	708	model.addAttribute("kakaoVO", kakaoVO);
711	709
712	710	return "web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataTestPop";

...	...	@@ -420,8 +420,12 @@
420	420	//카카오 환불 처리 리스트
421	421	public void kakaoFailPayBack() throws Exception {
422	422
	423	+ //카카오 알림톡 환불 처리
423	424	kakaoAlimTalkService.selectKakaoAtSentRefundList();
424	425
	426	+ //카카오 친구톡 환불 처리
	427	+ kakaoAlimTalkService.selectKakaoFtSentRefundList();
	428	+
425	429	}
426	430
427	431	}

...	...	@@ -1674,6 +1674,17 @@
1674	1674	}
1675	1675
1676	1676
	1677	+function msgResultLink(){
	1678	+ var reserYn = $("input[name=reserYn]:checked").val(); // 예약 발송 여부 확인
	1679	+ if(reserYn == 'Y'){
	1680	+
	1681	+ location.href="/web/mjon/reservmsg/selectReservKaKaoView.do";
	1682	+
	1683	+ }else{
	1684	+ location.href="/web/kakao/sent/selectKakaoSentView.do";
	1685	+ }
	1686	+}
	1687	+
1677	1688	</script>
1678	1689
1679	1690	<!-- 로딩바 -->
...	...	@@ -1831,7 +1842,7 @@
1831	1842	<th>광고포함 여부</th>
1832	1843	<td>
1833	1844	<input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" <c:if test="${resultTemplateVO.adFlag eq 'Y'}">checked</c:if> ><label for="ad_Y">광고성 정보 포함</label>
1834		- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label>
	1845	+ <%-- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label> --%>
1835	1846	</td>
1836	1847	</tr>
1837	1848	<tr>

...	...	@@ -720,9 +720,8 @@
720	720	<tr>
721	721	<th>광고포함 여부</th>
722	722	<td>
723		- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" <c:if test="${resultTemplateVO.adFlag eq 'Y'}">checked</c:if> ><label for="ad_Y">광고성 정보
724		- 포함</label>
725		- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label>
	723	+ <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" <c:if test="${resultTemplateVO.adFlag eq 'Y'}">checked</c:if> ><label for="ad_Y">광고성 정보 포함</label>
	724	+ <%-- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N" <c:if test="${resultTemplateVO.adFlag eq 'N'}">checked</c:if> ><label for="ad_N">포함 안함</label> --%>
726	725	</td>
727	726	</tr>
728	727	<tr>

...	...	@@ -665,9 +665,8 @@
665	665	<tr>
666	666	<th>광고포함 여부</th>
667	667	<td>
668		- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" checked><label for="ad_Y">광고성 정보
669		- 포함</label>
670		- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N"><label for="ad_N">포함 안함</label>
	668	+ <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_Y" value="Y" checked><label for="ad_Y">광고성 정보 포함</label>
	669	+ <!-- <input type="radio" class="inputAdFlag" name="ad_flag" id="ad_N" value="N"><label for="ad_N">포함 안함</label> -->
671	670	</td>
672	671	</tr>
673	672	<tr>

Delete comment