diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index b923ab59..e63b1580 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -1837,6 +1837,10 @@ public class MjonPayController { } model.addAttribute("tabType", tabType); + MberGrdVO mberGrdVO = new MberGrdVO(); + List mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO); + model.addAttribute("mberGrdSettingList", mberGrdSettingList); + return "/web/pay/PayView"; } diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp index 5831cc10..5c5f71ab 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectMsgDataListPop.jsp @@ -670,7 +670,7 @@ function fn_updateSendRealTime(userId, msgGroupId){ - [이용정지]
+ [발송취소]
diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index 613195f1..ed73997d 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -3815,7 +3815,7 @@ function kakaoATDelayCancel(msgGroupId){ - [이용정지]
+ [발송취소]
@@ -4022,7 +4022,7 @@ function kakaoATDelayCancel(msgGroupId){ - [이용정지]
+ [발송취소]
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp index 4c74f4cc..cc5d5adc 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/EgovGnrlselectedUserKakaoATDataListAjax.jsp @@ -594,7 +594,7 @@ function msgDetailClose(obj){ - [이용정지]
+ [발송취소]
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp index 76e2033c..7855cc2f 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp @@ -554,7 +554,7 @@ function fnSmishingUpdate(flag) { - 오프[이용정지] + 오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp index c727f5b8..9dd1fc07 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp @@ -565,7 +565,7 @@ function fnAtSmishingUpdate(flag) { - 오프[이용정지] + 오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp index 4b22d4e2..8d760bd9 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoft/SendKakaoFTList.jsp @@ -546,7 +546,7 @@ function fnSmishingUpdate(flag) { - 오프[이용정지] + 오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index afcdf480..b423c9a5 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -550,7 +550,7 @@ function fnSmishingUpdate(flag) { - 오프[이용정지] + 오프[발송취소] "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp index 5bb4c75a..f3237c58 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/pdfView.jsp @@ -52,6 +52,12 @@ input[type="checkbox"] { position: relative; vertical-align: middle; } +input[type="text"] { + padding: 0 7px 0 7px; + min-width: 70px; + width: 90px; +} + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp index 3d6cf07a..776b1d14 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -30,10 +30,10 @@ $(document).ready(function(){ } //등급제 시행 ON/OFF 체크 - //getMberSettingDetail(); + getMberSettingDetail(); // 등급제 대상 여부 - //getMberGrdChk(); + getMberGrdChk(); }); diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp index 9fd02da2..46d7af54 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -18,7 +18,7 @@ $(document).ready(function(){ payUserListAjax(1); // 등급제 대상 여부 - //getMberGrdChk(); + getMberGrdChk(); var date = new Date() ; //이전달 첫날/마지막날 조회