Commit @8cd37c4b1f01cc77eec4b15f1a8b646c021ddb3a

48605b3

8cd37c4

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

--- src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkTemplateController.java


 			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>();

48605b3

8cd37c4

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

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

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayEstimate.jsp


 										</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>

48605b3

8cd37c4

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

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

+++ src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp


 		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>";

...	...	@@ -813,8 +813,8 @@
813	813	searchVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
814	814
815	815	if("".equals(searchVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
816		- searchVO.setSearchSortCnd("sampleTemplateId");
817		- searchVO.setSearchSortOrd("desc");
	816	+ searchVO.setSearchSortCnd("sampleTemplatePriority");
	817	+ searchVO.setSearchSortOrd("asc");
818	818	}
819	819
820	820	List<MjonKakaoSampleTemplateVO> resultList = new ArrayList<MjonKakaoSampleTemplateVO>();

...	...	@@ -170,7 +170,16 @@
170	170	</c:otherwise>
171	171	</c:choose>
172	172	</td>
173		- <td><fmt:formatNumber value="${sList.caseNumber}" pattern=""/></td>
	173	+ <td>
	174	+ <c:choose>
	175	+ <c:when test="${sList.smsItemName eq '팩스'}">
	176	+ <fmt:formatNumber value="${sList.caseNumber * sList.casePage}" pattern=""/>
	177	+ </c:when>
	178	+ <c:otherwise>
	179	+ <fmt:formatNumber value="${sList.caseNumber}" pattern=""/>
	180	+ </c:otherwise>
	181	+ </c:choose>
	182	+ </td>
174	183	<td><c:out value="${sList.supplyPrice}"/></td>
175	184	<td><c:out value="${sList.vatPrice}"/></td>
176	185	<td><c:out value="${sList.totPrice}"/></td>

...	...	@@ -176,7 +176,12 @@
176	176	else {
177	177	sHtml += " <div>" + element.unitPrice + "</div>";
178	178	}
179		- sHtml += " <div>" + numberWithCommas(element.caseNumber) + "</div>";
	179	+ if(element.smsItemName.includes('팩스')){
	180	+ sHtml += " <div>" + numberWithCommas(element.caseNumber * element.casePage) + "</div>";
	181	+ }
	182	+ else {
	183	+ sHtml += " <div>" + numberWithCommas(element.caseNumber) + "</div>";
	184	+ }
180	185	sHtml += " <div>" + numberWithCommas(element.supplyPrice) + "</div>";
181	186	sHtml += " <div>" + numberWithCommas(element.vatPrice) + "</div>";
182	187	sHtml += " <div>" + numberWithCommas(element.totVatPrice) + "</div>";

Delete comment