Merge branch 'master' into 알림톡api

src/main/java/itn/com/cmm/interceptor/IPIgnoreInterceptorHandler.java

@@ -61,6 +61,7 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
 					v_ret	=	false;
 				}	
 				
+				// lettnloginlog 테이블에 insert 패턴 추가 (/web/user/login/usrIdCheckAjax.do) 
 			}else if(request.getRequestURI().indexOf("ListAjax.do")>-1
 					|| request.getRequestURI().indexOf("ViewAjax.do")>-1
 					|| request.getRequestURI().indexOf("DataAjax.do")>-1
@@ -74,6 +75,7 @@ public class IPIgnoreInterceptorHandler extends HandlerInterceptorAdapter{
 					|| request.getRequestURI().indexOf("MapUrl")>-1
 					|| request.getRequestURI().indexOf("uss/ion/fms/FmsFileInsertAjax")>-1
 					|| request.getRequestURI().indexOf("web/mjon/addr/sendExelFilePhoneNumAjax")>-1
+					|| request.getRequestURI().indexOf("/web/user/login/usrIdCheckAjax.do")>-1
 					
 					
 					

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

@@ -1892,7 +1892,8 @@ public class KakaoSendUtil {
 		Float totPrice = eachPrice * instCnt;
 		sendVO.setTotPrice(String.format("%.1f", totPrice));
 		
-		sendVO.setAtDelayYn(kakaoVO.getAtDelayYn()); 
+//		sendVO.setAtDelayYn(kakaoVO.getAtDelayYn()); 
+		sendVO.setAtDelayYn(kakaoVO.getAtSmishingYn()); 
 		sendVO.setBizKakaoResendOrgnlTxt(kakaoVO.getSubMsgTxt());
 		sendVO.setBizKakaoResendType(sendVO.getSubMsgType());
 		sendVO.setBizKakaoImageType(kakaoVO.getImageType());

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

@@ -990,6 +990,8 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
 
 				KakaoSendAdvcVO sendVO = groupedMsgList.get(0);
 
+//				log.info(" ++ kakaoVO.getAtSmishingYn() :: [{}]", kakaoVO.getAtSmishingYn());
+//				log.info(" ++ kakaoVO.getAtDelayYn() :: [{}]", kakaoVO.getAtDelayYn());
 /** @groupData 테이블 insert */
 				kakaoSendUtil.insertKakaoGroupDataTb_advc(instCnt, kakaoVO, sendVO);
 

src/main/webapp/WEB-INF/jsp/web/pay/MsgPrintUsageDetailsPopUp.jsp

@@ -196,10 +196,6 @@ function f_print(){
 	                            					<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.ftSendCount}" var="ftSendCount" />
 													<c:out value="${ftSendCount}"/>
 			                            		</td>
-			                            		<td>
-			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.supplyPrice}" var="supplyPrice" />
-													<c:out value="${supplyPrice}"/>		                            		
-		                            			</td>
 			                            		<td>
 			                            			<fmt:formatNumber type="number" maxFractionDigits="3" value="${resultFax.totalPrice}" var="totalPrice" />
 													<c:out value="${totalPrice}"/>

src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp

@@ -545,6 +545,37 @@ function getMberGrdChk() {
 						</table>
 						<span class="reqTxt4">* 텍스트 용량(Byte)에 대한 안내 : 한글2Byte, 영문·숫자 1Byte를 차지.</span>
 						
+						<p class="tType1_title"><img src="/publish/images/content/icon_fee2.png" alt="알림톡 아이콘 이미지"> 친구톡</p>
+						<table class="tType2">
+							<colgroup>
+								<col style="width: 20%;">
+								<col style="width: 60%;">
+								<col style="width: 20%;">
+							</colgroup>
+							<thead>
+								<tr>
+									<th>구분</th>
+									<th>특징</th>
+									<th>가격</th>
+								</tr>
+							</thead>
+							<tbody>
+								<tr>
+									<th>친구톡(텍스트)</th>
+									<td rowspan="3">카카오톡을 통해 채널 친구 대상으로 발송이 가능한 광고성 메시지<br />(1,000자 이하의 텍스트 및 이미지 발송 가능)</td>
+									<td><span>13.8</span>원</td>
+								</tr>
+								<tr>
+									<th>친구톡(이미지)</th>
+									<td><span>19.9</span>원</td>
+								</tr>
+								<tr>
+									<th>친구톡(와이드 이미지)</th>
+									<td><span>22.9</span>원</td>
+								</tr>
+							</tbody>
+						</table>
+							
 						<p class="tType1_title"><img src="/publish/images/content/icon_fee_fax.png" alt="팩스 아이콘 이미지"> 팩스</p>
 						<table class="tType2">
 							<colgroup>

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

@@ -90,9 +90,10 @@ function payUserListAjax(pageNo){
 		return;
 	};
 	
-	if(!fn_G_limitDateChk("startDate", 3)){
+	/* 검색 기간 3개월 제한 처리 */
+	/* if(!fn_G_limitDateChk("startDate", 3)){
 		return;
-	};
+	}; */
 	
 	document.listForm.pageIndex.value = pageNo;
 	var sendData= $(document.listForm).serializeArray();