Преглед на файлове

주문서 배송지정보 수정

jsh77b преди 5 години
родител
ревизия
3a0ff431a7

+ 28 - 36
src/main/webapp/WEB-INF/views/web/order/OrderDelvAddrAddPopWeb.html

@@ -3,7 +3,7 @@
 </div>
 <div class="modal-body">
 	<div class="pop_cont">
-		<form class="form_wrap form_full" name="deliveryAddrForm" id="deliveryAddrForm">
+		<form class="form_wrap form_full" name="deliveryAddForm" id="deliveryAddForm">
 			<div class="area_adrsinfo">
 				<h6>배송지 정보</h6>
 				<div class="default_addrs">
@@ -15,11 +15,11 @@
 				<div class="form_field">
 					<label class="input_label sr-only">받는 분</label>
 					<div class="ui_col_12">
-						<div class="input_wrap">
+						<div class="input_wrap"> 
 							<input type="text" class="form_control" name="recipNm" placeholder="받는 분" id="">
 						</div>
 					</div>
-				</div>
+				</div>	
 				<div class="form_field">
 					<label class="input_label sr-only">휴대폰 번호</label>
 					<div class="ui_col_12">
@@ -32,21 +32,14 @@
 					<label class="input_label sr-only">배송주소</label>
 					<div class="ui_col_12">
 						<div class="input_wrap"> 
-							<input type="text" class="form_control" name="recipZipcode" placeholder="배송주소" id="">
+							<input type="hidden" class="form_control" name="recipZipcode" placeholder="배송주소" id="">
+							<input type="text" class="form_control" name="recipBaseAddr" placeholder="배송주소" id="">
 						</div>
 						<button type="button" class="btn btn_dark btn_sm">
 							<span>우편번호 찾기</span>
 						</button>
 					</div>
 				</div>
-				<div class="form_field">
-					<label class="input_label sr-only">기본주소</label>
-					<div class="ui_col_12">
-						<div class="input_wrap"> 
-							<input type="text" class="form_control" name="recipBaseAddr" placeholder="상세주소" id="">
-						</div>
-					</div>
-				</div>
 				<div class="form_field">
 					<label class="input_label sr-only">상세주소</label>
 					<div class="ui_col_12">
@@ -58,30 +51,30 @@
 			</div>
 			<div class="area_request">
 				<h6>배송요청 사항</h6> 
-				<div class="form_field">
+					<div class="form_field">
 					<div>
-						<input type="radio" name="rdi-request1" id="rdi-request11" value="문앞" checked="">
+						<input type="radio" name="rdi-request1" id="rdi-request11" value="문앞" >
 						<label for="rdi-request11"><span>문앞</span></label>
 					</div>
 					<div>
-						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞" checked="">
+						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞">
 						<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
 					</div>
 					<div>
-						<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실" checked="">
+						<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실">
 						<label for="rdi-request13"><span>경비실</span></label>
 					</div>
 					<div>
-						<input type="radio" name="rdi-request1" id="rdi-request14" value="택배함" checked="">
+						<input type="radio" name="rdi-request1" id="rdi-request14" value="택배함">
 						<label for="rdi-request14"><span>택배함</span></label>
 					</div>
 					<div>
-						<input type="radio" name="rdi-request1" id="rdi-request15" value="기타사항" checked="">
+						<input type="radio" name="rdi-request1" id="rdi-request15" value="기타사항">
 						<label for="rdi-request15"><span>기타사항</span></label>
 						<div class="info_box">
 							<div class="input_wrap">
 								<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력 (필수)">
-							<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
+								<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
 							</div>
 						</div>
 					</div>
@@ -94,20 +87,19 @@
 	<button type="button" class="btn btn_dark" id="btn_delivery_addr_save"><span>배송지 등록</span></button>
 </div>
 
-
 <script th:inline="javascript">
 //컨텐츠 호출
 $(document).ready( function() {
 	// 배송요청사항 버튼기능
-	$("#deliveryAddrForm input[name=rdi-request1]").each(function(){
+	$("#deliveryAddForm input[name=rdi-request1]").each(function(){
 		// 버튼기능
 		$(this).on("click", function(){
 			var temp = $(this).parent().find('span').text();
-			$("input[name=delvMemoText]").val("");
+			$("#deliveryAddForm input[name=delvMemoText]").val("");
 			if (temp == "기타사항") {
-				$("input[name=delvMemoText]").attr("disabled", false);
+				$("#deliveryAddForm input[name=delvMemoText]").attr("disabled", false);
 			} else {
-				$("input[name=delvMemoText]").attr("disabled", true);
+				$("#deliveryAddForm input[name=delvMemoText]").attr("disabled", true);
 			}
 		});
 	});
@@ -117,9 +109,9 @@ $(document).ready( function() {
 var fnOpenDaumAddr = function() {
 	let daumZip = new daum.Postcode({
 		oncomplete: function(data) {
-			$('#deliveryAddrForm input[name=recipZipcode]').val(data.zonecode);
-			$('#deliveryAddrForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
-			$('#deliveryAddrForm input[name=recipDtlAddr]').focus();
+			$('#deliveryAddForm input[name=recipZipcode]').val(data.zonecode);
+			$('#deliveryAddForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
+			$('#deliveryAddForm input[name=recipDtlAddr]').focus();
 			cfnCloseDaumAddr();
 		},
 		width: '100%'
@@ -132,12 +124,12 @@ var fnOpenDaumAddr = function() {
 $("#btn_delivery_addr_save").on("click", function(){
 	// 기본배송지여부
 	var defaultYn = "N";
-	if ($("#deliveryAddrForm input[name=defaultYn]").is(":checked")) {
+	if ($("#deliveryAddForm input[name=defaultYn]").is(":checked")) {
 		defaultYn = "Y";
 	}
 	
 	// 기타사항일때 텍스트 등록
-	var delvMemo = $("#deliveryAddrForm input[name=rdi-request1]:checked").parent().find('span').text();
+	var delvMemo = $("#deliveryAddForm input[name=rdi-request1]:checked").parent().find('span').text();
 	if ("기타사항" == delvMemo) {
 		delvMemo = $("input[name=delvMemoText]").val();
 	}
@@ -145,11 +137,11 @@ $("#btn_delivery_addr_save").on("click", function(){
 	// 배송지정보설정
 	var jsonObj = {
 		"defaultYn"			: defaultYn
-		, "recipNm"			: $("#deliveryAddrForm input[name=recipNm]").val()
-		, "recipPhnno"		: $("#deliveryAddrForm input[name=recipPhnno]").val()
-		, "recipZipcode"	: $("#deliveryAddrForm input[name=recipZipcode]").val()
-		, "recipBaseAddr"	: $("#deliveryAddrForm input[name=recipBaseAddr]").val()
-		, "recipDtlAddr"	: $("#deliveryAddrForm input[name=recipDtlAddr]").val()
+		, "recipNm"			: $("#deliveryAddForm input[name=recipNm]").val()
+		, "recipPhnno"		: $("#deliveryAddForm input[name=recipPhnno]").val()
+		, "recipZipcode"	: $("#deliveryAddForm input[name=recipZipcode]").val()
+		, "recipBaseAddr"	: $("#deliveryAddForm input[name=recipBaseAddr]").val()
+		, "recipDtlAddr"	: $("#deliveryAddForm input[name=recipDtlAddr]").val()
 		, "delvMemo"		: delvMemo
 	}
 	
@@ -181,8 +173,8 @@ $("#btn_delivery_addr_save").on("click", function(){
 					gagajf.showProgressbar(true);
 				},
 				success 	: function(result) {
-					$("#adrsAddPop").html(result);
-					$("#adrsAddPop").modal("show");
+					$("#adrsChangePop .modal-dialog .modal-content").html(result);
+					$("#adrsChangePop").modal("show");
 				}
 			});	
 		}

+ 6 - 6
src/main/webapp/WEB-INF/views/web/order/OrderDelvAddrChangePopWeb.html

@@ -54,7 +54,7 @@
 	</div>
 </div>
 <div class="modal-footer">
-	<button class="btn btn_dark" id="btn_adrsAdd_pop"><span>배송지 추가</span></button>
+	<button type="button" class="btn btn_dark" id="btn_adrsAdd_pop"><span>배송지 추가</span></button>
 </div>
 </form>
 
@@ -64,8 +64,8 @@ $(document).ready( function() {
 });
 
 // 2. 버튼기능구현
-// 2.1 배송지변경 팝업열기
-$('#btn_addrAdd_pop').on("click", function(){
+// 2.1 배송지추가 팝업열기
+$('#btn_adrsAdd_pop').on("click", function(){
 	$.ajax( {
 		type		: "POST",
 		url 		: '/order/delvAddrAddPop',
@@ -78,8 +78,8 @@ $('#btn_addrAdd_pop').on("click", function(){
 			gagajf.showProgressbar(true);
 		},
 		success 	: function(result) {
-			$("#adrsChangePop").html(result);
-			$("#adrsChangePop").modal("show");
+			$("#adrsAddPop .modal-dialog .modal-content").html(result);
+			$("#adrsAddPop").modal("show");
 		}
 	});	
 });
@@ -116,7 +116,7 @@ $(".btn_addrModify_pop").on("click", function(){
 			gagajf.showProgressbar(true);
 		},
 		success 	: function(result) {
-			$("#adrsModifyPop").html(result);
+			$("#adrsModifyPop .modal-dialog .modal-content").html(result);
 			$("#adrsModifyPop").modal("show");
 		}
 	});	

+ 105 - 119
src/main/webapp/WEB-INF/views/web/order/OrderDelvAddrModifyPopWeb.html

@@ -1,112 +1,98 @@
-<div class="modal-dialog" role="document">
-	<div class="modal-content">
-		<div class="modal-header">
-			<h5 class="modal-title" id="adrsAddLabel">배송지 수정</h5>
-		</div>
-		<div class="modal-body">
-			<div class="pop_cont">
-				<form class="form_wrap form_full" name="deliveryAddrForm" id="deliveryAddrForm">
-					<input type="hidden" name="custDelvAddrSq" th:value="${deliveryAddrInfo.custDelvAddrSq}">
-					
-					<div class="area_adrsinfo">
-						<h6>배송지 정보</h6>
-						<div class="default_addrs">
-							<div class="form_field">
-								<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">
-									<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked>
-								</th:block>
-								<th:block th:if="${deliveryAddrInfo.defaultYn} == 'N'">
-									<input id="chk-default-addrs" type="checkbox" name="defaultYn">
-								</th:block>
-								<label for="chk-default-addrs"><span>기본 배송지로 등록</span></label>
-							</div>
-						</div>
-						<div class="form_field">
-							<label class="input_label sr-only">받는 분</label>
-							<div class="ui_col_12">
-								<div class="input_wrap">
-									<input type="text" name="recipNm" placeholder="받는 분" th:value="${deliveryAddrInfo.recipNm}">
-								</div>
-							</div>
-						</div>
-						<div class="form_field">
-							<label class="input_label sr-only">휴대폰 번호</label>
-							<div class="ui_col_12">
-								<div class="input_wrap">
-									<input type="text" name="recipPhnno" placeholder="휴대폰 번호" th:value="${deliveryAddrInfo.recipPhnno}">
-								</div>
-							</div>
+<div class="modal-header">
+	<h5 class="modal-title" id="adrsModifyLabel">배송지 수정</h5>
+</div>
+<div class="modal-body">
+	<div class="pop_cont">
+		<form class="form_wrap form_full" name="deliveryModifyForm" id="deliveryModifyForm">
+			<input type="hidden" class="form_control" name="custDelvAddrSq" th:value="${deliveryAddrInfo.custDelvAddrSq}">
+			
+			<div class="area_adrsinfo">
+				<h6>배송지 정보</h6>
+				<div class="default_addrs">
+					<div class="form_field">
+						<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">
+							<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked>
+						</th:block>
+						<th:block th:if="${deliveryAddrInfo.defaultYn} == 'N'">
+							<input id="chk-default-addrs" type="checkbox" name="defaultYn">
+						</th:block>
+						<label for="chk-default-addrs"><span>기본 배송지로 등록</span></label>
+					</div>
+				</div>
+				<div class="form_field">
+					<label class="input_label sr-only">받는 분</label>
+					<div class="ui_col_12">
+						<div class="input_wrap"> 
+							<input type="text" class="form_control" name="recipNm" placeholder="받는 분" id="" th:value="${deliveryAddrInfo.recipNm}">
 						</div>
-						<div class="form_field">
-							<label class="input_label sr-only">배송주소</label>
-							<div class="ui_col_12">
-								<div class="input_wrap">
-									<input type="text" name="recipZipcode" placeholder="우편번호" th:value="${deliveryAddrInfo.recipZipcode}">
-									<button type="button" class="btn btn_dark btn_sm" onclick="fnOpenDaumAddr();">
-										<span>우편번호 찾기</span>
-									</button>
-								</div>
-							</div>
+					</div>
+				</div>	
+				<div class="form_field">
+					<label class="input_label sr-only">휴대폰 번호</label>
+					<div class="ui_col_12">
+						<div class="input_wrap"> 
+							<input type="text" class="form_control" name="recipPhnno" placeholder="휴대폰 번호" id="" th:value="${deliveryAddrInfo.recipPhnno}">
 						</div>
-						<div class="form_field">
-							<label class="input_label sr-only">기본주소</label>
-							<div class="ui_col_12">
-								<div class="input_wrap">
-									<input type="text" name="recipBaseAddr" placeholder="기본주소" th:value="${deliveryAddrInfo.recipBaseAddr}">
-								</div>
-							</div>
+					</div>
+				</div>
+				<div class="form_field">
+					<label class="input_label sr-only">배송주소</label>
+					<div class="ui_col_12">
+						<div class="input_wrap"> 
+							<input type="text" class="form_control" name="recipBaseAddr" placeholder="배송주소" id="" th:value="${deliveryAddrInfo.recipBaseAddr}">
+							<input type="hidden" name="recipZipcode" placeholder="우편번호" th:value="${deliveryAddrInfo.recipZipcode}">
 						</div>
-						<div class="form_field">
-							<label class="input_label sr-only">상세주소</label>
-							<div class="ui_col_12">
-								<div class="input_wrap">
-									<input type="text" name="recipDtlAddr" placeholder="상세주소" th:value="${deliveryAddrInfo.recipDtlAddr}">
-								</div>
-							</div>
+						<button type="button" class="btn btn_dark btn_sm" onclick="fnOpenDaumAddr();">
+							<span>우편번호 찾기</span>
+						</button>
+					</div>
+				</div>
+				<div class="form_field">
+					<label class="input_label sr-only">상세주소</label>
+					<div class="ui_col_12">
+						<div class="input_wrap"> 
+							<input type="text" class="form_control" name="recipDtlAddr" placeholder="상세주소" id="" th:value="${deliveryAddrInfo.recipDtlAddr}">
 						</div>
 					</div>
-					<div class="area_request">
-						<h6>배송요청 사항</h6>
-						<div class="form_field">
-							<div>
-								<input type="radio" name="rdi-request1" id="rdi-request11" value="문앞"> 
-								<label for="rdi-request11"><span>문앞</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞"> 
-								<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실"> 
-								<label for="rdi-request13"><span>경비실</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request1" id="rdi-request14" value="택배함"> 
-								<label for="rdi-request14"><span>택배함</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request1" id="rdi-request15" value="기타사항"> 
-								<label for="rdi-request15"><span>기타사항</span></label>
-								<div class="info_box">
-									<div class="input_wrap">
-										<input type="text" name="delvMemoText" class="form_control" maxlength="30" placeholder="보관장소만 입력" disabled>
-										<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
-									</div>
-								</div>
+				</div>
+			</div>
+			<div class="area_request">       
+				<h6>배송요청 사항</h6> 
+				<div class="form_field">
+					<div>
+						<input type="radio" name="rdi-request1" id="rdi-request11" value="문앞">
+						<label for="rdi-request11"><span>문앞</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞">
+						<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실">
+						<label for="rdi-request13"><span>경비실</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request1" id="rdi-request14" value="택배함">
+						<label for="rdi-request14"><span>택배함</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request1" id="rdi-request15" value="기타사항">
+						<label for="rdi-request15"><span>기타사항</span></label>
+						<div class="info_box">
+							<div class="input_wrap">
+								<input type="text" name="delvMemoText" class="form_control" maxlength="30" placeholder="보관장소만 입력 (필수)" disabled>
+								<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
 							</div>
 						</div>
 					</div>
-					<div class="btn_group_block">
-						<button type="button" class="btn btn_dark btn_block" id="btn_delivery_addr_save">
-							<span>배송지 수정</span>
-						</button>
-					</div>
-				</form>
+				</div>
 			</div>
-		</div>
+		</form>
 	</div>
 </div>
-<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
+<div class="modal-footer">
+	<button type="button" class="btn btn_dark" id="btn_delivery_addr_save"><span>배송지 등록</span></button>
+</div>
 
 <script th:inline="javascript">
 var delvMemo = [[${deliveryAddrInfo.delvMemo}]];
@@ -124,12 +110,12 @@ $(document).ready( function() {
 	}
 	
 	if (tempMemo) {
-		$("#deliveryAddrForm input[name=rdi-request1]").eq(4).attr("checked", true);
+		$("#deliveryModifyForm input[name=rdi-request1]").eq(4).attr("checked", true);
 		$("input[name=delvMemoText]").attr("disabled", false);
 		$("input[name=delvMemoText]").val(delvMemo);
 	}
 	
-	$("#deliveryAddrForm input[name=rdi-request1]").each(function(){
+	$("#deliveryModifyForm input[name=rdi-request1]").each(function(){
 		var temp = $(this).parent().find('span').text();
 		if (delvMemo == temp) {
 			$(this).attr("checked", true);
@@ -137,15 +123,15 @@ $(document).ready( function() {
 	});
 	
 	// 배송요청사항 버튼기능
-	$("#deliveryAddrForm input[name=rdi-request1]").each(function(){
+	$("#deliveryModifyForm input[name=rdi-request1]").each(function(){
 		// 버튼기능
 		$(this).on("click", function(){
 			var temp = $(this).parent().find('span').text();
-			$("input[name=delvMemoText]").val("");
+			$("#deliveryModifyForm input[name=delvMemoText]").val("");
 			if (temp == "기타사항") {
-				$("input[name=delvMemoText]").attr("disabled", false);
+				$("#deliveryModifyForm input[name=delvMemoText]").attr("disabled", false);
 			} else {
-				$("input[name=delvMemoText]").attr("disabled", true);
+				$("#deliveryModifyForm input[name=delvMemoText]").attr("disabled", true);
 			}
 		});
 	});
@@ -155,9 +141,9 @@ $(document).ready( function() {
 var fnOpenDaumAddr = function() {
 	let daumZip = new daum.Postcode({
 		oncomplete: function(data) {
-			$('#deliveryAddrForm input[name=recipZipcode]').val(data.zonecode);
-			$('#deliveryAddrForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
-			$('#deliveryAddrForm input[name=recipDtlAddr]').focus();
+			$('#deliveryModifyForm input[name=recipZipcode]').val(data.zonecode);
+			$('#deliveryModifyForm input[name=recipBaseAddr]').val(cfnGetDaumRoadAddr(data));
+			$('#deliveryModifyForm input[name=recipDtlAddr]').focus();
 			cfnCloseDaumAddr();
 		},
 		width: '100%'
@@ -170,25 +156,25 @@ var fnOpenDaumAddr = function() {
 $("#btn_delivery_addr_save").on("click", function(){
 	// 기본배송지여부
 	var defaultYn = "N";
-	if ($("#deliveryAddrForm input[name=defaultYn]").is(":checked")) {
+	if ($("#deliveryModifyForm input[name=defaultYn]").is(":checked")) {
 		defaultYn = "Y";
 	}
 	
 	// 기타사항일때 텍스트 등록
-	var delvMemo = $("#deliveryAddrForm input[name=rdi-request1]:checked").parent().find('span').text();
+	var delvMemo = $("#deliveryModifyForm input[name=rdi-request1]:checked").parent().find('span').text();
 	if ("기타사항" == delvMemo) {
-		delvMemo = $("input[name=delvMemoText]").val();
+		delvMemo = $("#deliveryModifyForm input[name=delvMemoText]").val();
 	}
 	
 	// 배송지정보설정
 	var jsonObj = {
 		"defaultYn"			: defaultYn
-		, "custDelvAddrSq"	: parseInt($("#deliveryAddrForm input[name=custDelvAddrSq]").val())
-		, "recipNm"			: $("#deliveryAddrForm input[name=recipNm]").val()
-		, "recipPhnno"		: $("#deliveryAddrForm input[name=recipPhnno]").val()
-		, "recipZipcode"	: $("#deliveryAddrForm input[name=recipZipcode]").val()
-		, "recipBaseAddr"	: $("#deliveryAddrForm input[name=recipBaseAddr]").val()
-		, "recipDtlAddr"	: $("#deliveryAddrForm input[name=recipDtlAddr]").val()
+		, "custDelvAddrSq"	: parseInt($("#deliveryModifyForm input[name=custDelvAddrSq]").val())
+		, "recipNm"			: $("#deliveryModifyForm input[name=recipNm]").val()
+		, "recipPhnno"		: $("#deliveryModifyForm input[name=recipPhnno]").val()
+		, "recipZipcode"	: $("#deliveryModifyForm input[name=recipZipcode]").val()
+		, "recipBaseAddr"	: $("#deliveryModifyForm input[name=recipBaseAddr]").val()
+		, "recipDtlAddr"	: $("#deliveryModifyForm input[name=recipDtlAddr]").val()
 		, "delvMemo"		: delvMemo
 	}
 	
@@ -220,11 +206,11 @@ $("#btn_delivery_addr_save").on("click", function(){
 					gagajf.showProgressbar(true);
 				},
 				success 	: function(result) {
-					$("#adrsAddPop").html(result);
-					$("#adrsAddPop").modal("show");
+					$("#adrsChangePop .modal-dialog .modal-content").html(result);
+					$("#adrsChangePop").modal("show");
 				}
 			});	
 		}
 	});
 });
-</script>
+</script>

+ 47 - 53
src/main/webapp/WEB-INF/views/web/order/OrderDelvMemoChangePopWeb.html

@@ -1,51 +1,45 @@
 <!-- 배송요청사항수정 팝업 -->
-<div class="modal-dialog" role="document">
-	<form class="form_wrap form_full" name="deliveryAddrForm" id="deliveryAddrForm">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title" id="rqstModifyLabel">배송요청 사항</h5>
-			</div>
-			<div class="modal-body">
-				<div class="pop_cont">
-					<div class="area_request">
-						<div class="form_field">
-							<div>
-								<input type="radio" name="rdi-request3" id="rdi-request31"> 
-								<label for="rdi-request31"><span>문앞</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request3" id="rdi-request32"> 
-								<label for="rdi-request32"><span>직접받고 부재시 문 앞</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request3" id="rdi-request33"> 
-								<label for="rdi-request33"><span>경비실</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request3" id="rdi-request34"> 
-								<label for="rdi-request34"><span>택배함</span></label>
-							</div>
-							<div>
-								<input type="radio" name="rdi-request3" id="rdi-request35"> 
-								<label for="rdi-request35"><span>기타사항</span></label>
-								<div class="info_box">
-									<div class="input_wrap">
-										<input type="text" name="delvMemoText" class="form_control" maxlength="30" placeholder="보관장소만 입력" disabled>
-										<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
-									</div>
-								</div>
+<div class="modal-header">
+	<h5 class="modal-title" id="rqstModifyLabel">배송요청 사항</h5>
+</div>
+<div class="modal-body">
+	<div class="pop_cont">
+		<form class="form_wrap form_full" name="deliveryAddrMemoForm" id="deliveryAddrMemoForm">
+			<div class="area_request">        
+				<div class="form_field">
+					<div>
+						<input type="radio" name="rdi-request3" id="rdi-request31">
+						<label for="rdi-request31"><span>문앞</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request3" id="rdi-request32">
+						<label for="rdi-request32"><span>직접받고 부재시 문 앞</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request3" id="rdi-request33">
+						<label for="rdi-request33"><span>경비실</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request3" id="rdi-request34">
+						<label for="rdi-request34"><span>택배함</span></label>
+					</div>
+					<div>
+						<input type="radio" name="rdi-request3" id="rdi-request35">
+						<label for="rdi-request35"><span>기타사항</span></label>
+						<div class="info_box">
+							<div class="input_wrap">
+								<input type="text" name="delvMemoText" class="form_control" maxlength="30" placeholder="보관장소만 입력 (필수)" disabled>
+								<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
 							</div>
 						</div>
 					</div>
-					<div class="btn_group_block">
-						<button type="button" class="btn btn_dark btn_block" id="btn_delvMemoChange">
-							<span>등록</span>
-						</button>
-					</div>
 				</div>
 			</div>
-		</div>
-	</form>
+		</form>
+	</div>
+</div>
+<div class="modal-footer">
+    <button type="button" id="btn_delvMemoChange" class="btn btn_dark"><span>등록</span></button>
 </div>
 
 <script type="text/javascript">
@@ -63,12 +57,12 @@ $(document).ready( function() {
 	}
 	
 	if (tempMemo) {
-		$("#deliveryAddrForm input[name=rdi-request3]").eq(4).attr("checked", true);
-		$("input[name=delvMemoText]").attr("disabled", false);
-		$("input[name=delvMemoText]").val(delvMemo);
+		$("#deliveryAddrMemoForm input[name=rdi-request3]").eq(4).attr("checked", true);
+		$("#deliveryAddrMemoForm input[name=delvMemoText]").attr("disabled", false);
+		$("#deliveryAddrMemoForm input[name=delvMemoText]").val(delvMemo);
 	}
 	
-	$("#deliveryAddrForm input[name=rdi-request3]").each(function(){
+	$("#deliveryAddrMemoForm input[name=rdi-request3]").each(function(){
 		var temp = $(this).parent().find('span').text();
 		if (delvMemo == temp) {
 			$(this).attr("checked", true);
@@ -76,25 +70,25 @@ $(document).ready( function() {
 	});
 	
 	// 배송요청사항 버튼기능
-	$("#deliveryAddrForm input[name=rdi-request3]").each(function(){
+	$("#deliveryAddrMemoForm input[name=rdi-request3]").each(function(){
 		// 버튼기능
 		$(this).on("click", function(){
 			var temp = $(this).parent().find('span').text();
 			alert
-			$("input[name=delvMemoText]").val("");
+			$("#deliveryAddrMemoForm input[name=delvMemoText]").val("");
 			if (temp == "기타사항") {
-				$("input[name=delvMemoText]").attr("disabled", false);
+				$("#deliveryAddrMemoForm input[name=delvMemoText]").attr("disabled", false);
 			} else {
-				$("input[name=delvMemoText]").attr("disabled", true);
+				$("#deliveryAddrMemoForm input[name=delvMemoText]").attr("disabled", true);
 			}
 		});
 	});
 	
 	// 배송메모등록버튼
 	$("#btn_delvMemoChange").on("click", function(){
-		var rtnTxt = $("input[name='rdi-request3']:checked").parent().find('span').text();
+		var rtnTxt = $("#deliveryAddrMemoForm input[name='rdi-request3']:checked").parent().find('span').text();
 		if (rtnTxt == "기타사항") {
-			rtnTxt = $("input[name='delvMemoText']").val();
+			rtnTxt = $("#deliveryAddrMemoForm input[name='delvMemoText']").val();
 		} 
 
 		// 배송메모 부모창에 설정
@@ -102,7 +96,7 @@ $(document).ready( function() {
 			fnChangeDelvMemo(rtnTxt);
 		}
 
-		$("input[name='delvMemo']").val(rtnTxt);		// input 값에 설정
+		$("#deliveryAddrMemoForm input[name='delvMemo']").val(rtnTxt);		// input 값에 설정
 		$("#delvMemo").text(rtnTxt);					// 메모 text 설정
 		$(".close-modal").trigger("click");				// 팝업닫기
 	});

+ 3 - 17
src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -432,7 +432,7 @@
 <!-- //배송지변경 팝업 -->
 
 <!-- 배송지추가 팝업 -->
-<div class="modal fade adrsAdd_pop" id="adrsAddPop" tabindex="-1" role="dialog" aria-labelledby="adrsAddLabel" aria-hidden="true">
+<div class="modal fade adrsModify_pop" id="adrsAddPop" tabindex="-1" role="dialog" aria-labelledby="adrsAddLabel" aria-hidden="true">
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<!-- 배송지추가 팝업 내용 -->
@@ -639,8 +639,8 @@ var deliveryAddrInfoSet = function(temp) {
 						gagajf.showProgressbar(true);
 					},
 					success 	: function(result) {
-						$("#adrsAddPop .modal-dialog .modal-content").html(result);
-						$("#adrsAddPop").modal("show");
+						$("#adrsChangePop .modal-dialog .modal-content").html(result);
+						$("#adrsChangePop").modal("show");
 					}
 				});	
 			});
@@ -1786,12 +1786,6 @@ var custCpnSumAmtCal = function() {
 
 <script type="text/javascript">
 
-// 2. 버튼기능구현
-// 2.1 배송지변경 팝업열기
-// $('#btn_adrsChange_pop').on("click", function(){
-	// $("#adrsChangePop").modal("show");
-// });
-
 $(document).ready( function() {
 	//해외배송 입력
 	$(document).on('change','.odPayment .area_overseas #rdi-overs1',function(e){
@@ -1865,14 +1859,6 @@ $(document).ready( function() {
 		return false;
 	});
 
-	
-
-	//배송지추가 팝업열기
-	$(document).on('click','#btn_addrAdd_pop',function(e){
-		$("#adrsAddPop").modal("show");
-		return false;
-	});
-
 	//배송지수정 팝업열기
 	$(document).on('click','#btn_addrModify_pop',function(e){
 		$("#adrsModifyPop").modal("show");