itfirst/sake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
jazz
2025-12-26 11:09:10 +09:00
parent d4facbb997 bc45eb31ce
commit 1dc4d79d95
9 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyDtlInqireR.jsp
View File

@@ -944,6 +944,7 @@
</div>
<section class="content-section sendOut-orderDetail-content">
<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<h3 class="content-section__title">주문상품</h3>
<div class="table-wrapper">
<table class="table vertical">
@@ -1137,11 +1138,11 @@
</div>
<div class="sum-area">
<div class="sum-area__item">
<div class="sum-area__title">총 상품금액 <fmt:formatNumber value="${total.slepric}" pattern="#,###"/>원</div>
<div class="sum-area__title">총 상품금액 <fmt:formatNumber value="${total.slepric}" pattern="#,###"/>${curUnit}</div>
</div>
<span class="sum-area__sign">+</span>
<div class="sum-area__item">
<div class="sum-area__title"><button class="opened">배송비 <fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/>원</button></div>
<div class="sum-area__title"><button class="opened">배송비 <fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/>${curUnit}</button></div>
<div class="sum-area__content opened">
<div class="sum-area__list-wrapper">
<ul class="sum-area__list">
@@ -1149,7 +1150,7 @@
<c:if test="${not empty dscntList}">
<c:forEach var="dscnt" items="${dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}">
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</li>
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</li>
</c:if>
</c:forEach>
</c:if>
@@ -1159,7 +1160,7 @@
</div>
<span class="sum-area__sign">-</span>
<div class="sum-area__item">
<div class="sum-area__title"><button class="opened">할인금액 <fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>원</button></div>
<div class="sum-area__title"><button class="opened">할인금액 <fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>${curUnit}</button></div>
<div class="sum-area__content opened">
<div class="sum-area__list-wrapper">
<ul class="sum-area__list">
@@ -1167,7 +1168,7 @@
<c:if test="${not empty dscntList}">
<c:forEach var="dscnt" items="${dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}">
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</li>
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</li>
</c:if>
</c:forEach>
</c:if>
@@ -1177,7 +1178,7 @@
</div>
<span class="sum-area__sign">=</span>
<div class="sum-area__item">
<div class="sum-area__title red-7">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>원</div>
<div class="sum-area__title red-7">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>${curUnit}</div>
</div>
</div>
</section>

6
src/main/webapp/WEB-INF/views/mngr/ordr/dlivy/DlivyListInqireRForm.jsp
View File

@@ -9,6 +9,7 @@
<head>
<%@ include file="/WEB-INF/views/comm/mngr/Include.jsp"%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<script>
$(document).ready(function(){
@@ -1234,6 +1235,7 @@
const lastTr = $(tbody).find('tr.row:last');
const currTr = 'order-sttus-cd-' + data.ordrSttusCd;
const prevTr = String($(lastTr).attr('class'));
var curUnit = '${curUnit}';
if ((prevTr != 'undefined' && !lastTr.hasClass(currTr)) || isEnd) {
const prevTrClass = prevTr.split(' ')[1];
@@ -1270,8 +1272,8 @@
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-700 mr-5">' + prevOrderSttusNm + '</span>';
footer += ' <span class="fw-500 stone-10">합계</span>';
footer += ' <span class="fw-700 stone-10 mr-5">' + rowLength + '건</span>';
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-500">₩</span>';
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-700">' + setleAmt.toLocaleString('ko-KR') + '원</span>';
// footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-500">₩</span>';
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-700">' + setleAmt.toLocaleString('ko-KR') + curUnit + '</span>';
footer += ' </div>';
footer += ' </div>';
footer += ' </td>';

2
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/AllOrdrListInqireR.jsp
View File

@@ -1363,7 +1363,7 @@
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-700 mr-5">' + prevOrderSttusNm + '</span>';
footer += ' <span class="fw-500 stone-10">합계</span>';
footer += ' <span class="fw-700 stone-10 mr-5">' + rowLength + '건</span>';
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-500">₩</span>';
// footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-500">₩</span>';
footer += ' <span class="text-order-' + prevOrderSttusCdNm + ' fw-700">' + setleAmt.toLocaleString('ko-KR') + curUnit + '</span>';
footer += ' </div>';
footer += ' </div>';

13
src/main/webapp/WEB-INF/views/mngr/ordr/ordrmngr/OrdrDtlInqireR.jsp
View File

@@ -1971,6 +1971,7 @@
<section class="content-section">
<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<h3 class="content-section__title">주문상품
<c:if test="${ not empty dtl.strNm }">
<span class="blue-7">(${ dtl.strNm })</span>
@@ -2172,11 +2173,11 @@
</div>
<div class="sum-area">
<div class="sum-area__item">
<div class="sum-area__title">총 상품금액 <fmt:formatNumber value="${total.slepric}" pattern="#,###"/>원</div>
<div class="sum-area__title">총 상품금액 <fmt:formatNumber value="${total.slepric}" pattern="#,###"/>${curUnit}</div>
</div>
<span class="sum-area__sign">+</span>
<div class="sum-area__item">
<div class="sum-area__title"><button class="opened">배송비 <fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/>원</button></div>
<div class="sum-area__title"><button class="opened">배송비 <fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/>${curUnit}</button></div>
<div class="sum-area__content opened">
<div class="sum-area__list-wrapper">
<ul class="sum-area__list">
@@ -2184,7 +2185,7 @@
<c:if test="${not empty dscntList}">
<c:forEach var="dscnt" items="${dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}">
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</li>
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</li>
</c:if>
</c:forEach>
</c:if>
@@ -2194,7 +2195,7 @@
</div>
<span class="sum-area__sign">-</span>
<div class="sum-area__item">
<div class="sum-area__title"><button class="opened">할인금액 <fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>원</button></div>
<div class="sum-area__title"><button class="opened">할인금액 <fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>${curUnit}</button></div>
<div class="sum-area__content opened">
<div class="sum-area__list-wrapper">
<ul class="sum-area__list">
@@ -2202,7 +2203,7 @@
<c:if test="${not empty dscntList}">
<c:forEach var="dscnt" items="${dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}">
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</li>
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</li>
</c:if>
</c:forEach>
</c:if>
@@ -2212,7 +2213,7 @@
</div>
<span class="sum-area__sign">=</span>
<div class="sum-area__item">
<div class="sum-area__title red-7">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>원</div>
<div class="sum-area__title red-7">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>${curUnit}</div>
</div>
</div>
</section>

19
src/main/webapp/WEB-INF/views/mngr/ordr/refnd/RtngudRefndDtlInqireR.jsp
View File

@@ -1504,6 +1504,7 @@
<spring:eval expression="@environment.getProperty('mngrfo.common.fileupload.cdnurl')" var="cdnurl"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<div class="content__inner">
<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
<div class="page-title">
@@ -1867,11 +1868,11 @@
</div>
<div class="sum-area">
<div class="sum-area__item">
<div class="sum-area__title">총 상품금액 <fmt:formatNumber value="${total.slepric}" pattern="#,###"/>원</div>
<div class="sum-area__title">총 상품금액 <fmt:formatNumber value="${total.slepric}" pattern="#,###"/>${curUnit}</div>
</div>
<span class="sum-area__sign">+</span>
<div class="sum-area__item">
<div class="sum-area__title"><button class="opened">배송비 <fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/>원</button></div>
<div class="sum-area__title"><button class="opened">배송비 <fmt:formatNumber value="${total.dlvyAmt}" pattern="#,###"/>${curUnit}</button></div>
<div class="sum-area__content opened">
<div class="sum-area__list-wrapper">
<ul class="sum-area__list">
@@ -1879,7 +1880,7 @@
<c:if test="${not empty dscntList}">
<c:forEach var="dscnt" items="${dscntList}" varStatus="status">
<c:if test="${'03' == dscnt.dscntDvCd}">
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</li>
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</li>
</c:if>
</c:forEach>
</c:if>
@@ -1889,7 +1890,7 @@
</div>
<span class="sum-area__sign">-</span>
<div class="sum-area__item">
<div class="sum-area__title"><button class="opened">할인금액 <fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>원</button></div>
<div class="sum-area__title"><button class="opened">할인금액 <fmt:formatNumber value="${total.dscntAmt}" pattern="#,###"/>${curUnit}</button></div>
<div class="sum-area__content opened">
<div class="sum-area__list-wrapper">
<ul class="sum-area__list">
@@ -1897,7 +1898,7 @@
<c:if test="${not empty dscntList}">
<c:forEach var="dscnt" items="${dscntList}" varStatus="status">
<c:if test="${'03' != dscnt.dscntDvCd}">
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>원</li>
<li>${dscnt.dscntDvNm} : <fmt:formatNumber value="${dscnt.dscntAmt}" pattern="#,###"/>${curUnit}</li>
</c:if>
</c:forEach>
</c:if>
@@ -1907,7 +1908,7 @@
</div>
<span class="sum-area__sign">=</span>
<div class="sum-area__item">
<div class="sum-area__title red-7 rl_setle_amt">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>원</div>
<div class="sum-area__title red-7 rl_setle_amt">총 결제금액 <fmt:formatNumber value="${total.setleAmt}" pattern="#,###"/>${curUnit}</div>
</div>
</div>
</section>
@@ -2366,7 +2367,7 @@
disabled
</c:if>
>
<span class="input-unit-text mr-8">원</span>
<span class="input-unit-text mr-8">${curUnit}</span>
</div>
</div>
</div>
@@ -2721,7 +2722,7 @@
<td>
<c:out value="${ resultMap.result.refnd.dlvyMthCdNm}"/>
<br>
<span class="comma fw-700"><c:out value="${ resultMap.result.refnd.returnDlvyAmt}"/></span>원
<span class="comma fw-700"><c:out value="${ resultMap.result.refnd.returnDlvyAmt}"/></span>${curUnit}
<br>
(주문시결제)
</td>
@@ -2785,7 +2786,7 @@
<span class="comma tfoot-sum__sum-num rlRefundAmt">
<%-- <c:out value="${ reTotAmt.rlRefundAmt }"/>--%>
</span>
<p class="fw-400 fs-13 gray-7">※실제 결제 통화 금액 : <span class="comma"><c:out value="${ reTotAmt.rlSetleAmt }"/></span>원
<p class="fw-400 fs-13 gray-7">※실제 결제 통화 금액 : <span class="comma"><c:out value="${ reTotAmt.rlSetleAmt }"/></span>${curUnit}
</p>
</td>
</tr>

3
src/main/webapp/WEB-INF/views/mngr/setup/mbr/GradBnefListR.jsp
View File

@@ -15,6 +15,7 @@
--%>
<!DOCTYPE html>
<html lang="ko">
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<form>
<section class="content-section">
<div class="form-control-container">
@@ -70,7 +71,7 @@
<span>
<c:out value="${resultList.mbrGradCndCdNm}"/>
<c:if test = "${resultList.mbrGradCndCd ne '01'}">
<fmt:formatNumber value="${resultList.mbrGradAmt}" pattern="#,###"/>원 이상
<fmt:formatNumber value="${resultList.mbrGradAmt}" pattern="#,###"/>${curUnit} 이상
</c:if>
</span>
</td>

3
src/main/webapp/WEB-INF/views/mngr/setup/mbr/GradBnefRegistU.jsp
View File

@@ -15,6 +15,7 @@
--%>
<!DOCTYPE html>
<html lang="ko">
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<head>
<%@include file ="/WEB-INF/views/comm/mngr/Include.jsp" %>
<script>
@@ -243,7 +244,7 @@
조건 없음
</c:when>
<c:otherwise>
<fmt:formatNumber value="${gradDtl.mbrGradAmt}" pattern="#,###.##"/>원 이상
<fmt:formatNumber value="${gradDtl.mbrGradAmt}" pattern="#,###.##"/>${curUnit} 이상
</c:otherwise>
</c:choose>
</span>