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

fix : 화폐단위 변경 (원 → 円)

Browse Source 
fix : 추가 배송비 문구 수정(도서산간+제주도 → 오키나와,홋카이도)
This commit is contained in:
이대환
2025-12-26 18:43:32 +09:00
parent 8fd320df3f
commit 382000a4f5
11 changed files with 118 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponInfoInqirePopupR.jsp
View File

@@ -16,6 +16,7 @@
------- -------- ---------------------------
since : 2023.12.14 추지훈 최초 생성
--%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<div id="couponInfoPopup" class="modal" style="max-width: 400px;">
<div class="modal-header">
<h4>쿠폰 정보</h4>
@@ -44,7 +45,7 @@
<c:out value="${ resultMap.dwldCouponVO.aditDscntAmt }"/> <c:out value="${ resultMap.dwldCouponVO.goodsDscntDvNm }"/> 할인
</span><br/>
<c:if test="${ '01' eq resultMap.dwldCouponVO.goodsDscntDv }">
<span class="gray-8">최대 <c:out value="${ resultMap.dwldCouponVO.dscntMxmmAmt }"/>원 할인</span>
<span class="gray-8">최대 <c:out value="${ resultMap.dwldCouponVO.dscntMxmmAmt }"/>${curUnit} 할인</span>
</c:if>
</c:when>
<c:when test="${ resultMap.dwldCouponVO.bnefDv eq '02' }">
@@ -53,10 +54,10 @@
</span>
<br>
<span class="gray-8">
최대 <c:out value="${ resultMap.dwldCouponVO.dlvyAmtMxmmDscntAmt }"/>원 할인</c:if>
최대 <c:out value="${ resultMap.dwldCouponVO.dlvyAmtMxmmDscntAmt }"/>${curUnit} 할인</c:if>
</span>
<span class="fw-500">
<c:if test="${ '02' eq resultMap.dwldCouponVO.dlvyAmtDscntDv }">배송비 <c:out value="${ resultMap.dwldCouponVO.dlvyAmtDscntAmt }"/>원 할인</c:if>
<c:if test="${ '02' eq resultMap.dwldCouponVO.dlvyAmtDscntDv }">배송비 <c:out value="${ resultMap.dwldCouponVO.dlvyAmtDscntAmt }"/>${curUnit} 할인</c:if>
</span>
</c:when>
<c:otherwise>
@@ -113,11 +114,11 @@
</c:if>
<%-- 사용가능금액(제품) --%>
<c:if test="${ not empty resultMap.dwldCouponVO.usePosblAmt && 0 ne fn:replace(resultMap.dwldCouponVO.usePosblAmt, ',', '') }">
<p class="fyi gray-7"><c:out value="${ resultMap.dwldCouponVO.usePosblAmt }"/>원 이상 구매 시</p>
<p class="fyi gray-7"><c:out value="${ resultMap.dwldCouponVO.usePosblAmt }"/>${curUnit} 이상 구매 시</p>
</c:if>
<%-- 사용가능금액(대상제품 포함 구매제품 총합) --%>
<c:if test="${ not empty resultMap.dwldCouponVO.usePosblAllAmt && 0 ne fn:replace(resultMap.dwldCouponVO.usePosblAllAmt, ',', '') && resultMap.dwldCouponVO.usePosblAllAmtUseAt eq 'Y' }">
<p class="fyi gray-7"><c:out value="${ resultMap.dwldCouponVO.usePosblAllAmt }"/>원 이상 구매 시</p>
<p class="fyi gray-7"><c:out value="${ resultMap.dwldCouponVO.usePosblAllAmt }"/>${curUnit} 이상 구매 시</p>
</c:if>
<%-- 중복다운로드 여부 --%>
<c:if test="${ not empty resultMap.dwldCouponVO.dplctDwldAt}">

16
src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponIssuUseDtlsR.jsp
View File

@@ -47,7 +47,7 @@
</script>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<div class="form-control-container">
<div class="left">
<div class="search-number">
@@ -163,10 +163,10 @@
<c:when test="${ couponUseDtls.bnefDvCd eq '01' || couponUseDtls.bnefDvCd eq '03' }">
<span class="fw-500">
<c:if test="${ '01' eq couponUseDtls.aditDscntCd }"><fmt:formatNumber value="${ couponUseDtls.aditDscntAmt }" pattern="##" />% 할인</c:if>
<c:if test="${ '02' eq couponUseDtls.aditDscntCd }"><fmt:formatNumber value="${ couponUseDtls.aditDscntAmt }" pattern="#,###" />원 할인</c:if>
<c:if test="${ '02' eq couponUseDtls.aditDscntCd }"><fmt:formatNumber value="${ couponUseDtls.aditDscntAmt }" pattern="#,###" />${curUnit} 할인</c:if>
</span><br/>
<c:if test="${ '01' eq couponUseDtls.goodsDscntDv }">
<span class="gray-8">최대 <fmt:formatNumber value="${ couponUseDtls.dscntMxmmAmt }" pattern="#,###" />원 할인</span>
<span class="gray-8">최대 <fmt:formatNumber value="${ couponUseDtls.dscntMxmmAmt }" pattern="#,###" />${curUnit} 할인</span>
</c:if>
</c:when>
<c:when test="${ couponUseDtls.bnefDvCd eq '02' }">
@@ -175,10 +175,10 @@
</span>
<br>
<span class="gray-8">
최대 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtMxmmDscntAmt }" pattern="#,###" />원 할인</c:if>
최대 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtMxmmDscntAmt }" pattern="#,###" />${curUnit} 할인</c:if>
</span>
<span class="fw-500">
<c:if test="${ '02' eq couponUseDtls.dlvyAmtDscntDvCd }">배송비 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtDscntAmt }" pattern="#,###" />원 할인</c:if>
<c:if test="${ '02' eq couponUseDtls.dlvyAmtDscntDvCd }">배송비 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtDscntAmt }" pattern="#,###" />${curUnit} 할인</c:if>
</span>
</c:when>
<c:otherwise>
@@ -190,13 +190,13 @@
<td>
<c:choose>
<c:when test="${ couponUseDtls.bnefDvCd eq '01' && not empty couponUseDtls.goodsCouponDscntAmt }">
<c:out value="${ couponUseDtls.goodsCouponDscntAmt }"/>원
<c:out value="${ couponUseDtls.goodsCouponDscntAmt }"/>${curUnit}
</c:when>
<c:when test="${ couponUseDtls.bnefDvCd eq '02' && not empty couponUseDtls.dlvyCouponDscntAmt }">
<c:out value="${ couponUseDtls.dlvyCouponDscntAmt }"/>원
<c:out value="${ couponUseDtls.dlvyCouponDscntAmt }"/>${curUnit}
</c:when>
<c:when test="${ couponUseDtls.bnefDvCd eq '03' && not empty couponUseDtls.cartCouponDscntAmt }">
<c:out value="${ couponUseDtls.cartCouponDscntAmt }"/>원
<c:out value="${ couponUseDtls.cartCouponDscntAmt }"/>${curUnit}
</c:when>
</c:choose>
</td>

2
src/main/webapp/WEB-INF/views/mngr/promtn/coupon/CouponListR.jsp
View File

@@ -88,7 +88,7 @@
<span class="fw-500">
<fmt:formatNumber value="${ couponList.aditDscntAmt }" pattern="#,###" />
<c:if test="${ '01' eq couponList.aditDscntCd }">% 할인</c:if>
<c:if test="${ '02' eq couponList.aditDscntCd }">원 할인</c:if>
<c:if test="${ '02' eq couponList.aditDscntCd }">${curUnit} 할인</c:if>
</span><br/>
<c:if test="${ '01' eq couponList.aditDscntCd }">
<span class="gray-8">최대 <fmt:formatNumber value="${ couponList.dscntMxmmAmt }" pattern="#,###" />${curUnit} 할인</span>

14
src/main/webapp/WEB-INF/views/mngr/promtn/coupon/OrderCouponUseDtlsPopupR.jsp
View File

@@ -25,7 +25,7 @@
</script>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<div class="form-control-container">
<div class="left">
<div class="search-number">
@@ -111,7 +111,7 @@
</c:choose> --%>
공동
/
<c:out value="${ couponUseDtls.usePosblAmt }"/>원
<c:out value="${ couponUseDtls.usePosblAmt }"/>${curUnit}
/
<c:choose>
<c:when test="${ couponUseDtls.goodsCtgryLmttDv eq '01' }">
@@ -148,10 +148,10 @@
<c:when test="${ couponUseDtls.bnefDv eq '01' || couponUseDtls.bnefDv eq '03' }">
<span class="fw-500">
<c:if test="${ '01' eq couponUseDtls.goodsDscntDv }"><fmt:formatNumber value="${ couponUseDtls.aditDscntRt }" pattern="##" />% 할인</c:if>
<c:if test="${ '02' eq couponUseDtls.goodsDscntDv }"><fmt:formatNumber value="${ couponUseDtls.aditDscntAmt }" pattern="#,###" />원 할인</c:if>
<c:if test="${ '02' eq couponUseDtls.goodsDscntDv }"><fmt:formatNumber value="${ couponUseDtls.aditDscntAmt }" pattern="#,###" />${curUnit} 할인</c:if>
</span><br/>
<c:if test="${ '01' eq couponUseDtls.goodsDscntDv }">
<span class="gray-8">최대 <fmt:formatNumber value="${ couponUseDtls.dscntMxmmAmt }" pattern="#,###" />원 할인</span>
<span class="gray-8">최대 <fmt:formatNumber value="${ couponUseDtls.dscntMxmmAmt }" pattern="#,###" />${curUnit} 할인</span>
</c:if>
</c:when>
<c:when test="${ couponUseDtls.bnefDv eq '02' }">
@@ -160,10 +160,10 @@
</span>
<br>
<span class="gray-8">
최대 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtMxmmDscntAmt }" pattern="#,###" />원 할인</c:if>
최대 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtMxmmDscntAmt }" pattern="#,###" />${curUnit} 할인</c:if>
</span>
<span class="fw-500">
<c:if test="${ '02' eq couponUseDtls.dlvyAmtDscntDv }">배송비 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtDscntAmt }" pattern="#,###" />원 할인</c:if>
<c:if test="${ '02' eq couponUseDtls.dlvyAmtDscntDv }">배송비 <fmt:formatNumber value="${ couponUseDtls.dlvyAmtDscntAmt }" pattern="#,###" />${curUnit} 할인</c:if>
</span>
</c:when>
<c:otherwise>
@@ -175,7 +175,7 @@
<td>
<c:choose>
<c:when test="${ couponUseDtls.couponUseAt eq 'Y' }">
<c:out value="${ couponUseDtls.snggdsApplcAmt }"/>원
<c:out value="${ couponUseDtls.snggdsApplcAmt }"/>${curUnit}
</c:when>
<c:when test="${ couponUseDtls.couponUseAt eq 'N' }">