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:
이경숙
2026-04-08 16:45:21 +09:00
parent 30025eaaad 946f1f9a95
commit 0bbd8e3891
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/webapp/WEB-INF/views/mngr/setup/ordr/OrdrListR.jsp
View File

@@ -133,7 +133,7 @@
<div class="content__inner"> <div class="content__inner">
<button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button> <button class="side-nav__fold"><span class="visually-hidden">좌측메뉴 펼치기/닫기</span></button>
<div class="page-title"> <div class="page-title">
<h2 class="page-title__title">주문 설정</h2> <h2 class="page-title__title">마일리지 설정</h2>
<div class="page-title__btn-container"> <div class="page-title__btn-container">
<button type="button" class="btn primary" onclick="fn_save_ordrSetup(); return false;"> <button type="button" class="btn primary" onclick="fn_save_ordrSetup(); return false;">
<spring:message code="button.save"/></button> <spring:message code="button.save"/></button>

3
src/main/webapp/WEB-INF/views/sopmal/goods/GoodsDtlR.jsp
View File

@@ -4064,6 +4064,9 @@
value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span> value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span>
<span class="priceUnit">${curUnit}</span>) <span class="priceUnit">${curUnit}</span>)
</c:if> </c:if>
<c:if test="${resultMap.goodsDtl.dlvyGroupDvCd eq '02'}">
(<span>무료배송</span>)
</c:if>
<c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}"> <c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}">
<button id="deliveryFeeInfo" class="infoBtn"><i <button id="deliveryFeeInfo" class="infoBtn"><i
class="icon icon_question"></i><span class="icon icon_question"></i><span

3
src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp
View File

@@ -3853,6 +3853,9 @@ const fn_move_goodsDtl_login = () => {
value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span> value="${resultMap.goodsDtl.dftDlvyAmt}" default="0"/></span>
<span class="priceUnit">${curUnit}</span>) <span class="priceUnit">${curUnit}</span>)
</c:if> </c:if>
<c:if test="${resultMap.goodsDtl.dlvyGroupDvCd eq '02'}">
(<span>무료배송</span>)
</c:if>
<c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}"> <c:if test="${ resultMap.goodsDtl.amtCndUseAt eq 'Y'}">
<button type="button" class="infoBtn" onclick="fn_select_dlvy_info('deliveryFeePop')"> <button type="button" class="infoBtn" onclick="fn_select_dlvy_info('deliveryFeePop')">
<i class="icon icon_question"></i> <i class="icon icon_question"></i>