tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into 4891_발송결과_속도개선

Browse Source
This commit is contained in:
hehihoho3@gmail.com 2025-02-05 10:42:08 +09:00
commit 4b35490d13
7 changed files with 37 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/itn/let/mjo/event/web/MjonEventController.java
View File

@ -201,7 +201,7 @@ public class MjonEventController {
//System.out.println(payCnt);
//System.out.println(payCnt);
if (payCnt>=0) {
if (payCnt > 0) {
modelAndView.addObject("message", "첫 결제 회원만 이벤트 신청이 가능합니다.");
modelAndView.addObject("resultSts", "statusAlreadyPayedFail");
return modelAndView;

5
src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgDayChart_230125.jsp
View File

@ -219,7 +219,7 @@ function fnSetCalMonth(val) {
<fmt:formatNumber value="${result.sendCount}" pattern="#,###" />
</td>
<td class="api">
<fmt:formatNumber value="${result.aSendCount}" pattern="#,###" />
<fmt:formatNumber value="${result.ASendCount}" pattern="#,###" />
</td>
<td class="all">
@ -229,7 +229,8 @@ function fnSetCalMonth(val) {
<fmt:formatNumber value="${result.successCount}" pattern="#,###" />
</td>
<td class="api">
<fmt:formatNumber value="${result.aSuccessCount}" pattern="#,###" />
<fmt:formatNumber value="${result.ASuccessCount}" pattern="#,###" />
</td>
<td class="all">

4
src/main/webapp/WEB-INF/jsp/uss/ion/msg/MsgMonthChart_230125.jsp
View File

@ -150,7 +150,7 @@ function linkPage(){
<fmt:formatNumber value="${result.sendCount}" pattern="#,###" />
</td>
<td class="api">
<fmt:formatNumber value="${result.aSendCount}" pattern="#,###" />
<fmt:formatNumber value="${result.ASendCount}" pattern="#,###" />
</td>
<td class="all">
@ -160,7 +160,7 @@ function linkPage(){
<fmt:formatNumber value="${result.successCount}" pattern="#,###" />
</td>
<td class="api">
<fmt:formatNumber value="${result.aSuccessCount}" pattern="#,###" />
<fmt:formatNumber value="${result.ASuccessCount}" pattern="#,###" />
</td>
<td class="all">

2
src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayView.jsp
View File

@ -352,7 +352,7 @@ function pgOpenerPopup(){
// 결제창 호출
if ($currentTab==0) {
// 나이스페이 => CARD(카드결제)
pg_opener = window.open('', 'pg_opener', "width=790, height=505, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no");
pg_opener = window.open('', 'pg_opener', "width=545, height=830, left="+popupX+", top="+popupY, "location = no","status= no","toolbars= no");
document.pgForm.method = "post";
document.pgForm.target = "pg_opener" ;

2
src/main/webapp/publish/css/content.css
View File

@ -2388,7 +2388,7 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
.send_top .resultcont_left .table_bottom_txt{padding:18px 0 0 0;font-size:14px; font-weight:500;}
.tb_wrap1{height:264px; overflow-y: auto; position:relative; border:1px solid #ccc; border-radius:5px;}
.tb_wrap1{height:302px; overflow-y: auto; position:relative; border:1px solid #ccc; border-radius:5px;}
.tb_wrap1 table.type4 th{position: sticky; top:0; z-index: 1; background-color:#ededed;}

7
src/main/webapp/publish/css/popupLayer.css
View File

@ -1211,10 +1211,15 @@
/* 발송화면 개선 : 발송대상 리스트 팝업*/
.layer_in .popup_search_type1 { background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 10px 0 20px 0;}
.layer_in .popup_search_type1 .selType2.select_btn {width:166px;}
.layer_in .popup_search_type1 input.send_text {width:265px; border:solid 1px #ccc; height:36px; }
.layer_in .popup_search_type1 input.send_text {width:265px; border:solid 1px #ccc; height:36px;}
.layer_in .popup_search_type1 button { width:63px;}
.layer_in .gorup_join_cont .input_right.type1 {padding:0 0 0 30px; font-size:17px; font-weight:300;}
.layer_in .popup_search_type2 { background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 0 0 20px 0; display:flex; align-items:center;}
.layer_in .popup_search_type2 .title {margin:0 20px 0 10px;}
.layer_in .popup_search_type2 input.send_text {width:265px; border:solid 1px #ccc; height:36px;}
.layer_in .popup_search_type2 button { width:63px;}
/* 주소록 대량등록 */
.file_upload_wrap{position:relative;display:flex;justify-content:space-between;align-items:center;}
.file_upload_wrap .file_add.upload_area{display:flex;width:78%;margin:0;align-items:center;justify-content:center;}

78
src/main/webapp/publish/textingmsg_2025_detail.html
View File

@ -250,23 +250,12 @@
<button type="button" class="tooltip-close" data-focus="rev_popup04-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
</div>
<div class="layer_in">
<div class="gorup_join_cont" style="margin:-15px 0 0 0;">
<div class="group_input">
<div class="input_left">발신번호</div>
<div class="input_right type1">010-2222-7777</div>
</div>
</div>
<div class="popup_search_type1">
<label for="" class="label">검색종류 선택</label>
<select id="" class="selType1 select_btn">
<option value="1">수신번호</option>
<option value="2">상세결과</option>
</select>
<div class="popup_search_type2">
<div class="title">수신번호</div>
<label for="" class="label">검색어입력</label>
<input type="text" class="send_text" id="" name="" value="" placeholder="3자 이상 입력하세요." onfocus="this.placeholder=''" onblur="this.placeholder='3자 이상 입력하세요.'">
<button type="button" class="btnType btnType2" style="width:63px; margin:0;">검색</button>
<button type="button" class="btnType btnType2" style="width:63px; margin:0 0 0 5px;">검색</button>
</div>
<div class="list_tab_wrap2 type4">
@ -283,8 +272,8 @@
<div class="tb_wrap1">
<table class="tType4">
<colgroup>
<col style="width: 52%;">
<col style="width: 48%;">
<col style="width: 240px;">
<col style="width: auto;">
</colgroup>
<thead>
<tr>
@ -358,8 +347,8 @@
<div class="tb_wrap1">
<table class="tType4">
<colgroup>
<col style="width: 55%;">
<col style="width: 45%;">
<col style="width: 240px;">
<col style="width: auto;">
</colgroup>
<thead>
<tr>
@ -377,25 +366,8 @@
</thead>
<tbody>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
</tr>
<td colspan="2">내역이 없습니다.</td>
</tr>
</tbody>
</table>
@ -415,8 +387,8 @@
<div class="tb_wrap1">
<table class="tType4">
<colgroup>
<col style="width: 55%;">
<col style="width: 45%;">
<col style="width: 240px;">
<col style="width: auto;">
</colgroup>
<thead>
<tr>
@ -490,8 +462,8 @@
<div class="tb_wrap1">
<table class="tType4">
<colgroup>
<col style="width: 55%;">
<col style="width: 45%;">
<col style="width: 240px;">
<col style="width: auto;">
</colgroup>
<thead>
<tr>
@ -510,39 +482,39 @@
<tbody>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
<tr>
<td>010-1234-5678</td>
<td>성공</td>
<td>실패</td>
</tr>
</tbody>
@ -561,10 +533,6 @@
<!--// 실패 내용 -->
</div>
<!--
<div class="popup_btn_wrap2" style="margin: -40px auto 30px auto;">
<button type="button" class="tooltip-close" data-focus="adr_popup01-close" data-focus-next="popup02">닫기</button>
</div> -->
</div>
</div>