diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java index 6fda138b..e28d9590 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java @@ -813,8 +813,8 @@ public class KakaoAlimTalkTemplateController { searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage()); if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List - searchVO.setSearchSortCnd("sampleTemplateId"); - searchVO.setSearchSortOrd("desc"); + searchVO.setSearchSortCnd("sampleTemplatePriority"); + searchVO.setSearchSortOrd("asc"); } List resultList = new ArrayList(); diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayEstimate.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayEstimate.jsp index 33f7fee7..118dac39 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayEstimate.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayEstimate.jsp @@ -170,7 +170,16 @@ function winPrint() { - + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp index c50f9837..3fd7009b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp @@ -176,7 +176,12 @@ function setItemAddHtml() { else { sHtml += "
" + element.unitPrice + "
"; } - sHtml += "
" + numberWithCommas(element.caseNumber) + "
"; + if(element.smsItemName.includes('팩스')){ + sHtml += "
" + numberWithCommas(element.caseNumber * element.casePage) + "
"; + } + else { + sHtml += "
" + numberWithCommas(element.caseNumber) + "
"; + } sHtml += "
" + numberWithCommas(element.supplyPrice) + "
"; sHtml += "
" + numberWithCommas(element.vatPrice) + "
"; sHtml += "
" + numberWithCommas(element.totVatPrice) + "
";