Merge remote-tracking branch 'origin/master'
This commit is contained in:
jazz
@@ -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">
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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'}">
|
||||
|
||||
@@ -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) {--%>
|
||||
<%--<%– 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 (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>';
|
||||
}
|
||||
|
||||
@@ -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();
|
||||
// }
|
||||
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user