From 5639c5e910cfa1772bba86fd984bbdb25713148c Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Wed, 6 Aug 2025 09:50:59 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=EB=8C=80=EC=B2=B4=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=EB=B3=84=20=ED=99=94=EB=A9=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ft/KakaoFriendsTalkMsgDataView.jsp | 53 +++++++++++++++++-- 1 file changed, 50 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp index aad8d05d..16b0ae09 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp @@ -166,6 +166,7 @@ $(document).ready(function (){ $('#sendFailImg').hide(); $('#sendFailImgSrc').attr('src', ''); $('#atchFileId').val(''); + thisFnByteString($('#smsTxtArea').val()); } @@ -180,6 +181,19 @@ $(document).ready(function (){ //자주보내는 번호 resultBookMarkMsgList(); + + + + // 대체문자 초기화 + $('#failCheckInit').on('click', function(){ + console.log('::failCheckInit::'); + $('#smsTxtArea').val(''); + thisFnByteString(''); + + }); + + + }); function imageInit(){ @@ -649,6 +663,11 @@ function getTemplateImagUrl(){ // 대체문자 $('#sendFailImg').show(); $('#sendFailImgSrc').attr('src', returnData.object.imgUrl); + // 대체문자 포토형으로 수정 +// $('.put_left').removeClass("short"); //내용 입력 박스 클래스 삭제 +// $('.put_left').removeClass("long"); //내용 입력 박스 클래스 삭제 +// $('.put_left').addClass('photo'); + setSendFailTemplate('P') } } else { @@ -679,6 +698,25 @@ function getTemplateImagUrl(){ $("#imgFile").val(""); } +function setSendFailTemplate(p_type){ + if(p_type == 'P'){ + // 대체문자 포토형으로 수정 + $('.put_left').removeClass("short"); //내용 입력 박스 클래스 삭제 + $('.put_left').removeClass("long"); //내용 입력 박스 클래스 삭제 + $('.put_left').addClass('photo'); + + $('.msg_com').removeClass("msg_short"); //단문 클래스 삭제하고 + $('.msg_com').removeClass("msg_long"); //단문 클래스 삭제하고 + $('.msg_com').addClass("msg_photo"); //단문 클래스 삭제하고 + + + $('#limitLeng').html("2000"); + $('.msg_com').html("그림"); + + } + +} + function fnImageDel(){ if(confirm("등록된 이미지를 삭제하시겠습니까?")){ @@ -1447,31 +1485,40 @@ function thisFnByteString(contents){ //문자 길이 변수에 저장해주기 // $('#smsLen').val(conLeng); + var imgType = $('#sendFailImgSrc').attr('src'); - if(conLeng > 90){ + + if(imgType != null && "" != imgType){ + + setSendFailTemplate('P') + } + else if(conLeng > 90){ - $('#msgLeng').html(conLeng + " / "); $('#limitLeng').html("2000"); $('.msg_com').html("장문"); $('#msgType').val("6"); // 메세지 타입 설정 $('.msg_com').removeClass("msg_short"); //단문 클래스 삭제하고 $('.put_left').removeClass("short"); //내용 입력 박스 클래스 삭제 + $('.put_left').removeClass("photo"); //내용 입력 박스 클래스 삭제 $('.msg_com').addClass("msg_long"); // 장문 클래스 삽입 $("#subMsgType").val("LMS"); }else{ - $('#msgLeng').html(conLeng + " / "); $('#limitLeng').html("90"); $('.msg_com').html("단문"); $('#msgType').val("4"); // 메세지 타입 설정 + $('.msg_com').removeClass("msg_long"); //단문 클래스 삭제하고 $('.put_left').removeClass("long"); //내용 입력 박스 클래스 삭제 + $('.put_left').removeClass("photo"); //내용 입력 박스 클래스 삭제 $('.msg_com').addClass("msg_short"); // 장문 클래스 삽입 $("#subMsgType").val("SMS"); } + + $('#msgLeng').html(conLeng + " / "); totalFtPriceSum(tableL.getRows().length); } From 8c3e518410a5fce52d50be333811fbca2b89d16a Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 7 Aug 2025 12:11:23 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=ED=86=A1=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=EB=AA=85=20=EC=88=9C=EC=B0=A8=EC=A0=81=EC=9A=A9=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ft/KakaoFriendsTalkMsgDataView.jsp | 25 +++++++++---------- src/main/webapp/publish/js/content.js | 4 +-- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp index 16b0ae09..12a4454b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp @@ -65,21 +65,20 @@ $(document).ready(function (){ }); - //웹링크 버튼명 +// 웹링크 버튼명 변경 시 미리보기에도 적용 (여러 개일 때 정확하게) $(document).on('keyup', '#btnNmWeb', function(){ - var inputTxt = $(this).val(); - if(!inputTxt){ - inputTxt = '웹링크'; - } - $('#btnViewWL').text(inputTxt); + var inputTxt = $(this).val() || '웹링크'; + // 웹링크용 인풋만 골라서 현재 인덱스를 구함 + var $webNmInputs = $('input#btnNmWeb'); + var idx = $webNmInputs.index(this); + // 미리보기 영역의 웹링크 버튼들 중, 동일한 인덱스의 버튼 텍스트를 바꿔줌 + $('.btnViewArea .btn_kakao_type.btnEmpty[id^=btnViewWL]').eq(idx).text(inputTxt); }); - //앱링크 버튼명 $(document).on('keyup', '#btnNmApp', function(){ - var inputTxt = $(this).val(); - if(!inputTxt){ - inputTxt = '앱링크'; - } - $('#btnViewAL').text(inputTxt); + var inputTxt = $(this).val() || '앱링크'; + var $appNmInputs = $('input#btnNmApp'); + var idx = $appNmInputs.index(this); + $('.btnViewArea .btn_kakao_type.btnEmpty[id^=btnViewAL]').eq(idx).text(inputTxt); }); $(".friend_talk_wrap #ad_Y").click(function () { @@ -1685,7 +1684,7 @@ function updateButtons(){
-

친구톡 전송

+

친구톡 전송

diff --git a/src/main/webapp/publish/js/content.js b/src/main/webapp/publish/js/content.js index ca6804ea..6062e5d0 100644 --- a/src/main/webapp/publish/js/content.js +++ b/src/main/webapp/publish/js/content.js @@ -1699,8 +1699,8 @@ function friendTemplateButtonAdd() { +'
'; buttonView = ''; } else {} - $(".button_add_wrap").prepend(buttonText); - $(".btnViewArea").prepend(buttonView); + $(".button_add_wrap").append(buttonText); + $(".btnViewArea").append(buttonView); } //관리자 카카오톡 알림톡 샘플 템플릿 등록 - 버튼 추가 From acd01e5651b5de72ed65f78cc87f7a417b767463 Mon Sep 17 00:00:00 2001 From: ijunho Date: Thu, 7 Aug 2025 12:32:45 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=ED=86=A1=20>=20=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=EA=B2=B0=EA=B3=BC=20=EC=83=81=EC=84=B8=20=20=20-=20?= =?UTF-8?q?=EC=B9=9C=EA=B5=AC=ED=86=A1=20=EB=B0=9C=EC=86=A1=EC=9A=94?= =?UTF-8?q?=EA=B8=88=EC=9D=B4=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=99=80=20?= =?UTF-8?q?=EC=83=81=EC=9D=B4=ED=95=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=20=20-=20=EB=8C=80=EC=B2=B4=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=EB=B0=9C=EC=86=A1=EC=9A=94=EA=B8=88=EC=9D=B4=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=99=80=20=EC=83=81=EC=9D=B4=ED=95=9C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml index 7d65c091..c5119e08 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml @@ -1820,8 +1820,19 @@ , a.failCount , a.kakaoResendSuccCount , a.kakaoResendFailCount - , a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice - , (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice + + ,case + when a.msgType = '8' then a.successCount * bkp.BIZ_KAKAO_AT_PRICE + when a.msgType = '9' and a.bizKakaoImageType = 'I' then a.successCount * bkp.BIZ_KAKAO_FT_IMG_PRICE + when a.msgType = '9' and a.bizKakaoImageType = 'W' then a.successCount * bkp.BIZ_KAKAO_FT_WIDE_IMG_PRICE + when a.msgType = '9' and a.bizKakaoImageType != 'I' and a.bizKakaoImageType != 'W' then a.successCount * bkp.BIZ_KAKAO_FT_PRICE + end successPrice + + ,case + when a.msgType = '8' then (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) + when a.msgType = '9' and (a.bizKakaoImageType = 'I' or a.bizKakaoImageType = 'W') then a.mmsCnt * bkp.BIZ_PICTURE_PRICE + when a.msgType = '9' and a.bizKakaoImageType != 'I' and a.bizKakaoImageType != 'W' then (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) + end kakaoResendSuccPrice , a.divideYn , a.bizKakaoResendYn , MKPI.YELLOW_ID AS yellowId @@ -1947,6 +1958,7 @@ , MD.BIZ_KAKAO_RESEND_YN as bizKakaoResendYn , MD.MSG_NOTICETALK_SENDER_KEY , MD.MSG_NOTICETALK_TMP_KEY + , MGD.BIZ_KAKAO_IMAGE_TYPE as bizKakaoImageType FROM MJ_MSG_DATA MD inner join MJ_MSG_GROUP_DATA MGD on MGD.MSG_GROUP_ID = MD.MSG_GROUP_ID From d9f34eee53cbeb4fa5ca42c03f91d992d9e53a11 Mon Sep 17 00:00:00 2001 From: "hehihoho3@gmail.com" Date: Thu, 7 Aug 2025 12:50:53 +0900 Subject: [PATCH 4/4] =?UTF-8?q?=EC=B9=9C=EA=B5=AC=ED=86=A1=20=ED=85=9C?= =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EB=B6=88=EB=9F=AC=EC=98=A4=EA=B8=B0=20?= =?UTF-8?q?=ED=9B=84=20=EC=83=88=EA=B3=A0=EA=B3=A0=EC=B9=A8=20->=20?= =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=B4=EB=8F=99=20=EC=B9=9C?= =?UTF-8?q?=EA=B5=AC=ED=86=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp index 12a4454b..968da1ce 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp @@ -1523,9 +1523,11 @@ function thisFnByteString(contents){ } function msgSuccessClose(obj){ - $(obj).closest('.pop_msg_success').attr('style',''); - location.reload(true); - $('html').scrollTop(0); +// $(obj).closest('.pop_msg_success').attr('style',''); +// location.reload(true); +// $('html').scrollTop(0); + + location.href = '/web/mjon/kakao/friendstalk/kakaoFriendsTalkMsgDataView.do'; } function getFtImageType(imgChk){