Merge branch 'master' of http://rosewiper@vcs.iten.co.kr:9999/hylee/mjon_git
@25f6864f0c42f0ad14960277e1e87a310959dd6b
--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java
+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java
... | ... | @@ -753,7 +753,7 @@ |
| 753 | 753 |
if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {
|
| 754 | 754 |
//Slack으로 메세지 전송 처리 |
| 755 | 755 |
MjonCommon comm = new MjonCommon(); |
| 756 |
-// comm.getAdminKakaoAtSandSlack(kakaoVO); |
|
| 756 |
+ comm.getAdminKakaoAtSandSlack(kakaoVO); |
|
| 757 | 757 |
} |
| 758 | 758 |
} |
| 759 | 759 |
|
--- src/main/java/itn/let/mjo/pay/web/MjonKGMPayController.java
+++ src/main/java/itn/let/mjo/pay/web/MjonKGMPayController.java
... | ... | @@ -313,8 +313,42 @@ |
| 313 | 313 |
UserManageVO userManageVO = new UserManageVO(); |
| 314 | 314 |
userManageVO.setSmishingYn("Y");
|
| 315 | 315 |
userManageVO.setMberId(Userid); |
| 316 |
- userManageService.updateOneUserSmishingYn(userManageVO); |
|
| 316 |
+ userManageService.updateOneUserSmishingYnNotAlert(userManageVO); |
|
| 317 | 317 |
} |
| 318 |
+ else {
|
|
| 319 |
+ // 대상 : 휴대폰결제, 즉시이체, 전용계좌 |
|
| 320 |
+ // Step 1. 스미싱의심 지정 여부 |
|
| 321 |
+ JoinSettingVO joinSettingVO = new JoinSettingVO(); |
|
| 322 |
+ joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); |
|
| 323 |
+ if (joinSettingVO != null && joinSettingVO.getSmishingNoti().equals("Y")) {
|
|
| 324 |
+ // Step 1. 개인회원 여부 체크 |
|
| 325 |
+ int isPersnalMemberCnt = egovSiteManagerService.selectPersnalMemberCnt(Userid); |
|
| 326 |
+ if (isPersnalMemberCnt == 1) {
|
|
| 327 |
+ // Step 2. 첫결제 여부 체크 |
|
| 328 |
+ int isFirstPayCnt = egovSiteManagerService.selectFirstPayCnt(Userid); |
|
| 329 |
+ if (isFirstPayCnt == 1) {
|
|
| 330 |
+ // SMS 체크 |
|
| 331 |
+ if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) {
|
|
| 332 |
+ // 스미싱의심 SMS 알림전송 |
|
| 333 |
+ mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱의심/휴대폰 첫결제", Userid, mberNm);
|
|
| 334 |
+ } |
|
| 335 |
+ |
|
| 336 |
+ // SLACK 체크 |
|
| 337 |
+ if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) {
|
|
| 338 |
+ // Slack 메시지 발송(단순본문) |
|
| 339 |
+ String msg = "[문자온] 스미싱의심/휴대폰 첫결제 - " + mberNm +"("+ Userid + ")";
|
|
| 340 |
+ mjonCommon.sendSimpleSlackMsg(msg); |
|
| 341 |
+ } |
|
| 342 |
+ |
|
| 343 |
+ // 스미싱 의심회원으로 변경 |
|
| 344 |
+ UserManageVO userManageVO = new UserManageVO(); |
|
| 345 |
+ userManageVO.setSmishingYn("Y");
|
|
| 346 |
+ userManageVO.setMberId(Userid); |
|
| 347 |
+ userManageService.updateOneUserSmishingYnNotAlert(userManageVO); |
|
| 348 |
+ } |
|
| 349 |
+ } |
|
| 350 |
+ } |
|
| 351 |
+ } |
|
| 318 | 352 |
|
| 319 | 353 |
redirect.addAttribute("Resultcd", Resultcd);
|
| 320 | 354 |
redirect.addAttribute("Tradeid", Tradeid);
|
--- src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
+++ src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
... | ... | @@ -28,7 +28,9 @@ |
| 28 | 28 |
import itn.let.schdlr.service.SchdlrManageService; |
| 29 | 29 |
import itn.let.schdlr.service.SchdlrVO; |
| 30 | 30 |
import itn.let.sym.site.service.EgovSiteManagerService; |
| 31 |
+import itn.let.sym.site.service.JoinSettingVO; |
|
| 31 | 32 |
import itn.let.uss.umt.service.EgovUserManageService; |
| 33 |
+import itn.let.uss.umt.service.UserManageVO; |
|
| 32 | 34 |
import itn.let.utl.user.service.MjonNoticeSendUtil; |
| 33 | 35 |
|
| 34 | 36 |
@Service("SchdlrManageService")
|
... | ... | @@ -362,7 +364,6 @@ |
| 362 | 364 |
//세틀뱅크 입금 내역 원장에 처리 완료 내용 입력해 주기 |
| 363 | 365 |
vacsAhstService.updateVacsAhstCashComplete(temp); |
| 364 | 366 |
|
| 365 |
- /* |
|
| 366 | 367 |
try {
|
| 367 | 368 |
String Userid = temp.getMberId(); |
| 368 | 369 |
String mberNm = ""; |
... | ... | @@ -407,7 +408,7 @@ |
| 407 | 408 |
System.out.println("전용계좌 TrNo : " + temp.getTrNo());
|
| 408 | 409 |
System.out.println("전용계좌 e.getMessage() : " + e.getMessage());
|
| 409 | 410 |
} |
| 410 |
- */ |
|
| 411 |
+ |
|
| 411 | 412 |
|
| 412 | 413 |
} |
| 413 | 414 |
|
--- src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
... | ... | @@ -517,9 +517,14 @@ |
| 517 | 517 |
AND MD.MSG_GROUP_ID = MG.MSG_GROUP_ID |
| 518 | 518 |
AND IFNULL(MG.DEL_FLAG, 'N') = 'N' |
| 519 | 519 |
AND MD.DEL_FLAG = 'N' |
| 520 |
- <!-- JSPark 2023.03.24 알림톡 전송완료 목록은 (즉시 + 예약 발송완료) 노출 --> |
|
| 520 |
+ <!-- JSPark 2023.07.10 알림톡 전송완료 목록은 (즉시 + 예약 발송완료 + 처리안된 지연문자(즉시,예약) 노출 --> |
|
| 521 | 521 |
<![CDATA[ |
| 522 |
- AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE) |
|
| 522 |
+ AND CASE |
|
| 523 |
+ WHEN MG.RESERVE_YN = 'N' |
|
| 524 |
+ THEN (MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)) |
|
| 525 |
+ WHEN MG.RESERVE_YN = 'Y' |
|
| 526 |
+ THEN (MG.REQ_DATE <= NOW() OR (MG.AT_DELAY_YN = 'Y' AND MG.AT_DELAY_COMPLETE_YN = 'N')) |
|
| 527 |
+ END |
|
| 523 | 528 |
]]> |
| 524 | 529 |
<isNotEmpty property="userId"> |
| 525 | 530 |
AND MG.USER_ID = #userId# |
... | ... | @@ -740,9 +745,9 @@ |
| 740 | 745 |
THEN '단문' |
| 741 | 746 |
ELSE '장문' |
| 742 | 747 |
END BIZ_KAKAO_RESEND_TYPE |
| 743 |
- , A.BIZ_KAKAO_RESEND_DATA |
|
| 744 |
- , A.BIZ_KAKAO_JSON_FILE |
|
| 745 |
- , A.BIZ_UMID |
|
| 748 |
+ , A.BIZ_KAKAO_RESEND_DATA |
|
| 749 |
+ , A.BIZ_KAKAO_JSON_FILE |
|
| 750 |
+ , A.BIZ_UMID |
|
| 746 | 751 |
<include refid="KakaoSentDAO.selectJoinQuery"/> |
| 747 | 752 |
<isNotEmpty property="userId"> |
| 748 | 753 |
AND B.USER_ID = #userId# |
... | ... | @@ -762,7 +767,12 @@ |
| 762 | 767 |
AND A.MSG_TYPE IN ('8','9')
|
| 763 | 768 |
</isEmpty> |
| 764 | 769 |
<![CDATA[ |
| 765 |
- AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE) |
|
| 770 |
+ AND CASE |
|
| 771 |
+ WHEN B.RESERVE_YN = 'N' |
|
| 772 |
+ THEN (B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)) |
|
| 773 |
+ WHEN B.RESERVE_YN = 'Y' |
|
| 774 |
+ THEN (B.REQ_DATE <= NOW() OR (B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N')) |
|
| 775 |
+ END |
|
| 766 | 776 |
]]> |
| 767 | 777 |
)M |
| 768 | 778 |
LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI |
--- src/main/webapp/WEB-INF/jsp/agent/MjonMsgAgentStsMultiUpdate.jsp
+++ src/main/webapp/WEB-INF/jsp/agent/MjonMsgAgentStsMultiUpdate.jsp
... | ... | @@ -275,7 +275,7 @@ |
| 275 | 275 |
var confCode = $("#confCode").val();
|
| 276 | 276 |
|
| 277 | 277 |
|
| 278 |
- if (!confirm('문자발송 사용여부는 전송사 비율과 상관없이\n사용자 문자 발송 사용여부가 일괄 적용됩니다.(주의)\n\n수정 하시겠습니까?')){
|
|
| 278 |
+ if (!confirm('문자, 알림톡 사용자화면 발송 사용여부가 변경됩니다.\n긴급 시스템작업시에만 사용해주세요.\n수정 하시겠습니까?')){
|
|
| 279 | 279 |
return false; |
| 280 | 280 |
} |
| 281 | 281 |
|
... | ... | @@ -374,7 +374,7 @@ |
| 374 | 374 |
<br><br /> |
| 375 | 375 |
<div class="listTop maxWth"> |
| 376 | 376 |
<span class="tType4 c_e40000 fwBold"> |
| 377 |
- <p >문자발송 사용여부 - 전송사 비율과 상관없이, 사용자 문자 발송 사용여부 일괄 적용(주의)</p> |
|
| 377 |
+ <p>문자, 알림톡 발송 사용여부 - 문자, 알림톡 사용자화면 발송 사용여부(주의)</p> |
|
| 378 | 378 |
</span> |
| 379 | 379 |
</div> |
| 380 | 380 |
<div class="tableWrap maxWth"> |
... | ... | @@ -386,7 +386,7 @@ |
| 386 | 386 |
<tbody> |
| 387 | 387 |
<tr> |
| 388 | 388 |
<th> |
| 389 |
- 문자발송 사용여부 |
|
| 389 |
+ 문자, 알림톡 발송 사용여부 |
|
| 390 | 390 |
</th> |
| 391 | 391 |
<td> |
| 392 | 392 |
<ec:select codeId="CONF01" name="confCode" id="confCode" css="class='select'" selectedValue="${confVO.confCode}" />
|
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
... | ... | @@ -3689,7 +3689,7 @@ |
| 3689 | 3689 |
<c:otherwise> |
| 3690 | 3690 |
그림문자 |
| 3691 | 3691 |
</c:otherwise> |
| 3692 |
- </c:choose> |
|
| 3692 |
+ </c:choose> |
|
| 3693 | 3693 |
<div class="sms_detail_hover"> |
| 3694 | 3694 |
<c:if test="${not empty fn:split(mjonMsgSentList.atchFiles, '^')[0]}">
|
| 3695 | 3695 |
<img class="MyMsgImg1" src="/cmm/fms/getImage2.do?atchFileId=${fn:split(mjonMsgSentList.atchFiles, '^')[0]}&fileSn=0" style="width: 110px;">
|
... | ... | @@ -3870,9 +3870,9 @@ |
| 3870 | 3870 |
<c:otherwise> |
| 3871 | 3871 |
- |
| 3872 | 3872 |
</c:otherwise> |
| 3873 |
- </c:choose> |
|
| 3873 |
+ </c:choose> |
|
| 3874 | 3874 |
</c:otherwise> |
| 3875 |
- </c:choose> </td> |
|
| 3875 |
+ </c:choose> |
|
| 3876 | 3876 |
</td> |
| 3877 | 3877 |
<td><c:out value="${mjonMsgSentList.callFrom}"/></td>
|
| 3878 | 3878 |
<td class="sms_detail" style="text-align: left;"> |
... | ... | @@ -3885,7 +3885,7 @@ |
| 3885 | 3885 |
<c:otherwise> |
| 3886 | 3886 |
그림문자 |
| 3887 | 3887 |
</c:otherwise> |
| 3888 |
- </c:choose> |
|
| 3888 |
+ </c:choose> |
|
| 3889 | 3889 |
<div class="sms_detail_hover"> |
| 3890 | 3890 |
<c:if test="${not empty fn:split(mjonMsgSentList.atchFiles, '^')[0]}">
|
| 3891 | 3891 |
<img class="MyMsgImg1" src="/cmm/fms/getImage2.do?atchFileId=${fn:split(mjonMsgSentList.atchFiles, '^')[0]}&fileSn=0" style="width: 110px;">
|
... | ... | @@ -4066,24 +4066,16 @@ |
| 4066 | 4066 |
</td> |
| 4067 | 4067 |
<td><c:out value="${mjonMsgDelaySentList.callFrom}"/></td>
|
| 4068 | 4068 |
<td class="sms_detail" style="text-align: left;"> |
| 4069 |
- <%-- |
|
| 4070 |
- <div class="ellipsis_line"> |
|
| 4071 |
- <!-- 그림문자 중 텍스트 내용은 없고 그림 이미지만 있는경우 처리 --> |
|
| 4072 |
- <c:choose> |
|
| 4073 |
- <c:when test="${empty mjonMsgDelaySentList.smsTxt && not empty mjonMsgDelaySentList.filePath1}">
|
|
| 4074 |
- 그림이미지 |
|
| 4075 |
- </c:when> |
|
| 4076 |
- <c:otherwise> |
|
| 4077 |
- <c:out value="${mjonMsgDelaySentList.smsTxt}"/>
|
|
| 4078 |
- </c:otherwise> |
|
| 4079 |
- </c:choose> |
|
| 4080 |
- |
|
| 4081 |
- </div> |
|
| 4082 |
- --%> |
|
| 4083 |
- |
|
| 4084 | 4069 |
<c:choose> |
| 4085 | 4070 |
<c:when test="${empty mjonMsgDelaySentList.smsTxt}">
|
| 4086 |
- 그림문자 |
|
| 4071 |
+ <c:choose> |
|
| 4072 |
+ <c:when test="${mjonMsgDelaySentList.msgType eq '4'}">
|
|
| 4073 |
+ 내용없음 |
|
| 4074 |
+ </c:when> |
|
| 4075 |
+ <c:otherwise> |
|
| 4076 |
+ 그림문자 |
|
| 4077 |
+ </c:otherwise> |
|
| 4078 |
+ </c:choose> |
|
| 4087 | 4079 |
<div class="sms_detail_hover"> |
| 4088 | 4080 |
<c:if test="${not empty fn:split(mjonMsgDelaySentList.atchFiles, '^')[0]}">
|
| 4089 | 4081 |
<img class="MyMsgImg1" src="/cmm/fms/getImage2.do?atchFileId=${fn:split(mjonMsgDelaySentList.atchFiles, '^')[0]}&fileSn=0" style="width: 120px;">
|
... | ... | @@ -5252,7 +5244,7 @@ |
| 5252 | 5244 |
<br> |
| 5253 | 5245 |
작성 : <c:out value="${result.frstRegisterId}"/>(<c:out value="${result.mberNm}"/> <c:out value="${result.ofcpsNm}"/>)
|
| 5254 | 5246 |
<br> |
| 5255 |
- 일시 : <c:out value="${result.frstRegistPnttm}"/>
|
|
| 5247 |
+ 일시 : <c:out value="${result.frstRegistPnttm}"/>
|
|
| 5256 | 5248 |
</li> |
| 5257 | 5249 |
</c:forEach> |
| 5258 | 5250 |
</ul> |
--- src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp
... | ... | @@ -582,7 +582,7 @@ |
| 582 | 582 |
<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
| 583 | 583 |
<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
|
| 584 | 584 |
</td> |
| 585 |
- <td onclick="fn_detail_list('${result.msgGroupId}'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 585 |
+ <td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 586 | 586 |
<c:choose> |
| 587 | 587 |
<c:when test="${result.reserveYn eq 'Y'}">
|
| 588 | 588 |
예약 |
--- src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
+++ src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
... | ... | @@ -498,10 +498,10 @@ |
| 498 | 498 |
</a> |
| 499 | 499 |
</div> |
| 500 | 500 |
</td> |
| 501 |
- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 501 |
+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 502 | 502 |
<c:out value="${result.yellowId}"/>
|
| 503 | 503 |
</td> |
| 504 |
- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 504 |
+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 505 | 505 |
<c:choose> |
| 506 | 506 |
<c:when test="${result.successCount > 0}">
|
| 507 | 507 |
<c:out value="${result.msgGroupCnt}"/>(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
|
... | ... | @@ -550,11 +550,11 @@ |
| 550 | 550 |
</c:otherwise> |
| 551 | 551 |
</c:choose> |
| 552 | 552 |
</td> |
| 553 |
- <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" title="<c:out value="${result.rsltDate}"/>" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 553 |
+ <td onclick="fn_detail_list('<c:out value="${result.msgGroupId}"/>', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" title="<c:out value="${result.rsltDate}"/>" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 554 | 554 |
<fmt:parseDate value="${result.reqDate}" var="reqDateValue" pattern="yyyy-MM-dd HH:mm"/>
|
| 555 | 555 |
<fmt:formatDate value="${reqDateValue}" pattern="MM-dd HH:mm"/>
|
| 556 | 556 |
</td> |
| 557 |
- <td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 557 |
+ <td onclick="fn_detail_list('${result.msgGroupId}', '<c:out value="${result.userId}"/>'); return false;" style="cursor:pointer;" <c:if test="${result.atSmishingYn eq 'Y'}">class="smishing"</c:if>>
|
|
| 558 | 558 |
<c:choose> |
| 559 | 559 |
<c:when test="${result.reserveYn eq 'Y'}">
|
| 560 | 560 |
예약 |
... | ... | @@ -582,10 +582,8 @@ |
| 582 | 582 |
</table> |
| 583 | 583 |
</div> |
| 584 | 584 |
<div class="btnWrap" style="margin-bottom: 15px;"> |
| 585 |
- <!-- |
|
| 586 | 585 |
<input type="button" class="btnType2" style="padding:5px 10px" onclick="fnAtSmishingUpdate('on'); return false;" value="알림톡 스미싱 ON">
|
| 587 | 586 |
<input type="button" class="btnType2" style="padding:5px 10px" onclick="fnAtSmishingUpdate('off'); return false;" value="알림톡 스미싱 OFF">
|
| 588 |
- --> |
|
| 589 | 587 |
</div> |
| 590 | 588 |
|
| 591 | 589 |
<!-- 페이지 네비게이션 시작 --> |
--- src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp
+++ src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp
... | ... | @@ -808,8 +808,8 @@ |
| 808 | 808 |
</div>--%> |
| 809 | 809 |
<div> |
| 810 | 810 |
<p class="tab_tit">충전수단 선택</p> |
| 811 |
- <ul class="area_tab type03"> |
|
| 812 |
- <li class="btn_charge0 btn_tab active"><button type="button" onclick="TabTypePay(this,'0');"><i></i>간편결제</button></li> |
|
| 811 |
+ <ul class="area_tab"> |
|
| 812 |
+ <li class="btn_charge_simple btn_tab active"><button type="button" onclick="TabTypePay(this,'0');"><i></i>간편결제</button></li> |
|
| 813 | 813 |
<li class="btn_charge1 btn_tab"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li> |
| 814 | 814 |
<li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount"><i></i>전용계좌</button></li> |
| 815 | 815 |
<li class="btn_charge5 btn_tab"><button type="button" onclick="TabTypePay(this,'5');"><i></i>즉시이체</button></li> |
--- src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp
... | ... | @@ -167,6 +167,8 @@ |
| 167 | 167 |
alert("팩스 발송에 필요한 회원님의 보유 잔액이 부족 합니다.");
|
| 168 | 168 |
return false; |
| 169 | 169 |
} |
| 170 |
+ |
|
| 171 |
+ return true; |
|
| 170 | 172 |
} |
| 171 | 173 |
|
| 172 | 174 |
|
--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
... | ... | @@ -434,11 +434,38 @@ |
| 434 | 434 |
|
| 435 | 435 |
} |
| 436 | 436 |
|
| 437 |
+function checkConf() {
|
|
| 438 |
+ var confCheck = false; |
|
| 439 |
+ |
|
| 440 |
+ $.ajax({
|
|
| 441 |
+ type: "POST", |
|
| 442 |
+ url: "/web/mjon/conf/selectMjonMsgUseConfAjax.do", |
|
| 443 |
+ data: {},
|
|
| 444 |
+ dataType:'json', |
|
| 445 |
+ async: false, |
|
| 446 |
+ success: function (returnData, status) {
|
|
| 447 |
+ if(returnData.result == "fail") {
|
|
| 448 |
+ console.log(returnData.message); |
|
| 449 |
+ }else if(returnData.result == "success"){
|
|
| 450 |
+ confCheck = true; |
|
| 451 |
+ } |
|
| 452 |
+ } |
|
| 453 |
+ ,error: function (e) {console.log("ERROR : ", e); }
|
|
| 454 |
+ }); |
|
| 455 |
+ |
|
| 456 |
+ return confCheck; |
|
| 457 |
+} |
|
| 458 |
+ |
|
| 437 | 459 |
/* |
| 438 | 460 |
* 등록된 발신 탬플릿 카카오톡 전송 |
| 439 | 461 |
*/ |
| 440 | 462 |
function sendTemplateInfo(){
|
| 441 | 463 |
|
| 464 |
+ if(!checkConf()){ //문자온 conf-check
|
|
| 465 |
+ alert("현재 알림톡 발송하기 기능 점검 중입니다.\n\n1분 후 다시 시도해주세요.");
|
|
| 466 |
+ return false; |
|
| 467 |
+ } |
|
| 468 |
+ |
|
| 442 | 469 |
if(!usrDeptChk()){
|
| 443 | 470 |
return false; |
| 444 | 471 |
} |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp
... | ... | @@ -6,6 +6,10 @@ |
| 6 | 6 |
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> |
| 7 | 7 |
<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> |
| 8 | 8 |
|
| 9 |
+<style> |
|
| 10 |
+ .charg_cont .area_tab li{ width: calc((100% - 80px)/5);}
|
|
| 11 |
+</style> |
|
| 12 |
+ |
|
| 9 | 13 |
<!-- KG 모빌리언스 --> |
| 10 | 14 |
<script src="https://mup.mobilians.co.kr/js/ext/ext_inc_comm.js"></script> |
| 11 | 15 |
<script type="text/javascript" src="<c:url value='/js/MJUtill.js'/>"></script> |
... | ... | @@ -639,7 +643,7 @@ |
| 639 | 643 |
<div> |
| 640 | 644 |
<p class="tab_tit">충전수단 선택</p> |
| 641 | 645 |
<ul class="area_tab"> |
| 642 |
- <li class="btn_charge0 btn_tab active"><button type="button" onclick="TabTypePay(this,'0');"><i></i>간편결제</button></li> |
|
| 646 |
+ <li class="btn_charge_simple btn_tab active"><button type="button" onclick="TabTypePay(this,'0');"><i></i>간편결제</button></li> |
|
| 643 | 647 |
<li class="btn_charge1 btn_tab"><button type="button" onclick="TabTypePay(this,'1');"><i></i>신용카드</button></li> |
| 644 | 648 |
<li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'2');" id="btnDdedicatedAccount"><i></i>전용계좌</button></li> |
| 645 | 649 |
<!-- <li class="btn_charge2 btn_tab"><button type="button" onclick="TabTypePay(this,'3');"><i></i>무통장입금</button></li> --> |
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?