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