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

Merge branch 'master' into hylee

Browse Source
This commit is contained in:
hylee 2024-07-16 12:35:39 +09:00
commit fb44ab739d
4 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
View File

@ -215,7 +215,7 @@ public class KakaoSendUtil {
String title = kakaoSubMagTxtRepl(kakaoVO.getTemplateTitle(), kakaoVO, count); String title = kakaoSubMagTxtRepl(kakaoVO.getTemplateTitle(), kakaoVO, count);
String subTitle = kakaoVO.getTemplateSubtitle(); String subTitle = kakaoVO.getTemplateSubtitle();
title = title +"§§"+ subTitle; // title = title +"§§"+ subTitle;
setSendMsgVO.setTemplateEmphasizeType(kakaoVO.getTemplateEmphasizeType()); setSendMsgVO.setTemplateEmphasizeType(kakaoVO.getTemplateEmphasizeType());
setSendMsgVO.setTemplateTitle(title); setSendMsgVO.setTemplateTitle(title);
} }
@ -226,7 +226,7 @@ public class KakaoSendUtil {
String title = kakaoSubMagTxtRepl(kakaoVO.getTemplateTitle(), kakaoVO, count); String title = kakaoSubMagTxtRepl(kakaoVO.getTemplateTitle(), kakaoVO, count);
String subTitle = kakaoVO.getTemplateSubtitle(); String subTitle = kakaoVO.getTemplateSubtitle();
title = title +"§§"+ subTitle; // title = title +"§§"+ subTitle;
setSendMsgVO.setTemplateEmphasizeType(kakaoVO.getTemplateEmphasizeType()); setSendMsgVO.setTemplateEmphasizeType(kakaoVO.getTemplateEmphasizeType());
setSendMsgVO.setTemplateTitle(title); setSendMsgVO.setTemplateTitle(title);
} }

12
src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
View File

@ -213,12 +213,12 @@ function fnShowRefundPrintPopup(){
<c:when test="${prePaymentYn eq 'Y'}"> <c:when test="${prePaymentYn eq 'Y'}">
<ul class="tabType1"> <ul class="tabType1">
<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li> <li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환</button></li>
<li class="tab"><button type="button" id="tab6" onclick="TabType5(this,'7');listLoad('/web/member/pay/PayListRefundAjax.do'); return false;">환불신청</button></li> <li class="tab"><button type="button" id="tab6" onclick="TabType5(this,'7');listLoad('/web/member/pay/PayListRefundAjax.do'); return false;">환불신청</button></li>
</ul> </ul>
</c:when> </c:when>

8
src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
View File

@ -969,19 +969,21 @@ function getMberGrdChk() {
<div class="account_holder"> <div class="account_holder">
(예금주 : <c:out value="${result.cmfNm}"/>) (예금주 : <c:out value="${result.cmfNm}"/>)
</div> </div>
</td> </td>
<td class="right"> <td class="right account_te">
<button type="button">가상계좌 확인서</button>
</td> </td>
</tr> </tr>
</c:forEach> </c:forEach>
</c:when> </c:when>
<c:otherwise> <c:otherwise>
<tr> <tr>
<td class="account_te" colspan="2"> <td colspan="2">
<div> <div>
보유한 전용 계좌가 없습니다. 보유한 전용 계좌가 없습니다.
</div> </div>
<button type="button">가상계좌 확인서</button> <!-- <button type="button">가상계좌 확인서</button> -->
</td> </td>
</tr> </tr>
</c:otherwise> </c:otherwise>

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

@ -2009,7 +2009,8 @@ button.check_validity:hover {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
.tType1 tbody tr .ele_te span{font-weight: 400;} .tType1 tbody tr .ele_te span{font-weight: 400;}
/* 결제화면 > 전용계좌 > 가상계좌 확인서 버튼 추가 */ /* 결제화면 > 전용계좌 > 가상계좌 확인서 버튼 추가 */
.tType1.account_con tbody tr .account_te{display: flex; justify-content: space-between;} .tType1.account_con{table-layout: auto;}
.tType1.account_con tbody tr .account_te button{white-space: nowrap;}
@keyframes rotate-loading { @keyframes rotate-loading {
0% {transform:rotate(0)} 0% {transform:rotate(0)}