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
2026-01-02 17:07:08 +09:00
parent 9407a4fb78 deb1ab8174
commit be349e305b
25 changed files with 460 additions and 289 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java
View File

@@ -291,6 +291,11 @@ public interface BOMbrMapper {
*/
public Integer selectBOMbrMbtlnbCompare(BOMbrVO mbrVO);
/**
* 회원 이메일 비교
* @param mbrVO
*/
public Integer selectBOMbrEmailCompare(BOMbrVO mbrVO);
/**
* 회원 이메일 수정

12
src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java
View File

@@ -500,6 +500,18 @@ public class BOMbrService {
return changeAt;
}
/**
* 회원 정보 수정 전 이메일 변경 여부 체크
*
* @param mbrVO
* @return
* @author
*/
public Integer selectBOMbrEmailCompare(BOMbrVO mbrVO) {
Integer changeAt = mapper.selectBOMbrMbtlnbCompare(mbrVO);
return changeAt;
}
/**
* 회원 아이디 수정
*

12
src/main/java/com/wb/domainserver/domain/sopmal/main/controller/MainController.java
View File

@@ -793,6 +793,18 @@ public class MainController {
return url;
}
/**
* 구독서비스 폼 이동
*
* @return
*/
@Policy(AuthPolicy.PUBLIC)
@RequestMapping(value = "/sopmal/main/selectSubscribeForm")
public String selectSubscribeForm(HttpServletRequest request) {
return Util.getDeviceType(request) + "/main/SubscribeR";
}
/**
* 자담유 > 네가지약속 (모바일)
*

19
src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/controller/MyMbrController.java
View File

@@ -62,6 +62,8 @@ import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import static com.wb.domainserver.util.string.StringUtil.isEmpty;
/**
*
* 마이페이지 회원
@@ -746,7 +748,10 @@ public class MyMbrController {
throw new WnbtRestException(ValidateResultConverter.convert(bindingResult, gconeMessageSource));
}
vo.setMbtlnb(vo.getMbtlnb().replace("-",""));
if(!isEmpty(vo.getMbtlnb())){
vo.setMbtlnb(vo.getMbtlnb().replace("-",""));
}
//모바일일 시 진행
if("mobile".equals(mymbrVO.getUtilDv())){
if("01".equals(user.getSysDvCd())){
@@ -762,11 +767,15 @@ public class MyMbrController {
// Map<String, Object> resultMap = responseHandler.handleResponseAsMap(
// sendToResrc.ofPost(RESRC.GCONEBO, "/gcone/mbr/mbr/selectBOMbrMbtlnbCompare", mymbrVO)
// );
int result = service.selectBOMbrMbtlnbCompare(vo);
// int result = service.selectBOMbrMbtlnbCompare(vo);
int result = service.selectBOMbrEmailCompare(vo);
if(result == 0){
if(!"Y".equals(mymbrVO.getMbtlnbChngAt())){
throw new WnbtRestException("휴대폰 인증이 필요합니다.");
if(!"Y".equals(mymbrVO.getEmailChngAt())){
throw new WnbtRestException("이메일 인증이 필요합니다.");
}
// if(!"Y".equals(mymbrVO.getMbtlnbChngAt())){
// throw new WnbtRestException("휴대폰 인증이 필요합니다.");
// }
}
}
@@ -854,7 +863,7 @@ public class MyMbrController {
bowithdrawalVO.setRegistIp(ip);
AnonymousUser user = MemberJwtContextHolder.getMemberInfo();
if (StringUtil.isEmpty(bowithdrawalVO.getSopmalCd())) {//사용자
if (isEmpty(bowithdrawalVO.getSopmalCd())) {//사용자
bowithdrawalVO.setSopmalCd(user.getSopmalCd());
}
bowithdrawalVO.setRegusr(user.getUserInnb());

7
src/main/java/com/wb/domainserver/domain/sopmal/mpage/mbr/vo/MyMbrVO.java
View File

@@ -61,6 +61,9 @@ public class MyMbrVO extends AbstractVO {
/** 휴대폰 번호 변경 여부*/
private String mbtlnbChngAt;
/** 이메일 변경 여부*/
private String emailChngAt;
/** SMS수신여부 */
private String smsRecptnAt;
@@ -68,7 +71,7 @@ public class MyMbrVO extends AbstractVO {
private String telnb;
/** 우편번호 */
@NotBlank(message = "우편번호")
// @NotBlank(message = "우편번호")
private String zip;
/** 도로명; 지번 */
@@ -82,7 +85,7 @@ public class MyMbrVO extends AbstractVO {
private String rnmAdres;
/** 상세주소 */
@NotBlank(message = "상세주소")
// @NotBlank(message = "상세주소")
private String dtlAdres;
/** 성별 */

9
src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml
View File

@@ -726,6 +726,15 @@
AND MBTLNB = HEX(AES_ENCRYPT(#{mbtlnb}, #{secretKey}))
</select>
<!--회원 핸드폰 번호와 바뀐 핸드폰 번호 비교-->
<select id = "selectBOMbrEmailCompare" parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO">
SELECT COUNT(1)
FROM GC_MEMBER MBR
WHERE MBR.MBR_INNB = #{mbrInnb}
AND MBR.MBR_DV_CD = #{mbrDvCd}
AND EMAIL = HEX(AES_ENCRYPT(#{email}, #{secretKey}))
</select>
<!-- 회원 정보 수정 -->
<update id="updateBOMbrInfoUpdt" parameterType="com.wb.domainserver.domain.gcone.mbr.mbr.vo.BOMbrVO">
UPDATE GC_MEMBER SET

2
src/main/resources/static/login/sopmall/pc/css/default.css
View File

@@ -14084,7 +14084,7 @@ main {
background-color: #ffffff;
overflow: hidden;
height: 44px;
padding-right: 16px;
padding-right: 32px;
border: 1px solid #dee2e6;
border-radius: 4px;
text-align: right;

2
src/main/resources/static/pc/css/default.css
View File

@@ -14175,7 +14175,7 @@ main {
background-color: #ffffff;
overflow: hidden;
height: 44px;
padding-right: 16px;
padding-right: 35px;
border: 1px solid #dee2e6;
border-radius: 4px;
text-align: right;

2
src/main/resources/static/sopmall/pc/css/default.css
View File

@@ -14083,7 +14083,7 @@ main {
background-color: #ffffff;
overflow: hidden;
height: 44px;
padding-right: 16px;
padding-right: 35px;
border: 1px solid #dee2e6;
border-radius: 4px;
text-align: right;

6
src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsC.jsp
View File

@@ -2671,14 +2671,14 @@
<caption>판매정보</caption>
<colgroup>
<col style="width: 12%;">
<col>
<col style="width: 38%;">
<col style="width: 12%;">
<col>
<col style="width: 38%;">
</colgroup>
<tbody>
<tr>
<th>판매 상태</th>
<td colspan="2">
<td colspan="4">
<div class="td-inner">
<div class="custom-radio-container">
<c:forEach items="${resultMap.goodsDftinfoSttusList}" var="goodsDftinfoSttus" varStatus="status">

4
src/main/webapp/WEB-INF/views/mngr/goods/goodsmngr/GoodsCopyC.jsp
View File

@@ -2843,9 +2843,9 @@
<caption>판매정보</caption>
<colgroup>
<col style="width: 12%;">
<col>
<col style="width: 38%;">
<col style="width: 12%;">
<col>
<col style="width: 38%;">
</colgroup>
<tbody>
<tr>

2
src/main/webapp/WEB-INF/views/mngr/promtn/purchs/PurchsEvtRegistC.jsp
View File

@@ -1507,7 +1507,7 @@ since : 2024-01-30 추지훈 최초 생성
<colgroup>
<col style="width: 6%;">
<col style="width: 23%;">
<col style="width: 20%;">
<col style="width: 23%;">
<col style="width: 11%;">
<col style="width: auto;">
</colgroup>

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

@@ -3949,10 +3949,10 @@
<i class="icon icon_wish <c:if test="${resultMap.goodsDtl.isWish eq '1'}">active</c:if>"></i>
<span class="visually-hidden">위시리스트 추가</span>
</button>
<button class="productDetailInfo__miscControls__btn" id="snsShare">
<i class="icon icon_share"></i>
<span class="visually-hidden">공유하기</span>
</button>
<%-- <button class="productDetailInfo__miscControls__btn" id="snsShare">--%>
<%-- <i class="icon icon_share"></i>--%>
<%-- <span class="visually-hidden">공유하기</span>--%>
<%-- </button>--%>
</div>
</div>
<div class="productDetailInfo__price">

9
src/main/webapp/WEB-INF/views/sopmal/goods/GoodsSrchRForm.jsp
View File

@@ -71,12 +71,8 @@
startPric = 5000;
endPric = 15000;
break;
case '15000 ~ 30000' + curUnit:
case '15000' + curUnit + ' 이상':
startPric = 15000;
endPric = 30000;
break;
case '30000' + curUnit + ' 이상':
startPric = 30000;
endPric = null;
break;
default:
@@ -1077,8 +1073,7 @@
<button value="btn1" class="searchPrice__select__btn <c:if test="${resultMap.BOGoodsVO.priceRange == 'btn1'}">selected</c:if>">~ 1000${curUnit}</button>
<button value="btn2" class="searchPrice__select__btn <c:if test="${resultMap.BOGoodsVO.priceRange == 'btn2'}">selected</c:if>">1000 ~ 5000${curUnit}</button>
<button value="btn3" class="searchPrice__select__btn <c:if test="${resultMap.BOGoodsVO.priceRange == 'btn3'}">selected</c:if>">5000 ~ 15000${curUnit}</button>
<button value="btn4" class="searchPrice__select__btn <c:if test="${resultMap.BOGoodsVO.priceRange == 'btn4'}">selected</c:if>">15000 ~ 30000${curUnit}</button>
<button value="btn5" class="searchPrice__select__btn <c:if test="${resultMap.BOGoodsVO.priceRange == 'btn5'}">selected</c:if>">30000${curUnit} 이상</button>
<button value="btn4" class="searchPrice__select__btn <c:if test="${resultMap.BOGoodsVO.priceRange == 'btn4'}">selected</c:if>">15000${curUnit} 이상</button>
</div>
<div class="searchPrice__range">
<div class="searchPrice__rangeInput">

124
src/main/webapp/WEB-INF/views/sopmal/main/SubscribeR.jsp Normal file
View File

@@ -0,0 +1,124 @@
<%@ 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="spring" uri="http://www.springframework.org/tags" %>
<%--
Class Name : SubscribeR.jsp
Description : 구독 목록 폼
Modification Information
수정일 수정자 수정내용
------- -------- ---------------------------
2025-12-31 이대환 최초 생성
--%>
<!DOCTYPE html>
<html lang="ko">
<head>
<jsp:include page="/WEB-INF/views/comm/Include.jsp"/>
</head>
<script>
</script>
<style>
.container {
display: flex;
width: 100%;
height: 200px;
border: 1px solid #e9ecef;
}
.box {
flex: 1;
flex-direction: column;
border-right: 1px solid #e9ecef;
display: flex;
padding: 32px;
box-sizing: border-box;
}
.box:last-child {
display: flex;
border-right: none;
justify-content: center;
}
.box > span {
width: 100%;
margin-bottom: 16px;
}
.box ul {
padding-left: 20px;
margin: 0;
}
.box ul li {
list-style-type: disc;
margin-bottom: 8px;
}
.box button {
background-color: #000;
color: #fff;
border: none;
padding: 12px 24px;
border-radius: 6px;
cursor: pointer;
font-size: 14px;
text-align: center;
}
.box button:hover {
opacity: 0.85;
}
</style>
<body>
<%-- 공통 Header --%>
<jsp:include page="/WEB-INF/views/comm/Header.jsp"/>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<!-- 메인 컨텐츠 영역 -->
<main>
<div class="sub-wrapper">
<div class="sub-content">
<form>
<h2 class="subList__title">구독 서비스</h2>
<div class="container">
<div class="box">
<span>구독서비스</span>
<div class="select-box">
<select class="" title="">
<option value="" selected>구독서비스 안내</option>
<option value="">구독서비스 준비중</option>
<option value="">프리미엄 구독 (잔여 : 100)</option>
<option value="">Top10 선정 (잔여 : 10)</option>
<option value="">Top100 선정 (잔여 : 100)</option>
</select>
</div>
</div>
<div class="box">
<span>구독서비스 내역</span>
<ul>
<li>구독기간 : 12개월</li>
<li>배송횟수 : 12회</li>
<li>배송주기 : 매달 1회</li>
<li>상품금액 : 99,000${curUnit} <span style="color: red">58%</span></li>
</ul>
</div>
<div class="box">
<button>구독하기</button>
</div>
</div>
<div class="ck-content">
</div>
</form>
</div>
</div>
</main>
<jsp:include page="/WEB-INF/views/comm/Footer.jsp"/>
</body>
</html>

100
src/main/webapp/WEB-INF/views/sopmal/mpage/mbr/MbrInfoUpdtU.jsp
View File

@@ -50,7 +50,7 @@
fn_alert_hide($("#email"), $("#emailAlert"));
fn_alert_hide($("#mbtlCert"), $("#mbtlCertAlert"));
// fn_alert_hide($("#id"), $("#emailAlert"));
fn_alert_hide($("#dtlAdres"), $("#postcodeAlert"));
// fn_alert_hide($("#dtlAdres"), $("#postcodeAlert"));
// fn_alert_hide_selected();
//휴대폰번호 포매팅
@@ -765,16 +765,16 @@
/* ********************************************************
* 우편번호 찾기
******************************************************** */
const fn_set_postcode = function(data) {
$('#postcode').val(data.postcode);
if (data.addressType == '02') {
$('#adresDv').val(data.addressType);
$('#address').val(data.jibunAddress);
} else if (data.addressType == '01') {
$('#adresDv').val(data.addressType);
$('#address').val(data.roadAddress+data.extraAddress);
}
}
// const fn_set_postcode = function(data) {
// $('#postcode').val(data.postcode);
// if (data.addressType == '02') {
// $('#adresDv').val(data.addressType);
// $('#address').val(data.jibunAddress);
// } else if (data.addressType == '01') {
// $('#adresDv').val(data.addressType);
// $('#address').val(data.roadAddress+data.extraAddress);
// }
// }
/* ********************************************************
* 외부연동 로그인 ( 네이버, 카카오 )
@@ -826,18 +826,18 @@
// return;
// }
if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') {
alert('우편번호를 선택해 주세요.');
$("#postcodeAlert").show();
document.getElementById('postcodeBtn').scrollIntoView();
return;
}
// if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') {
// alert('우편번호를 선택해 주세요.');
// $("#postcodeAlert").show();
// document.getElementById('postcodeBtn').scrollIntoView();
// return;
// }
if ($('#dtlAdres').val().trim() == '') {
alert('상세주소를 입력해 주세요.');
$('#dtlAdres').focus();
return;
}
// if ($('#dtlAdres').val().trim() == '') {
// alert('상세주소를 입력해 주세요.');
// $('#dtlAdres').focus();
// return;
// }
const data = $("#mbrInfoUpdtForm").serialize();
if (confirm('회원 정보를 <spring:message code="confirm.common.update"/>')) {
@@ -1265,34 +1265,34 @@
<p class="signUp__inputBox__alertText" id="brthDeAlert" style="display: none;">생년월을 선택해 주세요.</p>
</td>
</tr>
<tr>
<th>
<span class="editAccount__title">주소<span class="required-asterisk">*</span></span>
</th>
<td>
<div class="inputAddress">
<div class="inputAddress__postalCode">
<input type="text" class="input-text" id="postcode" name="zip" title="우편번호" placeholder="우편번호"
value="<c:out value="${ resultMap.result.zip }"/>" readonly>
<button type="button" id="postcodeBtn" class="btn md theme outline" onclick="fn_select_postcode(fn_set_postcode);"><spring:message code="button.zipcode"/></button>
</div>
<input type="text" class="input-text full" id="address" name="lnbAdres" title="주소" placeholder="주소"
<c:choose>
<c:when test="${ resultMap.result.adresDv eq '01'}">
value="<c:out value="${ resultMap.result.rnmAdres }"/>"
</c:when>
<c:when test="${ resultMap.result.adresDv eq '02'}">
value="<c:out value="${ resultMap.result.lnbAdres }"/>"
</c:when>
</c:choose>
readonly>
<input type="text" class="input-text full" id="dtlAdres" name="dtlAdres" title="상세주소" placeholder="나머지 주소를 입력해 주세요."
value="<c:out value="${ resultMap.result.dtlAdres }"/>">
<input type="hidden" id="adresDv" name="adresDv" value="${ resultMap.result.adresDv }">
</div>
<p class="signUp__inputBox__alertText" id="postcodeAlert">주소를 입력해 주세요.</p>
</td>
</tr>
<%-- <tr>--%>
<%-- <th>--%>
<%-- <span class="editAccount__title">주소<span class="required-asterisk">*</span></span>--%>
<%-- </th>--%>
<%-- <td>--%>
<%-- <div class="inputAddress">--%>
<%-- <div class="inputAddress__postalCode">--%>
<%-- <input type="text" class="input-text" id="postcode" name="zip" title="우편번호" placeholder="우편번호"--%>
<%-- value="<c:out value="${ resultMap.result.zip }"/>" readonly>--%>
<%-- <button type="button" id="postcodeBtn" class="btn md theme outline" onclick="fn_select_postcode(fn_set_postcode);"><spring:message code="button.zipcode"/></button>--%>
<%-- </div>--%>
<%-- <input type="text" class="input-text full" id="address" name="lnbAdres" title="주소" placeholder="주소"--%>
<%-- <c:choose>--%>
<%-- <c:when test="${ resultMap.result.adresDv eq '01'}">--%>
<%-- value="<c:out value="${ resultMap.result.rnmAdres }"/>"--%>
<%-- </c:when>--%>
<%-- <c:when test="${ resultMap.result.adresDv eq '02'}">--%>
<%-- value="<c:out value="${ resultMap.result.lnbAdres }"/>"--%>
<%-- </c:when>--%>
<%-- </c:choose>--%>
<%-- readonly>--%>
<%-- <input type="text" class="input-text full" id="dtlAdres" name="dtlAdres" title="상세주소" placeholder="나머지 주소를 입력해 주세요."--%>
<%-- value="<c:out value="${ resultMap.result.dtlAdres }"/>">--%>
<%-- <input type="hidden" id="adresDv" name="adresDv" value="${ resultMap.result.adresDv }">--%>
<%-- </div>--%>
<%-- <p class="signUp__inputBox__alertText" id="postcodeAlert">주소를 입력해 주세요.</p>--%>
<%-- </td>--%>
<%-- </tr>--%>
<tr>
<th>
<span class="editAccount__title">마케팅 수신동의</span>

11
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/GoodsSlcPopupR.jsp
View File

@@ -16,7 +16,7 @@
------- -------- ---------------------------
2024-02-27 추지훈 최초 생성
--%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<script defer>
//상품 타이틀, 수량, 가격 저장하는 배열
// 배열 순서 -> [상품명, 수량, 1개당 가격, 상품 총가격(=수량x개당가격), 추가정보(색상, 사이즈등)]
@@ -95,13 +95,14 @@
//
// //배열 내용을 바탕으로 각 아이템 텍스트 변경
function updateCartCounters() {
var curUnit = '${curUnit}';
$(".modal .productDetailInfo__count").each(function () {
var $counter = $(this);
var $index = $counter.index();
var $number = $counter.find(".productDetailInfo__count__amountNumber");
var $price = $counter.find(".productDetailInfo__count__priceNum");
$number.text(productArr[$index][1]);
$price.text(addComma(productArr[$index][3]) + "원");
$price.text(addComma(productArr[$index][3]) + curUnit);
});
updateCartTotalPrice(); // 총 상품금액 업데이트
@@ -284,7 +285,7 @@
</span>
<span class="product-unit-price__current">
<span class="comma"> <fmt:formatNumber value="${resultMap.goodsDtl.slepric - resultMap.goodsDtl.evtAditDscntAmt}"/></span>
<span class="priceUnit">원</span></span>
<span class="priceUnit">${curUnit}</span></span>
</div>
<div class="product-unit-price__sale">
<span class="percent">
@@ -323,7 +324,7 @@
<c:if test="${goodsOpt01.disableAt eq 'Y'}"> <span>(품절)</span></c:if>
</div>
<div class="productDetailInfo__option__right">
<span class="productDetailInfo__option__price"><span class="comma"><fmt:formatNumber value="${goodsOpt01.slepric}"/></span> <span class="priceUnit"> 원</span></span>
<span class="productDetailInfo__option__price"><span class="comma"><fmt:formatNumber value="${goodsOpt01.slepric}"/></span> <span class="priceUnit"> ${curUnit}</span></span>
<span class="productDetailInfo__option__monthly-payment"><c:out value="${goodsOpt01.optnInfo}"/></span>
</div>
</c:if>
@@ -454,7 +455,7 @@
<span class="product-total__text">총 상품금액</span>
<span class="product-total__price">
<span class="product-total__price__totalPriceNum">0</span>
<span class="won">원</span>
<span class="won">${curUnit}</span>
</span>
</div>
<c:choose>

72
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDlvyListRList.jsp
View File

@@ -68,43 +68,43 @@
</c:choose>
</c:if>
</div>
<div class="orderList__btnControls">
<c:choose>
<c:when test="${order.ordrSttusCd == 15}">
<a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">주문취소</a>
<c:if test="${ order.ordrTyCd != '05' }">
<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>
</c:if>
</c:when>
<c:when test="${order.ordrSttusCd > 24 && order.ordrSttusCd < 34}">
<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>
<c:if test="${ order.ordrTyCd != '05' }">
<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>
</c:if>
</c:when>
<%-- <div class="orderList__btnControls">--%>
<%-- <c:choose>--%>
<%-- <c:when test="${order.ordrSttusCd == 15}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_post_cancl_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">주문취소</a>--%>
<%-- <c:if test="${ order.ordrTyCd != '05' }">--%>
<%-- <a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>--%>
<%-- </c:if>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 24 && order.ordrSttusCd < 34}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>--%>
<%-- <c:if test="${ order.ordrTyCd != '05' }">--%>
<%-- <a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${order.ordrDlvyInnb}"/>', '<c:out value="${order.mbrInnb}"/>', '<c:out value="${order.mbrDvCd}"/>');" class="btn-ordr-sttus btn outline sm full">배송지 변경</a>--%>
<%-- </c:if>--%>
<%-- </c:when>--%>
<c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 55}">
<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>
<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>
</c:when>
<c:when test="${order.ordrSttusCd > 54 && order.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">
<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>
<c:if test="${ order.purchsDcsnAt eq 'Y' }">
<%-- <a href="javascript:void(0);" onclick="fn_call_refund_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>','<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>--%>
<a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>
</c:if>
<c:if test="${ order.reviewAt eq 'Y' }">
<a href="<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>" class="btn-ordr-sttus btn theme sm full">리뷰작성</a>
</c:if>
<c:if test="${ order.purchsDcsnAt eq 'Y' }">
<a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn theme sm full">구매확정</a>
</c:if>
</c:when>
<c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">
<a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>
</c:when>
</c:choose>
</div>
<%-- <c:when test="${order.ordrSttusCd > 34 && order.ordrSttusCd < 55}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '', '<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 54 && order.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">--%>
<%-- <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" class="btn outline sm full">배송조회</a>--%>
<%-- <c:if test="${ order.purchsDcsnAt eq 'Y' }">--%>
<%--&lt;%&ndash; <a href="javascript:void(0);" onclick="fn_call_refund_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>','<c:out value="${order.ordrRceptDt}"/>', '<c:out value="${order.setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>&ndash;%&gt;--%>
<%-- <a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn gray sm full">반품신청</a>--%>
<%-- </c:if>--%>
<%-- <c:if test="${ order.reviewAt eq 'Y' }">--%>
<%-- <a href="<c:url value="/sopmal/mpage/act/selectMyRvwInqireForm"/>" class="btn-ordr-sttus btn theme sm full">리뷰작성</a>--%>
<%-- </c:if>--%>
<%-- <c:if test="${ order.purchsDcsnAt eq 'Y' }">--%>
<%-- <a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>');" class="btn-ordr-sttus btn theme sm full">구매확정</a>--%>
<%-- </c:if>--%>
<%-- </c:when>--%>
<%-- <c:when test="${order.ordrSttusCd > 84 && order.ordrSttusCd < 100}">--%>
<%-- <a class="btn full orderList__status cancel" style="background-color:transparent;"><c:out value="${order.ordrSttusNm}"/></a>--%>
<%-- </c:when>--%>
<%-- </c:choose>--%>
<%-- </div>--%>
</div>
</div>
</div>

4
src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp
View File

@@ -1214,7 +1214,7 @@
<col style="width: 40px;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 12%;">
<col style="width: 10%;">
<col style="width: 10%;">
</colgroup>
@@ -1365,7 +1365,7 @@
<col style="width: 40px;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 10%;">
<col style="width: 12%;">
<col style="width: 10%;">
<col style="width: 10%;">
</colgroup>

136
src/main/webapp/WEB-INF/views/sopmal/ordr/SpbkPtinR.jsp
View File

@@ -32,12 +32,12 @@
<!--************************************ 네이버페이 시작 *********************************-->
<!--[ 네이버 구매하기버튼 스크립트 ]-->
<c:if test="${profiles eq 'stage'}">
<script type="text/javascript" src="https://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>
</c:if>
<c:if test="${profiles ne 'stage'}">
<script type="text/javascript" src="http://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>
</c:if>
<%-- <c:if test="${profiles eq 'stage'}">--%>
<%-- <script type="text/javascript" src="https://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>--%>
<%-- </c:if>--%>
<%-- <c:if test="${profiles ne 'stage'}">--%>
<%-- <script type="text/javascript" src="http://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>--%>
<%-- </c:if>--%>
<!--************************************ 네이버페이 종료 *********************************-->
<script>
@@ -361,44 +361,44 @@
$('#cartOrderList').empty().html(html);
const itemCnt = $('.cartOrder__list').find('.cartItem').length;
// const itemCnt = $('.cartOrder__list').find('.cartItem').length;
if (0 === itemCnt ) {
$('#_naverPayArea').hide();
}else{
let naverCheck = false;
$('.cartOrder__list').find('.cartItem').each(function(){
const tr = $(this).closest('tr');
const _price = $(tr).find('.cartItem__afterPrice').text().trim();
<%--if (0 === itemCnt ) {--%>
<%-- $('#_naverPayArea').hide();--%>
<%--}else{--%>
<%-- --%>
<%-- let naverCheck = false;--%>
<%-- $('.cartOrder__list').find('.cartItem').each(function(){--%>
<%-- const tr = $(this).closest('tr');--%>
<%-- const _price = $(tr).find('.cartItem__afterPrice').text().trim();--%>
/* *
if( "${naverPayYn}" == "N" || _price === "0" + curUnit ) {
naverCheck = true;
}
*/
<%-- /* *--%>
<%-- if( "${naverPayYn}" == "N" || _price === "0" + curUnit ) {--%>
<%-- naverCheck = true;--%>
<%-- }--%>
<%-- */--%>
// 네이버페이 검수용 'npay2024' 아이디만 검수 가능하도록 하기위해 임시
const mbrId = $('#mbrId').val();
console.log("mbrId: " + mbrId);
if(mbrId == "npay2024"){
console.log("naverCheck false");
naverCheck = false;
}else{
console.log("naverCheck true");
if( "${naverPayYn}" == "N" || _price === "0" + curUnit ) {
naverCheck = true;
}else{
naverCheck = false;
}
}
});
<%-- // 네이버페이 검수용 'npay2024' 아이디만 검수 가능하도록 하기위해 임시--%>
<%-- const mbrId = $('#mbrId').val();--%>
<%-- console.log("mbrId: " + mbrId);--%>
<%-- if(mbrId == "npay2024"){--%>
<%-- console.log("naverCheck false");--%>
<%-- naverCheck = false;--%>
<%-- }else{--%>
<%-- console.log("naverCheck true");--%>
<%-- if( "${naverPayYn}" == "N" || _price === "0" + curUnit ) {--%>
<%-- naverCheck = true;--%>
<%-- }else{--%>
<%-- naverCheck = false;--%>
<%-- }--%>
<%-- }--%>
<%-- });--%>
if(naverCheck){
$('#_naverPayArea').hide();
}else{
$('#_naverPayArea').show();
}
// if(naverCheck){
// $('#_naverPayArea').hide();
// }else{
// $('#_naverPayArea').show();
// }
//장바구니 전체 선택 되도록 변경 - 옵션변경시에도 전체선택됨
@@ -416,7 +416,7 @@
}
}
// }
}
});
@@ -1491,33 +1491,33 @@
<%-- </c:if>--%>
<%-- </c:if>--%>
</div>
<div style="margin-top: 24px; text-align: center; display: none;" id ="_naverPayArea">
<script type="text/javascript">//<![CDATA[
var notPayMode = false;
var enable = 'Y';
var buy_npay = buy_nc;
var goods_status = '';
// 품절등과 같은 이유에 따라 버튼을 비활성화할 필요가 있을 경우
if(notPayMode){
enable = 'N';
buy_npay = not_buy_nc;
wishlist_nc = not_buy_nc;
}
//버튼타입,버튼색, 버튼갯수 프로퍼티에서 읽어오기
naver.NaverPayButton.apply({
BUTTON_KEY:"{buttonKey}", // 알파랩 - 네이버페이에서 할당받은 버튼 KEY를 입력하세요. 뉴트리:BUTTON_KEY:"58008618-E3CD-40F7-AE8D-37D624935098"
TYPE: "A", // 템플릿을 확인하시고 원하는 타입의 버튼을 선택
COLOR: 1, // 버튼의 색 설정
COUNT: 1, // 버튼 개수 설정. 구매하기 버튼만 있으면 1, 찜하기 버튼과 함께 있으면 2를 입력한다.
ENABLE: enable, // 품절등과 같은 이유에 따라 버튼을 비활성화할 필요가 있을 경우
BUY_BUTTON_HANDLER: buy_npay, // 구매하기 버튼 이벤트 Handler 함수 등록, 품절인 경우 not_buy_nc 함수 사용
"":""
});
//]]>
</script>
</div>
<%-- <div style="margin-top: 24px; text-align: center; display: none;" id ="_naverPayArea">--%>
<%-- <script type="text/javascript">//<![CDATA[--%>
<%-- --%>
<%-- var notPayMode = false;--%>
<%-- var enable = 'Y';--%>
<%-- var buy_npay = buy_nc;--%>
<%-- var goods_status = '';--%>
<%-- --%>
<%-- // 품절등과 같은 이유에 따라 버튼을 비활성화할 필요가 있을 경우--%>
<%-- if(notPayMode){--%>
<%-- enable = 'N';--%>
<%-- buy_npay = not_buy_nc;--%>
<%-- wishlist_nc = not_buy_nc;--%>
<%-- }--%>
<%-- //버튼타입,버튼색, 버튼갯수 프로퍼티에서 읽어오기--%>
<%-- naver.NaverPayButton.apply({--%>
<%-- BUTTON_KEY:"{buttonKey}", // 알파랩 - 네이버페이에서 할당받은 버튼 KEY를 입력하세요. 뉴트리:BUTTON_KEY:"58008618-E3CD-40F7-AE8D-37D624935098"--%>
<%-- TYPE: "A", // 템플릿을 확인하시고 원하는 타입의 버튼을 선택--%>
<%-- COLOR: 1, // 버튼의 색 설정--%>
<%-- COUNT: 1, // 버튼 개수 설정. 구매하기 버튼만 있으면 1, 찜하기 버튼과 함께 있으면 2를 입력한다.--%>
<%-- ENABLE: enable, // 품절등과 같은 이유에 따라 버튼을 비활성화할 필요가 있을 경우--%>
<%-- BUY_BUTTON_HANDLER: buy_npay, // 구매하기 버튼 이벤트 Handler 함수 등록, 품절인 경우 not_buy_nc 함수 사용--%>
<%-- "":""--%>
<%-- });--%>
<%-- //]]>--%>
<%-- </script>--%>
<%-- </div>--%>
</div>
</div>

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

@@ -3733,11 +3733,11 @@ const fn_move_goodsDtl_login = () => {
<i class="icon icon_wish <c:if test="${resultMap.goodsDtl.isWish eq '1'}">active</c:if>"></i>
<span class="visually-hidden">위시리스트 추가</span>
</button>
<button type="button" class="productDetailInfo__miscControls__btn"
data-micromodal-trigger="snsSharePop">
<i class="icon icon_share"></i>
<span class="visually-hidden">공유하기</span>
</button>
<%-- <button type="button" class="productDetailInfo__miscControls__btn"--%>
<%-- data-micromodal-trigger="snsSharePop">--%>
<%-- <i class="icon icon_share"></i>--%>
<%-- <span class="visually-hidden">공유하기</span>--%>
<%-- </button>--%>
</div>
</div>
<div class="productDetailInfo__price">

94
src/main/webapp/WEB-INF/views/sopmal_m/mpage/mbr/MbrInfoUpdtU.jsp
View File

@@ -48,7 +48,7 @@
fn_alert_hide($("#email"), $("#emailAlert"));
fn_alert_hide($("#mbtlCert"), $("#mbtlCertAlert"));
// fn_alert_hide($("#id"), $("#emailAlert"));
fn_alert_hide($("#dtlAdres"), $("#postcodeAlert"));
// fn_alert_hide($("#dtlAdres"), $("#postcodeAlert"));
// fn_alert_hide_selected();
$('button').on('click', function(e) {
@@ -849,17 +849,17 @@
/* ********************************************************
* 우편번호 찾기
******************************************************** */
const fn_set_postcode = function(data) {
$('#postcode').val(data.postcode);
if (data.addressType == '02') {
$('#adresDv').val(data.addressType);
$('#address').val(data.jibunAddress);
} else if (data.addressType == '01') {
$('#adresDv').val(data.addressType);
$('#address').val(data.roadAddress+data.extraAddress);
}
closeModal("postModal");
}
// const fn_set_postcode = function(data) {
// $('#postcode').val(data.postcode);
// if (data.addressType == '02') {
// $('#adresDv').val(data.addressType);
// $('#address').val(data.jibunAddress);
// } else if (data.addressType == '01') {
// $('#adresDv').val(data.addressType);
// $('#address').val(data.roadAddress+data.extraAddress);
// }
// closeModal("postModal");
// }
/* ********************************************************
* 외부연동 로그인 ( 네이버, 카카오 )
@@ -911,18 +911,18 @@
// return;
// }
if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') {
fn_alert_show('우편번호를 선택해 주세요.');
$("#postcodeAlert").show();
document.getElementById('postcodeBtn').scrollIntoView();
return;
}
// if ($('#postcode').val().trim() == '' || $('#address').val().trim() == '') {
// fn_alert_show('우편번호를 선택해 주세요.');
// $("#postcodeAlert").show();
// document.getElementById('postcodeBtn').scrollIntoView();
// return;
// }
if ($('#dtlAdres').val().trim() == '') {
fn_alert_show('상세주소를 입력해 주세요.');
$('#dtlAdres').focus();
return;
}
// if ($('#dtlAdres').val().trim() == '') {
// fn_alert_show('상세주소를 입력해 주세요.');
// $('#dtlAdres').focus();
// return;
// }
const data = $("#mbrInfoUpdtForm").serialize();
if (confirm('회원 정보를 <spring:message code="confirm.common.update"/>')) {
@@ -1312,30 +1312,30 @@
</div>
</div>
</div>
<div class="userForm__inputBox__item">
<div class="userForm__inputBox__itemTitle">주소<span class="required-asterisk">*</span></div>
<div class="inputAddress">
<div class="inputAddress__postalCode">
<input type="text" class="input-text" id="postcode" name="zip" title="우편번호" placeholder="우편번호"
value="<c:out value="${ resultMap.result.zip }"/>" readonly>
<button type="button" id="postcodeBtn" class="btn md theme outline" onclick="fn_select_post_mobile(fn_set_postcode, '#postCodeCn', '#modalDiv'); return false;"><spring:message code="button.zipcode"/></button>
</div>
<input type="text" class="input-text full" id="address" name="lnbAdres" title="주소" placeholder="주소"
<c:choose>
<c:when test="${ resultMap.result.adresDv eq '01'}">
value="<c:out value="${ resultMap.result.rnmAdres }"/>"
</c:when>
<c:when test="${ resultMap.result.adresDv eq '02'}">
value="<c:out value="${ resultMap.result.lnbAdres }"/>"
</c:when>
</c:choose>
readonly>
<input type="text" class="input-text full" id="dtlAdres" name="dtlAdres" title="상세주소" placeholder="나머지 주소를 입력해 주세요."
value="<c:out value="${ resultMap.result.dtlAdres }"/>">
<input type="hidden" id="adresDv" name="adresDv" value="${ resultMap.result.adresDv }">
</div>
<p class="userForm__inputBox__alertText" id="postcodeAlert" style="display: none;">주소를 입력해 주세요.</p>
</div>
<%-- <div class="userForm__inputBox__item">--%>
<%-- <div class="userForm__inputBox__itemTitle">주소<span class="required-asterisk">*</span></div>--%>
<%-- <div class="inputAddress">--%>
<%-- <div class="inputAddress__postalCode">--%>
<%-- <input type="text" class="input-text" id="postcode" name="zip" title="우편번호" placeholder="우편번호"--%>
<%-- value="<c:out value="${ resultMap.result.zip }"/>" readonly>--%>
<%-- <button type="button" id="postcodeBtn" class="btn md theme outline" onclick="fn_select_post_mobile(fn_set_postcode, '#postCodeCn', '#modalDiv'); return false;"><spring:message code="button.zipcode"/></button>--%>
<%-- </div>--%>
<%-- <input type="text" class="input-text full" id="address" name="lnbAdres" title="주소" placeholder="주소"--%>
<%-- <c:choose>--%>
<%-- <c:when test="${ resultMap.result.adresDv eq '01'}">--%>
<%-- value="<c:out value="${ resultMap.result.rnmAdres }"/>"--%>
<%-- </c:when>--%>
<%-- <c:when test="${ resultMap.result.adresDv eq '02'}">--%>
<%-- value="<c:out value="${ resultMap.result.lnbAdres }"/>"--%>
<%-- </c:when>--%>
<%-- </c:choose>--%>
<%-- readonly>--%>
<%-- <input type="text" class="input-text full" id="dtlAdres" name="dtlAdres" title="상세주소" placeholder="나머지 주소를 입력해 주세요."--%>
<%-- value="<c:out value="${ resultMap.result.dtlAdres }"/>">--%>
<%-- <input type="hidden" id="adresDv" name="adresDv" value="${ resultMap.result.adresDv }">--%>
<%-- </div>--%>
<%-- <p class="userForm__inputBox__alertText" id="postcodeAlert" style="display: none;">주소를 입력해 주세요.</p>--%>
<%-- </div>--%>
<div class="userForm__inputBox__item">
<div class="userForm__inputBox__itemTitle">마케팅 수신 동의
</div>

9
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/GoodsSlcPopupR.jsp
View File

@@ -16,7 +16,7 @@
------- -------- ---------------------------
2024-02-27 추지훈 최초 생성
--%>
<spring:eval expression="@environment.getProperty('currency-unit.default')" var="curUnit"/>
<script defer>
fn_set_niceSelect_datePicker('.select-box')
/*************************************************************
@@ -193,13 +193,14 @@
//배열 내용을 바탕으로 각 아이템 텍스트 변경
function updateCounters() {
var curUnit = '${curUnit}';
$(".productOption .product-count").each(function () {
var $counter = $(this);
var $index = $counter.index();
var $number = $counter.find(".product-count__amount-number");
var $price = $counter.find(".product-count__priceNum");
$number.text(productArr[$index][1]);
$price.text(addComma(productArr[$index][3]) + "원");
$price.text(addComma(productArr[$index][3]) + curUnit);
});
updateTotalPrice(); // 총 상품금액 업데이트
@@ -285,7 +286,7 @@
<c:if test="${goodsOpt01.disableAt eq 'Y'}"> <span>(품절)</span></c:if>
</div>
<div class="product-option__right">
<span class="product-option__price"><fmt:formatNumber value="${goodsOpt01.slepric}"/>원</span>
<span class="product-option__price"><fmt:formatNumber value="${goodsOpt01.slepric}"/>${curUnit}</span>
<span class="product-option__monthly-payment">${goodsOpt01.optnInfo}</span>
</div>
</c:if>
@@ -385,7 +386,7 @@
<span class="product-total__text">총 상품금액</span>
<span class="product-total__price">
<span class="productDetailInfo__priceTotal__totalPriceNum">0</span><span
class="won">원</span></span>
class="won">${curUnit}</span></span>
</div>
<c:choose>
<c:when test="${resultMap.goodsDtl.buttonRplcWordsUseAt ne 'Y'}">

66
src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDlvyListR.jsp
View File

@@ -168,48 +168,48 @@
div += ' </div>';
div += ' </div>';
div += ' </div>';
div += ' <div class="orderListItem__btnControls">';
<%-- div += ' <div class="orderListItem__btnControls">';--%>
const ordrSttusCd = parseInt(row.ordrSttusCd);
const ordrTyCd = parseInt(row.ordrTyCd);
<%-- const ordrSttusCd = parseInt(row.ordrSttusCd);--%>
<%-- const ordrTyCd = parseInt(row.ordrTyCd);--%>
if (15 === ordrSttusCd) {
div += '<a href="javascript:void(0);" onclick="fn_post_cancl_ordr_confirm(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + ordrSttusCd + '\');" class="btn-ordr-sttus btn gray">주문취소</a>';
if ('05' != ordrTyCd) {
div += '<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\');" class="btn-ordr-sttus btn outline">배송지 변경</a>';
}
}
<%-- if (15 === ordrSttusCd) {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_post_cancl_ordr_confirm(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + ordrSttusCd + '\');" class="btn-ordr-sttus btn gray">주문취소</a>';--%>
<%-- if ('05' != ordrTyCd) {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\');" class="btn-ordr-sttus btn outline">배송지 변경</a>';--%>
<%-- }--%>
<%-- }--%>
if (ordrSttusCd > 24 && ordrSttusCd < 34) {
div += '<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\', \'' + row.ordrRceptDt + '\');" class="btn-ordr-sttus btn gray">결제취소</a>';
if ('05' != ordrTyCd) {
div += '<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\');" class="btn-ordr-sttus btn outline">배송지 변경</a>';
}
}
<%-- if (ordrSttusCd > 24 && ordrSttusCd < 34) {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\', \'' + row.ordrRceptDt + '\');" class="btn-ordr-sttus btn gray">결제취소</a>';--%>
<%-- if ('05' != ordrTyCd) {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_dlvylc_manage_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\');" class="btn-ordr-sttus btn outline">배송지 변경</a>';--%>
<%-- }--%>
<%-- }--%>
if (ordrSttusCd > 34 && ordrSttusCd < 55) {
div += '<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop(\'' + row.ordrInnb + '\');" class="btn outline">배송조회</a>';
div += '<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\', \'' + row.ordrRceptDt + '\', \'' + row.ordrSttusCd + '\');" class="btn-ordr-sttus btn gray">결제취소</a>';
}
<%-- if (ordrSttusCd > 34 && ordrSttusCd < 55) {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop(\'' + row.ordrInnb + '\');" class="btn outline">배송조회</a>';--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrDlvyInnb + '\', \'' + row.ordrRceptDt + '\', \'' + row.ordrSttusCd + '\');" class="btn-ordr-sttus btn gray">결제취소</a>';--%>
<%-- }--%>
if (ordrSttusCd > 54 && ordrSttusCd < 76 && row.sknEnvrnCd != 'POS') {
div += '<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop(\'' + row.ordrInnb + '\');" class="btn outline">배송조회</a>';
<%-- if (ordrSttusCd > 54 && ordrSttusCd < 76 && row.sknEnvrnCd != 'POS') {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop(\'' + row.ordrInnb + '\');" class="btn outline">배송조회</a>';--%>
if ('Y' === row.purchsDcsnAt) {
<%-- div += '<a href="javascript:void(0);" onclick="fn_call_refund_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrRceptDt + '\', \'' + row.setleTyCd + '\', \'' + row.ordrSttusCd + '\');" class="btn-ordr-sttus btn gray">반품신청</a>'; --%>
div += '<a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist(\'' + row.ordrInnb + '\');" class="btn-ordr-sttus btn gray">반품신청</a>';
div += '<a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr_confirm(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="btn-ordr-sttus btn theme">구매확정</a>';
} else {
<%--div += '<a href="javascript:void(0);" class="btn-ordr-sttus btn gray">구매확정</a>';--%>
}
<%-- if ('Y' === row.purchsDcsnAt) {--%>
<%--&lt;%&ndash; div += '<a href="javascript:void(0);" onclick="fn_call_refund_pop(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\', \'' + row.ordrRceptDt + '\', \'' + row.setleTyCd + '\', \'' + row.ordrSttusCd + '\');" class="btn-ordr-sttus btn gray">반품신청</a>'; &ndash;%&gt;--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_pop_m2mqna_regist(\'' + row.ordrInnb + '\');" class="btn-ordr-sttus btn gray">반품신청</a>';--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_post_purchs_dcsn_by_ordr_confirm(\'' + row.sopmalCd + '\', \'' + row.ordrInnb + '\');" class="btn-ordr-sttus btn theme">구매확정</a>';--%>
<%-- } else {--%>
<%-- &lt;%&ndash;div += '<a href="javascript:void(0);" class="btn-ordr-sttus btn gray">구매확정</a>';&ndash;%&gt;--%>
<%-- }--%>
if (row.reviewAt === 'Y') {
div += '<a href="javascript:void(0);" onclick="fn_go_my_rvw(\'' + row.sopmalCd + '\');" class="btn-ordr-sttus btn outline">리뷰작성</a>';
}
<%-- if (row.reviewAt === 'Y') {--%>
<%-- div += '<a href="javascript:void(0);" onclick="fn_go_my_rvw(\'' + row.sopmalCd + '\');" class="btn-ordr-sttus btn outline">리뷰작성</a>';--%>
<%-- }--%>
}
<%-- }--%>
div += ' </div>';
<%-- div += ' </div>';--%>
div += ' </div>';
div += '</div>';
}

24
src/main/webapp/WEB-INF/views/sopmal_m/ordr/SpbkPtinR.jsp
View File

@@ -32,12 +32,12 @@
<!--************************************ 네이버페이 시작 *********************************-->
<!--[ 네이버 구매하기버튼 스크립트 ]-->
<c:if test="${profiles eq 'stage'}">
<script type="text/javascript" src="https://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>
</c:if>
<c:if test="${profiles ne 'stage'}">
<script type="text/javascript" src="http://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>
</c:if>
<%-- <c:if test="${profiles eq 'stage'}">--%>
<%-- <script type="text/javascript" src="https://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>--%>
<%-- </c:if>--%>
<%-- <c:if test="${profiles ne 'stage'}">--%>
<%-- <script type="text/javascript" src="http://test-pay.naver.com/customer/js/naverPayButton.js" charset="UTF-8"></script>--%>
<%-- </c:if>--%>
<!--************************************ 네이버페이 종료 *********************************-->
<script>
@@ -370,16 +370,16 @@
success: function (html) {
$('#cartOrderList').empty().html(html);
const itemCnt = $('#cartOrderList').find('.cartItem').length;
// const itemCnt = $('#cartOrderList').find('.cartItem').length;
//alert("itemCnt > " + itemCnt);
if (0 === itemCnt) {
$('#_naverPayArea').hide();
}else{
$('#_naverPayArea').show();
}
// if (0 === itemCnt) {
// $('#_naverPayArea').hide();
// }else{
// $('#_naverPayArea').show();
// }