diff --git a/.gitignore b/.gitignore index 3d148367..5512880c 100644 --- a/.gitignore +++ b/.gitignore @@ -201,3 +201,4 @@ fabric.properties rebel.xml /mvnw /mvnw.cmd +/.gemini.zip 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 1062d3d8..61e44523 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 @@ -176,6 +176,15 @@ $(document).ready(function (){ imageInit(); + // 첨부가 없으면 + if ($('#sendFailImgSrc').attr('src') != null) { + $('#sendFailImg').hide(); + $('#sendFailImgSrc').attr('src', ''); + } + + + + //결제 금액 구하기 totalFtPriceSum(tableL.getRows().length); }); @@ -589,6 +598,10 @@ function getTemplateImagUrl(){ $("#templateImageUrl").val(returnData.object.imgUrl); $(".kakao_image").css("display", "block"); $("#kakaoImg").attr("src", returnData.object.imgUrl); + + // 대체문자 + $('#sendFailImg').show(); + $('#sendFailImgSrc').attr('src', returnData.object.imgUrl); } } else { @@ -2244,7 +2257,16 @@ function updateButtons(){
(광고)
diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/include/ftDataIncludeExcel.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/include/ftDataIncludeExcel.jsp index 2a1ea27e..987a23bd 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/include/ftDataIncludeExcel.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/include/ftDataIncludeExcel.jsp @@ -283,7 +283,9 @@ $(document).ready(function(){ // 6. 수량/가격 계산 setAllCntData(result); - fn_priceClclt(result.uniqueCount); + // fn_priceClclt(result.uniqueCount); + //결제 금액 구하기 + totalFtPriceSum(tableL.getRows().length); $('#closeBtn').click(); diff --git a/src/main/webapp/js/kakao/ft/addr.js b/src/main/webapp/js/kakao/ft/addr.js index f02cc8f5..2962a0e8 100644 --- a/src/main/webapp/js/kakao/ft/addr.js +++ b/src/main/webapp/js/kakao/ft/addr.js @@ -203,7 +203,9 @@ function addrToList_advc(type){ $(".closeAddr").trigger("click"); //주소록 레이어 팝업의 Tabulator 데이터 지워주기 tableAddr.clearData(); - fn_priceClclt(result.uniqueCount); + //결제 금액 구하기 + totalFtPriceSum(tableL.getRows().length); + // fn_priceClclt(result.uniqueCount); } function loadAddrList(){