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-05-06 17:05:25 +09:00
parent eff6ce35bd 9cc4a26f0f
commit 16c373cb14
53 changed files with 2375 additions and 813 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -220,7 +220,7 @@
//상품문의 조회
fn_select_qna(1);
//반품교환정보 조회
//배송/반품정보 조회
fn_select_return_info();
//포토리뷰 이미지 제거
@@ -4533,7 +4533,7 @@
<a href="#productQnA" id="productQnAA">상품문의(<span id="goodsQnaCnt"><fmt:formatNumber value="${resultMap.bbscttInfo.qnaCnt}" pattern="#,###"/></span>)</a>
</li>
<li class="productDetailTab__item">
<a href="#productReTurn" id="productReTurnA">반품/교환정보</a>
<a href="#productReTurn" id="productReTurnA">배송/반품</a>
</li>
</ul>
</div>

40
src/main/webapp/WEB-INF/views/sopmal/main/AgeChkPopupR.jsp Normal file
View File

@@ -0,0 +1,40 @@
<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="ui" uri="http://www.winbit.kr/ctl/ui" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
<%--
Class Name : NtcntalkAtmcSndngTmplatUpdtPopupU.jsp
Description : 메시지 자동 발송 상세
Modification Information
수정일 수정자 수정내용
------- -------- ---------------------------
2024.05.16 이대환 최초 생성
--%>
<script>
const fn_ageChk_yes = function() {
document.cookie = "ageChk=true; path=/; max-age=86400";
}
const fn_ageChk_no = function() {
window.location.href = "https://search.naver.com/search.naver?query=사케일잔";
}
</script>
<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR&family=Noto+Sans+JP&display=swap" rel="stylesheet">
<div id="ageChkPopup" class="modal alert" style="max-width: 800px; font-family: 'Noto Sans JP', 'Noto Sans KR', sans-serif;">
<div class="alert-content">
<p class="alert-content__text" style="font-size: 35px;">
満20歳以上ですか?<br>
(만20세 이상입니까?)
</p>
<p class="alert-content__text--sm" style="font-size: 25px;">
20歳未満の飲酒は法律で禁止されています。<br>
(20세 미만의 음주는 법으로 금지되어 있습니다.)
</p>
</div>
<div class="alert-btn-container">
<a href="javascript:void(0);" onclick="fn_ageChk_yes();" rel="modal:close" class="alert-btn alert-btn--confirm" style="font-size: 20px;">はい (예)</a>
<a href="javascript:void(0);" onclick="fn_ageChk_no();" rel="modal:close" class="alert-btn alert-btn--confirm" style="font-size: 20px;">いいえ (아니오)</a>
</div>
</div>

15
src/main/webapp/WEB-INF/views/sopmal/mbr/JoinGuidanceR.jsp
View File

@@ -70,7 +70,7 @@
</c:if>
<div class="signUp-promotion__section">
<h5 class="signUp-promotion__section__title"><c:if test="${integrated}">GC ONE (통합 회원) </c:if>주요 혜택</h5>
<div class="signUp-promotion__col-3 ck-content">
<div class="signUp-promotion__section__content ck-content">
<c:out value='${sopmalInfo.joinBnef}' escapeXml='false'/>
</div>
</div>
@@ -83,10 +83,15 @@
<script type="text/javascript">
$(document).ready(function() {
let signUpPromo = $('.signUp-promotion__col-3.ck-content');
let figureTable = signUpPromo.find('figure.table');
if(figureTable.length == 4){
signUpPromo.removeClass('signUp-promotion__col-3').addClass('signUp-promotion__col-2');
let signUpPromo = $('.signUp-promotion__section__content');
let figureTable = signUpPromo.find('figure.table').length;
if(figureTable) {
if (figureTable % 3 == 0) {
signUpPromo.addClass('signUp-promotion__col-3');
} else if (figureTable % 2 == 0) {
signUpPromo.addClass('signUp-promotion__col-2');
}
}
});

6
src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp
View File

@@ -613,7 +613,11 @@
fn_set_csh_rcipt_issu(id);
}
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
if('bank' === id) {
$(form).find('#pgCmpnyNm').val(id);
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
}
if ('hndwr-card' !== id) {
if ('payco' === id || 'card' === id) {

16
src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp
View File

@@ -616,7 +616,11 @@
fn_set_csh_rcipt_issu(id);
}
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
if('bank' === id) {
$(form).find('#pgCmpnyNm').val(id);
} else {
$(form).find('#pgCmpnyNm').val($('input[name="pg"]:checked').val());
}
if ('hndwr-card' !== id) {
if ('payco' === id || 'card' === id) {
@@ -3527,7 +3531,7 @@
function pay(method, requestJson, pgNm) {
if(pgNm === "naverpay"||pgNm === "kakaopay")
if(pgNm === "kakaopay")
tossPayments = TossPayments("${data.payInfo.easypayClntKey}");
tossPayments.requestPayment(method, requestJson)
@@ -4574,13 +4578,10 @@
</div>
</div>
</c:if>
<%--
<c:if test="${'Y' eq payInfo.npayUseAt}">
<div id="naverpay-content" class="order-method-normal__content" style="display: none">
<div id="naverpay-content-inner" class="order-method-normal__content-inner">
<div class="noempty">
</div>
</div>
<div id="naverpay-content-inner" class="order-method-normal__content-inner"></div>
</div>
</c:if>
<c:if test="${'Y' eq payInfo.kpayUseAt}">
@@ -4592,6 +4593,7 @@
</div>
</div>
</c:if>
--%>
</div>
</div>
</c:if>