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 5d9dc3d1..551e63a4 100644
--- a/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/MbrPurchsC.jsp
@@ -2805,7 +2805,7 @@
const required = requiredMap[dlvylcAreaCd];
if (required) {
- const $input = $('input.new[name="' + required + '"]');
+ const $input = $('#' + required);
const title = $input.attr('title');
const value = $input.val();
@@ -3760,7 +3760,7 @@
">
">
">
- ">
+ ">
">
">
">
@@ -3782,7 +3782,7 @@
| 개인통관번호 |
- ">
+ ">
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 cd618134..1ff688fa 100644
--- a/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/ordr/SubsvcPurchsC.jsp
@@ -2775,7 +2775,7 @@
const required = requiredMap[dlvylcAreaCd];
if (required) {
- const $input = $('input.new[name="' + required + '"]');
+ const $input = $('#' + required);
const title = $input.attr('title');
const value = $input.val();
@@ -3648,7 +3648,7 @@
">
">
">
- ">
+ ">
">
">
">
@@ -3670,7 +3670,7 @@
| 개인통관번호 |
- ">
+ ">
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 4c19b3c5..e7e996c9 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
@@ -125,8 +125,8 @@
let cstmclerText = 'KR' === $(".dlvylcAreaCd").eq(idx).val() ? '개인통관번호 : ' + $(".cstmclerCd").eq(idx).val() : '';
$(".deliveryInfo__cstmclerCd").text(cstmclerText);
$(".cstmclerCdC").val($(".cstmclerCd").eq(idx).val());
- console.log("cstmclerCd : ",cstmclerText);
- console.log("dlvylcAreaCd : ",$(".dlvylcAreaCd").eq(idx).val());
+ // console.log("cstmclerCd : ",cstmclerText);
+ // console.log("dlvylcAreaCd : ",$(".dlvylcAreaCd").eq(idx).val());
//hidden 정보 set
fn_select_mngrOrdr_postcode(fn_set_dlvylc, idx);
}
@@ -1841,6 +1841,17 @@
$(form).find('input[name="recpntMbtlnb"]').val(fn_format_mbtlnb(data.mbtlnb));
closeModal('postModal');
+ let dlvylcAreaCd = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val();
+
+ if('JP' === dlvylcAreaCd){
+
+ $('.cstmclerArea').hide();
+ $('.cstmclerArea').find('input').prop('disabled', true);
+ } else {
+ $('.cstmclerArea').show();
+ $('.cstmclerArea').find('input').prop('disabled', false);
+ }
+
// 배송지 정보 세팅 이후 결제예정금액 재계산
fn_get_setle_amt();
}
@@ -2782,8 +2793,8 @@
const dlvylcDvCd = $('input[name="dlvylcDvCd"]:checked').val();
const isDftDlvylc = $('#isDftDlvylc').val(); // 기본 배송지 세팅 여부
+ /* 선물하기 > 정합성 검사 시작 1 */
if (ordrTyCd === '04') {
-
$('#dlvylcForm').find('.required_gift').each(function () {
const val = $(this).val();
const name = $(this).attr('name');
@@ -2799,7 +2810,15 @@
}
});
+ /* 선물하기 > 정합성 검사 종료 1 */
+
} else {
+ // console.log("dlvylcDvCd : ",dlvylcDvCd);
+ const requiredMap = {
+ KR: 'cstmclerCd',
+ JP: 'prefcd'
+ };
+
if (dlvylcDvCd === 'Default') {
$('#dlvylcForm').find('.required').each(function () {
const val = $(this).val();
@@ -2808,13 +2827,27 @@
const title = $(this).attr('title');
fn_call_alert_modal(title + ' 항목을 입력해 주십시요');
-
isValid = false;
return false;
}
});
+ const dlvylcAreaCd = $('#dlvylcForm').find('input[name="dlvylcAreaCd"]').val();
+ const required = requiredMap[dlvylcAreaCd];
+ if (required) {
+ const $input = $('input[name="' + required + '"]');
+ const title = $input.attr('title');
+ const value = $input.val();
+
+ if (fn_is_empty(value)) {
+ fn_call_alert_modal(title + '을 입력해 주십시오');
+ isValid = false;
+
+ return false;
+ }
+ }
+
let dlvylcAdresDvCd = $('#dlvylcForm').find('input[name="dlvylcAdresDvCd"]').val();
$('#dlvylcForm').find('input').each(function () {
@@ -2874,8 +2907,8 @@
}
});
- // 선물하기 아닐경우 끝
} else {
+ /* TODO : 선물하기 > 정합성 검사 시작 2 */
if (isDftDlvylc === 'N') {
$('#dlvylcForm').find('.required').each(function () {
const val = $(this).val();
@@ -2907,6 +2940,9 @@
}
});
}
+
+ /* 선물하기 > 정합성 검사 종료 2 */
+
}
}
@@ -3708,9 +3744,9 @@
">
">
- ">
- ">
- ">
+ ">
+ ">
+ ">
">
">
" >
@@ -3804,18 +3840,17 @@
-
-
-<%-- --%>
+
+
-
- | |