From da46a84a698654f9da08e6e0d33450792fb84637 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Thu, 16 Apr 2026 17:13:09 +0900 Subject: [PATCH 01/19] =?UTF-8?q?fix=20:=20=EC=A3=BC=EB=AC=B8/=EA=B5=AC?= =?UTF-8?q?=EB=8F=85=EC=84=9C=EB=B9=84=EC=8A=A4=20=EA=B2=B0=EC=A0=9C=20>?= =?UTF-8?q?=20=EB=AC=B4=ED=86=B5=EC=9E=A5=20=EA=B2=B0=EC=A0=9C=20-=20?= =?UTF-8?q?=EA=B2=B0=EC=A0=9C=EC=82=AC=EB=AA=85=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp | 6 +++++- src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp | 6 +++++- src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp | 6 +++++- .../webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp | 6 +++++- 4 files changed, 20 insertions(+), 4 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp index ed07a7db..40ae4657 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp @@ -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) { diff --git a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp index 89c52d00..cd858c23 100644 --- a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp @@ -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) { diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp index b8ae09d5..8dc301cf 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/MbrPurchsC.jsp @@ -644,7 +644,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) { diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp index 38a31978..cbe32e56 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/ordr/SubsvcPurchsC.jsp @@ -662,7 +662,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) { From 329b1f4b4c6bbd4e872f9df1cf2a14d24d87bb56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Fri, 17 Apr 2026 10:40:48 +0900 Subject: [PATCH 02/19] =?UTF-8?q?fix=20:=20=EB=B0=98=ED=92=88=EA=B5=90?= =?UTF-8?q?=ED=99=98=20=E2=86=92=20=EB=B0=B0=EC=86=A1/=EB=B0=98=ED=92=88?= =?UTF-8?q?=20=EB=AC=B8=EA=B5=AC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mngr/goods/cmnuse/CmnuseInfoDtlFormR.jsp | 12 ++++----- .../mngr/goods/cmnuse/CmnuseInfoFormR.jsp | 12 ++++----- .../mngr/goods/cmnuse/CmnuseInfoListR.jsp | 6 ++--- .../views/mngr/goods/goodsmngr/BndeUpdtU.jsp | 18 ++++++------- .../views/mngr/goods/goodsmngr/GoodsC.jsp | 20 +++++++------- .../views/mngr/goods/goodsmngr/GoodsCopyC.jsp | 22 ++++++++-------- .../views/mngr/goods/goodsmngr/GoodsDtlU.jsp | 26 +++++++++---------- .../WEB-INF/views/sopmal/goods/GoodsDtlR.jsp | 4 +-- .../views/sopmal_m/goods/GoodsDtlR.jsp | 2 +- 9 files changed, 61 insertions(+), 61 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoDtlFormR.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoDtlFormR.jsp index 16238650..b048b3bf 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoDtlFormR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoDtlFormR.jsp @@ -10,7 +10,7 @@ <%-- Class Name : CmnuseInfoFormR.jsp - Description : 반품교환정보 상세 화면 + Description : 배송/반품정보 상세 화면 Modification Information 수정일 수정자 수정내용 @@ -60,7 +60,7 @@ formData.append(item.name, item.value); }); - if(confirm('반품교환정보를 ')) { + if(confirm('배송/반품정보를 ')) { $.ajax({ type : 'post', url : url, @@ -98,7 +98,7 @@
-

반품교환정보 수정

+

배송/반품정보 수정

@@ -107,10 +107,10 @@
-

반품교환정보

+

배송/반품정보

- + @@ -118,7 +118,7 @@ - +
반품교환정보명배송/반품정보명
반품교환정보명배송/반품정보명
diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoFormR.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoFormR.jsp index 73792749..666865f4 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoFormR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoFormR.jsp @@ -9,7 +9,7 @@ <%-- Class Name : CmnuseInfoFormR.jsp - Description : 반품교환정보 등록 화면 + Description : 배송/반품정보 등록 화면 Modification Information 수정일 수정자 수정내용 @@ -59,7 +59,7 @@ formData.append(item.name, item.value); }); - if(confirm('반품교환정보를 ')) { + if(confirm('배송/반품정보를 ')) { $.ajax({ type : 'post', url : url, @@ -98,7 +98,7 @@
-

반품교환정보 등록

+

배송/반품정보 등록

@@ -107,17 +107,17 @@
-

반품교환정보

+

배송/반품정보

- + - +
반품교환정보명배송/반품정보명
반품교환정보명배송/반품정보명
diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoListR.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoListR.jsp index d5ea7f0a..90d54c6e 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoListR.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/cmnuse/CmnuseInfoListR.jsp @@ -8,7 +8,7 @@ <%-- Class Name : GoodsInfoFormR.jsp - Description : 반품교환정보 목록 화면 + Description : 배송/반품정보 목록 화면 Modification Information 수정일 수정자 수정내용 @@ -53,7 +53,7 @@ return false; } - if (confirm('반품교환정보를 ')) { + if (confirm('배송/반품정보를 ')) { $.ajax({ type : 'post', url : '', @@ -84,7 +84,7 @@
-

반품교환정보 목록

+

배송/반품정보 목록

diff --git a/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/BndeUpdtU.jsp b/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/BndeUpdtU.jsp index 6f027969..183df261 100644 --- a/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/BndeUpdtU.jsp +++ b/src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/BndeUpdtU.jsp @@ -163,14 +163,14 @@ } - // 반품교환정보 선택여부 + // 배송/반품정보 선택여부 const cmnuseInfoUptAt = $('#cmnuseInfoUptAt').prop('checked') if(cmnuseInfoUptAt){ const cmnuseInfoInnb = $('div.cmnuseInfoInnb') const cmnuseInfoInnbSelect = $('#cmnuseInfoInnb option:selected') if(fn_is_empty(cmnuseInfoInnbSelect.val())){ cmnuseInfoInnb.focus() - alert('반품교환정보를 선택해 주세요') + alert('배송/반품정보를 선택해 주세요') return false; } } @@ -295,7 +295,7 @@ formData.append('expsrSetupFwords', expsrSetupFwords) } - //반품교환정보 선택 여부 + //배송/반품정보 선택 여부 fn_create_input('hidden', "cmnuseInfoUptAt", $('#cmnuseInfoUptAt').prop('checked')?'Y':'N', hiddenForm); //배송일 선택 여부 fn_create_input('hidden', "dlvyGroupUptAt", $('#dlvyGroupUptAt').prop('checked')?'Y':'N', hiddenForm); @@ -553,7 +553,7 @@ <%-- 상품 사진--%> <%-- 상세 설명--%> <%-- 모바일용 상세 설명--%> - 반품교환정보 + 배송/반품정보 배송 입점 마케팅 <%-- 추천 상품--%> @@ -893,13 +893,13 @@
-

반품교환정보

+

배송/반품정보

- + @@ -909,7 +909,7 @@ <%-- --%> -<%-- --%> +<%-- --%> <%-- + + + + + + + + + + + + + + + + + + +
반품교환정보배송/반품정보
- 반품교환정보 + 배송/반품정보
- @@ -932,7 +932,7 @@
반품교환정보 설명배송/반품정보 설명--%> <%--<%–
–%>--%> <%--<%– +
+
회원가입 안내문구 +
+ +
+
회원가입 주요혜택 +
+ +
+
회원가입 완료문구 +
+ +
+
구독서비스 안내문구 +
+ +
+
+
+
+ + +
+
+ + + + From f3918ed7b16641ae184bccf48b0c35f70c30a9ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9D=B4=EB=8C=80=ED=99=98?= Date: Thu, 30 Apr 2026 16:16:58 +0900 Subject: [PATCH 18/19] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=20>=20?= =?UTF-8?q?=EC=97=B0=EB=A0=B9=ED=99=95=EC=9D=B8=20=ED=8C=9D=EC=97=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/controller/MainController.java | 10 ++++ .../webapp/WEB-INF/views/comm/Include.jsp | 21 ++++++- .../WEB-INF/views/comm/mobile/Include.jsp | 56 +++++++++++++++++++ .../views/sopmal/main/AgeChkPopupR.jsp | 40 +++++++++++++ 4 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/sopmal/main/AgeChkPopupR.jsp diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java b/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java index 9df7bf53..aa2022d6 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java @@ -1015,4 +1015,14 @@ public class MainController { ); } + /** + * 연령확인 팝업 + * @return + */ + @Policy(AuthPolicy.PUBLIC) + @RequestMapping(value="/sopmal/main/selectAgeChkPopup", produces = MediaType.APPLICATION_JSON_VALUE) + public String selectAgeChkPopup(HttpServletRequest request) { + return Util.getDeviceType(request)+"/main/AgeChkPopupR"; + } + } \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/comm/Include.jsp b/src/main/webapp/WEB-INF/views/comm/Include.jsp index 54fd566a..bde31ad9 100644 --- a/src/main/webapp/WEB-INF/views/comm/Include.jsp +++ b/src/main/webapp/WEB-INF/views/comm/Include.jsp @@ -372,9 +372,8 @@ fn_reflesh_cart_cnt() - /*비밀번호 변경 알림 여부 확인*/ $(document).ready(function () { - + /*비밀번호 변경 알림 여부 확인*/ const url = ''; const originalUrl = window.location.href; let passwordAt = '<%=(String)session.getAttribute("passwordChngDeAt")%>' @@ -383,6 +382,15 @@ location.href = url + '?originalUrl=' + encodeURIComponent(originalUrl); } + /*연령확인 여부 확인*/ + let ageChked = getCookieValue("ageChk"); + if(!ageChked) { + fn_open_modal( + '#ageChkPopupDiv', + '#ageChkPopup', + '/sopmal/main/selectAgeChkPopup' + ); + } }) @@ -398,6 +406,7 @@ }%>
+
diff --git a/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp b/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp index 9000dfa2..dd170bff 100644 --- a/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp +++ b/src/main/webapp/WEB-INF/views/comm/mobile/Include.jsp @@ -90,6 +90,9 @@ <%--theme적용--%> "> +<%--font적용--%> + + <%--Web-App연동 스크립트--%> @@ -361,6 +364,8 @@ loadRecentSearches(); passwordChngDeAt(); + + ageChkAt(); fn_save_mbrdvc_info(${isAuthenticated}); }); @@ -470,6 +475,31 @@ } } + /*연령확인 여부 확인 */ + function ageChkAt() { + let ageChked = getCookieValue("ageChk"); + if(!ageChked) { + openModal('confirm_ageChk_alert'); + } + } + + const fn_ageChk_yes = function() { + closeModal('confirm_ageChk_alert') + document.cookie = "ageChk=true; path=/; max-age=86400"; + } + + const fn_ageChk_no = function() { + window.location.href = "https://m.search.naver.com/search.naver?query=사케일잔"; + } + + //쿠키 값 가져오기 + const getCookieValue = function(name) { + let matches = document.cookie.match( + new RegExp('(?:^|; )' + name + '=([^;]*)') + ); + return matches ? matches[1] : null; + } + // 최근 검색어 저장 function saveSearch(param) { let searches = JSON.parse(localStorage.getItem('recentSearches')) || []; @@ -755,6 +785,32 @@
+<%--연령확인 모달--%> + + <%--cutom 확인 모달--%>