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

Merge branch 'master' into jiwoo

Browse Source
This commit is contained in:
jiwoo 2023-06-16 23:37:14 +09:00
commit 8cd37c4b1f
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java
View File

@ -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<MjonKakaoSampleTemplateVO> resultList = new ArrayList<MjonKakaoSampleTemplateVO>();

11
src/main/webapp/WEB-INF/jsp/web/pay/PayEstimate.jsp
View File

@ -170,7 +170,16 @@ function winPrint() {
</c:otherwise>
</c:choose>
</td>
<td><fmt:formatNumber value="${sList.caseNumber}" pattern=""/></td>
<td>
<c:choose>
<c:when test="${sList.smsItemName eq '팩스'}">
<fmt:formatNumber value="${sList.caseNumber * sList.casePage}" pattern=""/>
</c:when>
<c:otherwise>
<fmt:formatNumber value="${sList.caseNumber}" pattern=""/>
</c:otherwise>
</c:choose>
</td>
<td><c:out value="${sList.supplyPrice}"/></td>
<td><c:out value="${sList.vatPrice}"/></td>
<td><c:out value="${sList.totPrice}"/></td>

7
src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp
View File

@ -176,7 +176,12 @@ function setItemAddHtml() {
else {
sHtml += " <div>" + element.unitPrice + "</div>";
}
sHtml += " <div>" + numberWithCommas(element.caseNumber) + "</div>";
if(element.smsItemName.includes('팩스')){
sHtml += " <div>" + numberWithCommas(element.caseNumber * element.casePage) + "</div>";
}
else {
sHtml += " <div>" + numberWithCommas(element.caseNumber) + "</div>";
}
sHtml += " <div>" + numberWithCommas(element.supplyPrice) + "</div>";
sHtml += " <div>" + numberWithCommas(element.vatPrice) + "</div>";
sHtml += " <div>" + numberWithCommas(element.totVatPrice) + "</div>";