주문서개발중

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -107,6 +107,7 @@ public class TsfOrderController extends TsfBaseController {
 		String jsessionId 	= "aaec62cc-5f91-47bb-ba65-ebc9a61385cf";
 		Boolean noMember 	= true;
 		
+		
 		// TODO 로그인체크 로직 추가
 		// 1.0 회원, 비회원 여부 판단
 		if (TsfSession.getInfo() == null) {
@@ -120,6 +121,9 @@ public class TsfOrderController extends TsfBaseController {
 			}
 		}
 		
+		// 임시
+		order.setCustNo(1000006); // 고객번호등록
+		
 		// TODO
 		// 1.1 카트시퀀스가 없을때 처리 장바구니로 이동 
 		if (order.getCartSqArr() == null) {
@@ -141,6 +145,7 @@ public class TsfOrderController extends TsfBaseController {
 			deliveryAddrInfo.setRecipZipcode(order.getRecipZipcode());
 			deliveryAddrInfo.setRecipBaseAddr(order.getRecipBaseAddr());
 			deliveryAddrInfo.setRecipDtlAddr(order.getRecipDtlAddr());
+			deliveryAddrInfo.setDelvMemo("직접받고 부재시 문 앞");
 		} else {
 			// 1.1 주문고객 정보조회
 			custemerInfo = coreOrderService.getCustemerInfo(order);
@@ -237,5 +242,97 @@ public class TsfOrderController extends TsfBaseController {
 		
 		return rtn;
 	}
+	
+	/**
+	 * 배송지정보변경팝업
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 17
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/delvAddrChangePop")
+	public ModelAndView delvAddrChangePop(Order order) {
+		
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName(super.getDeviceViewName("order/OrderDelvAddrChangePop"));
+		
+		return mav;
+	}
+	
+	/**
+	 * 배송지정보수정팝업
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 17
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/delvAddrModifyPop")
+	public ModelAndView delvAddrModifyPop(Order order) {
+		
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName(super.getDeviceViewName("order/OrderDelvAddrModifyPop"));
+		
+		return mav;
+	}
+	
+	/**
+	 * 배송지정보추가팝업
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 17
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/delvAddrAddPop")
+	public ModelAndView delvAddrAddPop(Order order) {
+		
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName(super.getDeviceViewName("order/OrderDelvAddrAddPop"));
+		
+		return mav;
+	}
+	
+	/**
+	 * 배송지메모변경팝업
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 17
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/delvMemoChangePop")
+	public ModelAndView delvMemoChangePop(Order order) {
+		
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName(super.getDeviceViewName("order/OrderDelvMemoChangePop"));
+		
+		return mav;
+	}
+	
+	/**
+	 * 사은품안내팝업
+	 *
+	 * @param
+	 * @return
+	 * @author jsh77b
+	 * @since 2021. 02. 17
+	 */
+	@ResponseBody
+	@RequestMapping(value = "/freegiftInfoPop")
+	public ModelAndView freegiftInfoPop(Order order) {
+		
+		ModelAndView mav = new ModelAndView();
+		mav.setViewName(super.getDeviceViewName("order/OrderFreegiftInfoPop"));
+		
+		return mav;
+	}
+	
+	
 
 }

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

@@ -1,97 +1,93 @@
 <!-- 배송지추가 팝업 -->
-<div class="modal fade od_pop adrsAdd_pop" id="adrsAddPop" tabindex="-1" role="dialog" aria-labelledby="adrsAddLabel" aria-hidden="true">
-	<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">
-						<div class="area_adrsinfo">
-							<div class="form_field">
-								<label class="input_label sr-only">이름(주문자명)</label>
-								<div class="ui_col_12">
-									<div class="input_wrap">
-										<input type="text" name="userName" placeholder="이름(주문자명)" id="txtName">
-									</div>
-								</div>
+<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">
+				<div class="area_adrsinfo">
+					<div class="form_field">
+						<label class="input_label sr-only">이름(주문자명)</label>
+						<div class="ui_col_12">
+							<div class="input_wrap">
+								<input type="text" name="userName" placeholder="이름(주문자명)" id="txtName">
 							</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="userPhone" placeholder="휴대폰 번호" id="userPhone">
-									</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" name="userPhone" placeholder="휴대폰 번호" id="userPhone">
 							</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="userNumber" placeholder="배송주소" id="">
-										<button type="button" class="btn btn_dark btn_default btn_postcode">
-											<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" name="userNumber" placeholder="배송주소" id="">
+								<button type="button" class="btn btn_dark btn_default btn_postcode">
+									<span>우편번호 찾기</span>
+								</button>
 							</div>
-							<!-- 주소 출력 -->
-							<div class="adress">
-								<dl>
-									<div>
-										<dt>
-											<span>도로명</span>
-										</dt>
-										<dd>서울시 영등포구 은행로 11, 일신빌딩 8층</dd>
-									</div>
-									<div>
-										<dt>
-											<span>지번</span>
-										</dt>
-										<dd>서울특별시 영등포구 여의도동 15-15 일신빌딩 8층</dd>
-									</div>
-								</dl>
+						</div>
+					</div>
+					<!-- 주소 출력 -->
+					<div class="adress">
+						<dl>
+							<div>
+								<dt>
+									<span>도로명</span>
+								</dt>
+								<dd>서울시 영등포구 은행로 11, 일신빌딩 8층</dd>
 							</div>
-							<!-- //주소 출력 -->
+							<div>
+								<dt>
+									<span>지번</span>
+								</dt>
+								<dd>서울특별시 영등포구 여의도동 15-15 일신빌딩 8층</dd>
+							</div>
+						</dl>
+					</div>
+					<!-- //주소 출력 -->
+				</div>
+				<div class="area_request">
+					<h6>배송요청 사항</h6>
+					<div class="form_field">
+						<div>
+							<input type="radio" name="rdi-request1" id="rdi-request11" value="" checked=""> 
+							<label for="rdi-request11"><span>문앞</span></label>
 						</div>
-						<div class="area_request">
-							<h6>배송요청 사항</h6>
-							<div class="form_field">
-								<div>
-									<input type="radio" name="rdi-request1" id="rdi-request11" value="" checked=""> 
-									<label for="rdi-request11"><span>문앞</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request1" id="rdi-request12" value="" checked=""> 
-									<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request1" id="rdi-request13" value="" checked="">
-									 <label for="rdi-request13"><span>경비실</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request1" id="rdi-request14" value="" checked=""> 
-									<label for="rdi-request14"><span>택배함</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request1" id="rdi-request15"value="" checked=""> 
-									<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>
-										</div>
-									</div>
+						<div>
+							<input type="radio" name="rdi-request1" id="rdi-request12" value="" checked=""> 
+							<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request1" id="rdi-request13" value="" checked="">
+							 <label for="rdi-request13"><span>경비실</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request1" id="rdi-request14" value="" checked=""> 
+							<label for="rdi-request14"><span>택배함</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request1" id="rdi-request15"value="" checked=""> 
+							<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>
 								</div>
 							</div>
 						</div>
-						<div class="btn_group_block">
-							<button class="btn btn_dark btn_block">
-								<span>배송지 등록</span>
-							</button>
-						</div>
-					</form>
+					</div>
+				</div>
+				<div class="btn_group_block">
+					<button class="btn btn_dark btn_block">
+						<span>배송지 등록</span>
+					</button>
 				</div>
 			</div>
 		</div>

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

@@ -1,81 +1,79 @@
 <!-- 배송지변경 팝업 -->
-<div class="modal fade od_pop adrsChange_pop" id="adrsChangePop" tabindex="-1" role="dialog" aria-labelledby="adrsChangeLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title" id="adrsChangeLabel">배송지 선택</h5>
-			</div>
-			<div class="modal-body">
-				<div class="pop_cont">
-					<ul>
-						<li>
-							<div class="adrs_box">
-								<dl>
-									<div>
-										<dt><span class="sr-only">배송지명</span></dt>
-										<dd>홍길동 
-											<span class="icon_tag"> 
-												<em class="tag_stype1">기본 배송지</em>
-												<em class="tag_stype2">총알배송</em>
-											</span>
-										</dd>
-									</div>
-									<div>
-										<dt><span class="sr-only">배송주소</span></dt>
-										<dd>서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</dd>
-									</div>
-									<div>
-										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd>010-1234-5647</dd>
-									</div>
-									<div>
-										<dt>배송요청 사항</dt>
-										<dd>직접받고 부재 시 문앞</dd>
-									</div>
-									<button class="btn btn_default btn_sm" id="btn_addrModify_pop">
-										<span>수정</span>
-									</button>
-									<button class="btn btn_dark btn_sm" id="">
-										<span>선택</span>
-									</button>
-								</dl>
-							</div>
-						</li>
-						<li>
-							<div class="adrs_box">
-								<dl>
-									<div>
-										<dt><span class="sr-only">배송지명</span></dt>
-										<dd>홍길동 <span class="icon_tag"> <em class="tag_stype1">기본 배송지</em> <em class="tag_stype2">총알배송</em></span></dd>
-									</div>
-									<div>
-										<dt><span class="sr-only">배송주소</span></dt>
-										<dd>서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</dd>
-									</div>
-									<div>
-										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd>010-1234-5647</dd>
-									</div>
-									<div>
-										<dt>배송요청 사항</dt>
-										<dd>직접받고 부재 시 문앞</dd>
-									</div>
-									<button class="btn btn_default btn_sm"
-										id="btn_addrModify_pop">
-										<span>수정</span>
-									</button>
-									<button class="btn btn_dark btn_sm" id="">
-										<span>선택</span>
-									</button>
-								</dl>
-							</div>
-						</li>
-					</ul>
-					<div class="btn_group_block">
-						<button class="btn btn_dark btn_block" id="btn_addrAdd_pop">
-							<span>배송지 추가</span>
-						</button>
-					</div>
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="adrsChangeLabel">배송지 선택</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+				<ul>
+					<li>
+						<div class="adrs_box">
+							<dl>
+								<div>
+									<dt><span class="sr-only">배송지명</span></dt>
+									<dd>홍길동 
+										<span class="icon_tag"> 
+											<em class="tag_stype1">기본 배송지</em>
+											<em class="tag_stype2">총알배송</em>
+										</span>
+									</dd>
+								</div>
+								<div>
+									<dt><span class="sr-only">배송주소</span></dt>
+									<dd>서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</dd>
+								</div>
+								<div>
+									<dt><span class="sr-only">휴대폰 번호</span></dt>
+									<dd>010-1234-5647</dd>
+								</div>
+								<div>
+									<dt>배송요청 사항</dt>
+									<dd>직접받고 부재 시 문앞</dd>
+								</div>
+								<button class="btn btn_default btn_sm" id="btn_addrModify_pop">
+									<span>수정</span>
+								</button>
+								<button class="btn btn_dark btn_sm" id="">
+									<span>선택</span>
+								</button>
+							</dl>
+						</div>
+					</li>
+					<li>
+						<div class="adrs_box">
+							<dl>
+								<div>
+									<dt><span class="sr-only">배송지명</span></dt>
+									<dd>홍길동 <span class="icon_tag"> <em class="tag_stype1">기본 배송지</em> <em class="tag_stype2">총알배송</em></span></dd>
+								</div>
+								<div>
+									<dt><span class="sr-only">배송주소</span></dt>
+									<dd>서울시 영등포구 은행로 11,8층(여의도동,일신빌딩)</dd>
+								</div>
+								<div>
+									<dt><span class="sr-only">휴대폰 번호</span></dt>
+									<dd>010-1234-5647</dd>
+								</div>
+								<div>
+									<dt>배송요청 사항</dt>
+									<dd>직접받고 부재 시 문앞</dd>
+								</div>
+								<button class="btn btn_default btn_sm"
+									id="btn_addrModify_pop">
+									<span>수정</span>
+								</button>
+								<button class="btn btn_dark btn_sm" id="">
+									<span>선택</span>
+								</button>
+							</dl>
+						</div>
+					</li>
+				</ul>
+				<div class="btn_group_block">
+					<button class="btn btn_dark btn_block" id="btn_addrAdd_pop">
+						<span>배송지 추가</span>
+					</button>
 				</div>
 			</div>
 		</div>

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

@@ -1,93 +1,89 @@
 <!-- 배송지수정 팝업 -->
-<div class="modal fade od_pop adrsModify_pop" id="adrsModifyPop" tabindex="-1" role="dialog" aria-labelledby="adrsModifyLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<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">
-						<div class="area_adrsinfo">
-							<div class="form_field">
-								<label class="input_label sr-only">이름(주문자명)</label>
-								<div class="ui_col_12">
-									<div class="input_wrap">
-										<input type="text" name="userName" placeholder="이름(주문자명)" id="txtName">
-									</div>
-								</div>
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="adrsModifyLabel">배송지 수정</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+				<div class="area_adrsinfo">
+					<div class="form_field">
+						<label class="input_label sr-only">이름(주문자명)</label>
+						<div class="ui_col_12">
+							<div class="input_wrap">
+								<input type="text" name="userName" placeholder="이름(주문자명)" id="txtName">
 							</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="userPhone" placeholder="휴대폰 번호" id="userPhone">
-									</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" name="userPhone" placeholder="휴대폰 번호" id="userPhone">
 							</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="userNumber" placeholder="배송주소" id="">
-										<button type="button" class="btn btn_dark btn_default btn_postcode">
-											<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" name="userNumber" placeholder="배송주소" id="">
+								<button type="button" class="btn btn_dark btn_default btn_postcode">
+									<span>우편번호 찾기</span>
+								</button>
 							</div>
-							<!-- 주소 출력 -->
-							<div class="adress">
-								<dl>
-									<div>
-										<dt><span>도로명</span></dt>
-										<dd>서울시 영등포구 은행로 11, 일신빌딩 8층</dd>
-									</div>
-									<div>
-										<dt><span>지번</span></dt>
-										<dd>서울특별시 영등포구 여의도동 15-15 일신빌딩 8층</dd>
-									</div>
-								</dl>
+						</div>
+					</div>
+					<!-- 주소 출력 -->
+					<div class="adress">
+						<dl>
+							<div>
+								<dt><span>도로명</span></dt>
+								<dd>서울시 영등포구 은행로 11, 일신빌딩 8층</dd>
 							</div>
-							<!-- //주소 출력 -->
+							<div>
+								<dt><span>지번</span></dt>
+								<dd>서울특별시 영등포구 여의도동 15-15 일신빌딩 8층</dd>
+							</div>
+						</dl>
+					</div>
+					<!-- //주소 출력 -->
+				</div>
+				<div class="area_request">
+					<h6>배송요청 사항</h6>
+					<div class="form_field">
+						<div>
+							<input type="radio" name="rdi-request2" id="rdi-request21" value="" checked=""> 
+							<label for="rdi-request21"><span>문앞</span></label>
 						</div>
-						<div class="area_request">
-							<h6>배송요청 사항</h6>
-							<div class="form_field">
-								<div>
-									<input type="radio" name="rdi-request2" id="rdi-request21" value="" checked=""> 
-									<label for="rdi-request21"><span>문앞</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request2" id="rdi-request22" value="" checked=""> 
-									<label for="rdi-request22"><span>직접받고 부재시 문 앞</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request2" id="rdi-request23" value="" checked=""> 
-									<label for="rdi-request23"><span>경비실</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request2" id="rdi-request24" value="" checked=""> 
-									<label for="rdi-request24"><span>택배함</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request2" id="rdi-request25" value="" checked=""> 
-									<label for="rdi-request25"><span>기타사항</span></label>
-									<div class="info_box">
-										<div class="input_wrap">
-											<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
-											<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
-										</div>
-									</div>
+						<div>
+							<input type="radio" name="rdi-request2" id="rdi-request22" value="" checked=""> 
+							<label for="rdi-request22"><span>직접받고 부재시 문 앞</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request2" id="rdi-request23" value="" checked=""> 
+							<label for="rdi-request23"><span>경비실</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request2" id="rdi-request24" value="" checked=""> 
+							<label for="rdi-request24"><span>택배함</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request2" id="rdi-request25" value="" checked=""> 
+							<label for="rdi-request25"><span>기타사항</span></label>
+							<div class="info_box">
+								<div class="input_wrap">
+									<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
+									<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
 								</div>
 							</div>
 						</div>
-						<div class="btn_group_block">
-							<button class="btn btn_dark btn_block">
-								<span>배송지 수정완료</span>
-							</button>
-						</div>
-					</form>
+					</div>
+				</div>
+				<div class="btn_group_block">
+					<button class="btn btn_dark btn_block">
+						<span>배송지 수정완료</span>
+					</button>
 				</div>
 			</div>
 		</div>

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

@@ -1,52 +1,102 @@
 <!-- 배송요청사항수정 팝업 -->
-<div class="modal fade od_pop rqstModify_pop" id="rqstModifyPop" tabindex="-1" role="dialog" aria-labelledby="rqstModifyLabel" aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<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">
-						<div class="area_request">
-							<div class="form_field">
-								<div>
-									<input type="radio" name="rdi-request3" id="rdi-request31" value="" checked=""> 
-									<label for="rdi-request31"><span>문앞</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request3" id="rdi-request32" value="" checked=""> 
-									<label for="rdi-request32"><span>직접받고 부재시 문 앞</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request3" id="rdi-request33" value="" checked=""> 
-									<label for="rdi-request33"><span>경비실</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request3" id="rdi-request34" value="" checked=""> 
-									<label for="rdi-request34"><span>택배함</span></label>
-								</div>
-								<div>
-									<input type="radio" name="rdi-request3" id="rdi-request35" value="" checked=""> 
-									<label for="rdi-request35"><span>기타사항</span></label>
-									<div class="info_box">
-										<div class="input_wrap">
-											<input type="text" class="form_control" maxlength="30" placeholder="보관장소만 입력">
-											<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
-										</div>
-									</div>
+<div class="modal-dialog" role="document">
+	<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" value="" checked=""> 
+							<label for="rdi-request31"><span>문앞</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request3" id="rdi-request32" value="" checked=""> 
+							<label for="rdi-request32"><span>직접받고 부재시 문 앞</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request3" id="rdi-request33" value="" checked=""> 
+							<label for="rdi-request33"><span>경비실</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request3" id="rdi-request34" value="" checked=""> 
+							<label for="rdi-request34"><span>택배함</span></label>
+						</div>
+						<div>
+							<input type="radio" name="rdi-request3" id="rdi-request35" value="" checked=""> 
+							<label for="rdi-request35"><span>기타사항</span></label>
+							<div class="info_box">
+								<div class="input_wrap">
+									<input type="text" name="etcDelvMemo" class="form_control" maxlength="30" placeholder="보관장소만 입력">
+									<p>보관 장소 외 다른 내용 입력시 통보없이 삭제 될 수 있습니다.</p>
 								</div>
 							</div>
 						</div>
-						<div class="btn_group_block">
-							<button class="btn btn_dark btn_block">
-								<span>등록</span>
-							</button>
-						</div>
-					</form>
+					</div>
+				</div>
+				<div class="btn_group_block">
+					<button class="btn btn_dark btn_block" id="btn_delvMemoChange">
+						<span>등록</span>
+					</button>
 				</div>
 			</div>
 		</div>
 	</div>
 </div>
-<!-- //배송요청사항수정 팝업 -->
+
+<script type="text/javascript">
+// 배송메모버튼클릭
+$("input[name='rdi-request3']").on("click", function(){
+	// 배송메모내용
+	var rtnTxt = $("input[name='rdi-request3']:checked").parent().find('span').text();
+	
+	if (rtnTxt == "기타사항") {
+		$("input[name='etcDelvMemo'").removeAttr("disbled");
+	} else {
+		$("input[name='etcDelvMemo'").attr("disbled", true);
+	}
+});
+
+// 배송메모등록버튼
+$("#btn_delvMemoChange").on("click", function(){
+	var rtnTxt = $("input[name='rdi-request3']:checked").parent().find('span').text();
+	if (rtnTxt == "기타사항") {
+		rtnTxt = $("input[name='etcDelvMemo'").val();
+	} 
+	
+	// 배송메모 부모창에 설정
+	$("input[name='delvMemo']").val(rtnTxt);		// input 값에 설정
+	$("#delvMemo").text(rtnTxt);					// 메모 text 설정
+	$(".close-modal").trigger("click");				// 팝업닫기
+});
+
+// 초기배송메모설정
+$(document).ready( function() {
+	
+	// 배송메모 초기값설정
+	var delvMemo = $("input[name='delvMemo']").val();
+	$("input[name='rdi-request3'").each(function(i){
+		var rtnTxt = $(this).parent().find('span').text();
+		
+		if (rtnTxt == delvMemo) {
+			$(this).attr("checked", true);
+		} else {
+			$(this).removeAttr("checked");
+		}
+	});
+	
+	$("input[name='rdi-request3']").trigger('change');
+});
+</script>
+<!-- //배송요청사항수정 팝업 -->
+
+
+
+
+
+
+
+
+

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

@@ -17,19 +17,23 @@
  -->
 <body>
 <th:block layout:fragment="content">
-	<link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
-	<script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
-	<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
-	<script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
-	
-	<!-- 
-	<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
-	<script type="text/javascript" src="https://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
-	<script type="text/javascript" src="/ux/pc/js/jquery.modal.min.js"></script>
-	<script type="text/javascript" src="/ux/pc/js/common-ui.js"></script>
-	 -->
 
-	<!--  container -->
+<link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css">
+<script type="text/javascript" src="/ux/pc/js/swiper.min.js"></script>
+<script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
+<script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
+
+<!-- 
+<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.0.min.js"></script>
+<script type="text/javascript" src="https://code.jquery.com/jquery-migrate-1.2.1.min.js"></script>
+<script type="text/javascript" src="/ux/pc/js/jquery.modal.min.js"></script>
+<script type="text/javascript" src="/ux/pc/js/common-ui.js"></script>
+ -->
+
+<!--  container -->
+<form id="payForm" name="payForm">
+	<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
+		
 	<div id="container" class="container od">
 		<div class="wrap">
 			<div class="content odPayment">
@@ -108,10 +112,13 @@
 															<dt>
 																<span class="sr-only">휴대폰 번호</span>
 															</dt>
-															<dd th:text="${custemerInfo.cellPhnno}">
-																<button type="button" class="btn_popup" id="">
-																	<span>본인인증하기</span>
-																</button>
+															<dd>
+																<span th:text="${custemerInfo.cellPhnno}"></span>
+																<th:block th:if="${custemerInfo.ci} == null or ${custemerInfo.ci} == ''">
+																	<button type="button" class="btn_popup" id="">
+																		<span>본인인증하기</span>
+																	</button>
+																</th:block>
 															</dd>
 														</div>
 													</dl>
@@ -134,11 +141,10 @@
 												<div class="area_mbinfo">
 													<dl>
 														<div>
-															<dt>
-																<span class="sr-only">배송지명</span>
-															</dt>
+															<dt><span class="sr-only">배송지명</span></dt>
 															<dd>
-																홍길동 <span class="icon_tag"> 
+																<span th:text="${deliveryAddrInfo.delvAddrNm}"></span>
+																<span class="icon_tag">
 																	<em class="tag_stype1">기본 배송지</em> 
 																	<em class="tag_stype2">총알배송</em>
 																</span>
@@ -148,7 +154,8 @@
 															<dt>
 																<span class="sr-only">배송주소</span>
 															</dt>
-															<dd th:text="${deliveryAddrInfo.recipBaseAddr} + ${deliveryAddrInfo.recipDtlAddr}">
+															<dd>
+																<span th:text="${deliveryAddrInfo.recipBaseAddr} + ${deliveryAddrInfo.recipDtlAddr}"></span>
 																<button type="button" class="btn_popup" id="btn_adrsChange_pop">
 																	<span>배송지 선택</span>
 																</button>
@@ -163,7 +170,7 @@
 														<div>
 															<dt>배송요청 사항</dt>
 															<dd>
-																직접받고 부재 시 문앞
+																<span th:text="${deliveryAddrInfo.delvMemo}" id="delvMemo"></span>
 																<button type="button" class="btn_popup" id="btn_rqstModify_pop">
 																	<span>변경하기</span>
 																</button>
@@ -180,11 +187,11 @@
 															<dd>
 																<div class="form_field">
 																	<div>
-																		<input type="radio" name="rdi-overseas" id="rdi-overs1" value="" checked=""> 
+																		<input type="radio" name="rdi-overseas" id="rdi-overs1" checked> 
 																		<label for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>
 																	</div>
 																	<div>
-																		<input type="radio" name="rdi-overseas" id="rdi-overs2" value=""> 
+																		<input type="radio" name="rdi-overseas" id="rdi-overs2">
 																		<label for="rdi-overs2"><span>입력 안 함</span></label>
 																	</div>
 																	<div class="info_box overs1">
@@ -242,70 +249,75 @@
 												<!-- //주문제작상품일 경우 노출 -->
 											</div> <!-- //배송지정보 -->
 										</li>
-										<li>
-											<!-- 사은품선택 -->
-											<div class="fold_head">
-												<a href="javascript:void(0)">
-													<div>
-														<div class="fold_tit">
-															<span>사은품 선택</span>
-														</div>
-														<div class="data">
-															<span>사은품 총 <em class="total_gift">2</em>개 선택</span> 
-															<span><em class="total_deduct">0</em>P 차감</span>
+										
+										<!-- 사은품선택 -->
+										<th:block th:if="${freegiftList != null && #lists.size(freegiftList) > 0}">
+											<li>
+												<div class="fold_head">
+													<a href="javascript:void(0)">
+														<div>
+															<div class="fold_tit">
+																<span>사은품 선택</span>
+															</div>
+															<div class="data">
+																<span>사은품 총 <em class="total_gift">0</em>&nbsp;개 선택</span> 
+																<span><em class="total_deduct">0</em>&nbsp;P 차감</span>
+															</div>
 														</div>
-													</div>
-												</a>
-											</div>
-											<div class="fold_cont" style="display: none;">
-												<div class="area_selgift">
-													<th:block th:each="freegift, i : ${freegiftList}">
-														<div class="gift_box">
-															<p class="txt">
-																<span th:text="'사은품선택' + ${i.count} + '' + ${freegift.freegiftNm}"></span>
-															</p>
-															<div class="form_field">
-																<th:block th:each="freegiftGoods, k : ${freegiftGoodsList}">
-																	<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
-																		<div class="gift">
-																			<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img" value=""> 
-																			<label th:for="'rdi-gift'+${i.count}+${k.count}"> 
-																				<span class="thumb"><img src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
-																				<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 
-																				<span th:if="${freegiftGoods.usePoint} < 1" class="deduct" th:text="무료"></span>
-																				<span th:if="${freegiftGoods.usePoint} > 0" class="deduct" th:text="|- ${freegiftGoods.usePoint} P|"></span>
-																			</label>
-																		</div>
+													</a>
+												</div>
+												<div class="fold_cont" style="display: none;">
+													<div class="area_selgift">
+														<th:block th:each="freegift, i : ${freegiftList}">
+															<div class="gift_box">
+																<p class="txt">
+																	<span th:text="'사은품선택' + ${i.count} + '' + ${freegift.freegiftNm}"></span>
+																</p>
+																<div class="form_field">
+																	<th:block th:each="freegiftGoods, k : ${freegiftGoodsList}">
+																		<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
+																			<div class="gift">
+																				<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" th:usepoint="${freegiftGoods.usePoint}"> 
+																				<label th:for="'rdi-gift'+${i.count}+${k.count}"> 
+																					<span class="thumb"><img src="http://ts5000.ipdisk.co.kr:89/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
+																					<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 
+																					<span th:if="${freegiftGoods.usePoint} < 1" class="deduct" th:text="무료"></span>
+																					<span th:if="${freegiftGoods.usePoint} > 0" class="deduct" th:text="|- ${freegiftGoods.usePoint} P|"></span>
+																				</label>
+																			</div>
+																		</th:block>
 																	</th:block>
-																</th:block>
-																<div class="gift">
-																	<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img" value=""> 
-																	<label th:for="${i.count}+'0'"> 
-																		<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width=""alt=""></span> 
-																		<span class="name">사은품 수령안함</span> 
-																		<span class="deduct">수령거부</span>
-																	</label>
+																	<div class="gift">
+																		<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0"> 
+																		<label th:for="${i.count}+'0'">
+																			<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width=""alt=""></span> 
+																			<span class="name">사은품 수령안함</span>
+																			<span class="deduct">수령거부</span>
+																		</label>
+																	</div>
 																</div>
 															</div>
-														</div>
-													</th:block>
-													<div class="form_field">
-														<div class="agree_gift">
-															<p>
-																<input id="chk-agree_gift" type="checkbox">
-																<label for="chk-agree_gift"><span>동의합니다</span></label>
-															</p>
-															<p class="txt">
-																사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다.
-																<button type="button" class="btn_link_popup" id="btn_infoGift_pop">
-																	<span>보기</span>
-																</button>
-															</p>
+														</th:block>
+														<div class="form_field">
+															<div class="agree_gift">
+																<p>
+																	<input id="chk-agree_gift" type="checkbox">
+																	<label for="chk-agree_gift"><span>동의합니다</span></label>
+																</p>
+																<p class="txt">
+																	사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다.
+																	<button type="button" class="btn_link_popup" id="btn_infoGift_pop">
+																		<span>보기</span>
+																	</button>
+																</p>
+															</div>
 														</div>
 													</div>
-												</div>
-											</div> <!-- //사은품선택 -->
-										</li>
+												</div> <!-- //사은품선택 -->
+											</li>
+										</th:block>
+										
+										
 										<li>
 											<!-- 할인/혜택 사용 -->
 											<div class="fold_head">
@@ -346,48 +358,50 @@
 																<div class="coupon_list">
 																	<ul>
 																		<!--  상품쿠폰 -->
-																		<th:block th:each="goods, i : ${goodsApplyCpnList}">
-																			<li>
-																				<div class="coupon">
-																					<div class="item_gd">
-																						<figure>
-																							<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
-																							<figcaption>
-																								<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
-																								<div class="name" th:text="${goods.goodsNm}"></div>
-																								<div class="price">
-																									<span class="selling_price"  th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
-																								</div>
-																							</figcaption>
-																						</figure>
+																		<th:block th:if="${goodsApplyCpnList.size() > 0}">
+																			<th:block th:each="goods, i : ${goodsApplyCpnList}">
+																				<li>
+																					<div class="coupon">
+																						<div class="item_gd">
+																							<figure>
+																								<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>
+																								<figcaption>
+																									<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>
+																									<div class="name" th:text="${goods.goodsNm}"></div>
+																									<div class="price">
+																										<span class="selling_price"  th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
+																									</div>
+																								</figcaption>
+																							</figure>
+																						</div>
+																						<div class="form_field">
+																							<select id="" class="select_hidden">
+																								<th:block th:eath="goodsCpn, k : ${goodsCpnList}">
+																									<option th:value="${goodsCpn.cpnId}" th:text="${goodsCpn.cpnNm}"></option>
+																								</th:block>
+																							</select>
+																						</div>
+																						<div class="cp_discount">
+																							<span class="cp_amount">-10,000원 할인적용</span>
+																							<button type="button" class="btn_del_coupon" id="">
+																								<span>쿠폰적용해제</span>
+																							</button>
+																						</div>
 																					</div>
-																					<div class="form_field">
-																						<select id="" class="select_hidden">
-																							<th:block th:eath="goodsCpn, k : ${goodsCpnList}">
-																								<option th:value="${gooods.cpnId}" th:text="${gooods.cpnNm}"></option>
-																							</th:block>
-																						</select>
-																					</div>
-																					<div class="cp_discount">
-																						<span class="cp_amount">-10,000원 할인적용</span>
-																						<button type="button" class="btn_del_coupon" id="">
-																							<span>쿠폰적용해제</span>
-																						</button>
-																					</div>
-																				</div>
-																			</li>
+																				</li>
+																			</th:block>
 																		</th:block>
 																		<!--  상품쿠폰 -->
 																		
 																		<!--  장바구니쿠폰 -->
-																		<th:block th:if="${cartCpnList != null && #lists.size(cartCpnList) > 0}">
+																		<th:block th:if="${cartCpnList.size() > 0}">
 																			<li>
 																				<div class="coupon">
 																					<div class="form_field">
 																						<label for="">장바구니 할인쿠폰</label> 
 																						<select id="" class="select_hidden">
-																							<th:block th:eath="cartCpn, k : ${cartCpnList}">
-																								<option th:value="${gooods.cpnId}" th:text="${gooods.cpnNm}"></option>
+																							<th:block th:each="cartCpn, k : ${cartCpnList}">
+																								<option th:value="${cartCpn.cpnId}" th:text="${cartCpn.cpnNm}"></option>
 																							</th:block>
 																						</select>
 																					</div>
@@ -403,13 +417,13 @@
 																		<!--  장바구니쿠폰 -->
 																		
 																		<!--  배송비쿠폰 -->
-																		<th:block th:if="${delvCpnList != null && #lists.size(delvCpnList) > 0}">
+																		<th:block th:if="${delvCpnList.size() > 0}">
 																			<li>
 																				<div class="coupon">
 																					<div class="form_field">
 																						<label for="">배송비 할인쿠폰</label> 
 																						<select id="" class="select_hidden">
-																							<th:block th:eath="delvCpn, k : ${delvCpnList}">
+																							<th:block th:each="delvCpn, k : ${delvCpnList}">
 																								<option th:value="${delvCpn.cpnId}" th:text="${delvCpn.cpnNm}"></option>
 																							</th:block>
 																						</select>
@@ -766,7 +780,7 @@
 								</div>
 								<div class="od_item_box">
 									<!-- 총알배송, 일반배송-->
-									<th:block th:if="${wmsCartList != null && #lists.size(wmsCartList) > 0}">
+									<th:block th:if="${wmsCartList != null and #lists.size(wmsCartList) > 0}">
 										<div class="part_dlvr">
 											<h4 class="subH3 mb20" id="shotDelvTitle">STYLE24 총알배송<span>오늘 자정까지 도착</span></h4>
 											<h4 class="subH3 mb20" id="wmsDelvTitle">STYLE24 일반배송</h4>
@@ -795,7 +809,7 @@
 									<!-- //총알배송, 일반배송 -->
 									
 									<!-- 업체직배송 -->
-									<th:block th:if="${delvCartList != null && #lists.size(delvCartList) > 0}">
+									<th:block th:if="${delvCartList != null and #lists.size(delvCartList) > 0}">
 										<div class="part_dlvr">
 											<h4 class="subH3 mb20">업체직배송</h4>
 											<div class="gd_list">
@@ -824,7 +838,7 @@
 									<!-- //업체직배송 -->
 									
 									<!-- 예약배송 -->
-									<th:block th:if="${resCartList != null && #lists.size(resCartList) > 0}">
+									<th:block th:if="${resCartList != null and #lists.size(resCartList) > 0}">
 										<div class="part_dlvr">
 											<h4 class="subH3 mb20">예약배송</h4>
 											<div class="gd_list">
@@ -911,24 +925,129 @@
 			</div>
 		</div>
 	</div>
-	
-	<!-- // container -->
-	<footer id="footer"></footer>
-	
+</form>
+
+<!-- // container -->
+<footer id="footer"></footer>
+
+<!-- 배송지변경팝업 -->
+<div class="modal fade od_pop adrsChange_pop" id="adrsChangePop" tabindex="-1" role="dialog" aria-labelledby="adrsChangeLabel" aria-hidden="true"></div>
+
+<!-- 배송지수정팝업 -->
+<div class="modal fade od_pop adrsModify_pop" id="adrsModifyPop" tabindex="-1" role="dialog" aria-labelledby="adrsModifyLabel" aria-hidden="true"></div>
+
+<!-- 배송지추가팝업 -->
+<div class="modal fade od_pop adrsAdd_pop" id="adrsAddPop" tabindex="-1" role="dialog" aria-labelledby="adrsAddLabel" aria-hidden="true"></div>
+
+<!-- 배송요청사항수정 팝업 -->
+<div class="modal fade od_pop rqstModify_pop" id="rqstModifyPop" tabindex="-1" role="dialog" aria-labelledby="rqstModifyLabel" aria-hidden="true"></div>
+
+<!-- 사은품지급안내 팝업 -->
+<div class="modal fade od_pop infoGift_pop" id="infoGiftPop" tabindex="-1" role="dialog" aria-labelledby="infoGiftLabel" aria-hidden="true"></div>
+
 <script type="text/javascript">
 
 $(document).ready( function() {
 	
+	// 배송지변경 팝업열기
+	$(document).on('click','#btn_adrsChange_pop',function(e){
+		$.ajax( {
+			type		: "POST",
+			url 		: '/order/delvAddrChangePop',
+			dataType 	: 'html',
+			success 	: function(result) {
+				if (result != null) {
+					$("#adrsChangePop").html(result);
+					$("#adrsChangePop").modal("show");
+				}
+			}
+		});
+		
+		return false;
+	});
+
+	// 배송지추가 팝업열기
+	$(document).on('click','#btn_addrAdd_pop',function(e){
+		$.ajax( {
+			type		: "POST",
+			url 		: '/order/delvAddrAddPop',
+			dataType 	: 'html',
+			success 	: function(result) {
+				if (result != null) {
+					$("#adrsAddPop").html(result);
+					$("#adrsAddPop").modal("show");
+				}
+			}
+		});
+		
+		return false;
+	});
+
+	// 배송지수정 팝업열기
+	$("#btn_addrModify_pop").on("click", function(e){
+		$.ajax( {
+			type		: "POST",
+			url 		: '/order/delvAddrModifyPop',
+			dataType 	: 'html',
+			success 	: function(result) {
+				if (result != null) {
+					$("#adrsModifyPop").html(result);
+					$("#adrsModifyPop").modal("show");
+				}
+			}
+		});
+		
+		return false;
+	});
+
+	// 배송요청사항 팝업열기
+	$("#btn_rqstModify_pop").on("click", function(e){
+		var jsonObj = new Object();
+		jsonObj.delvMemo = $("input[name='delvMemo']").val();
+		
+		$.ajax({
+			type		: "POST",
+			url 		: "/order/delvMemoChangePop",
+			data		: jsonObj,
+			dataType 	: "html",
+			success 	: function(result) {
+				if (result != null) {
+					$("#rqstModifyPop").html(result);
+					$("#rqstModifyPop").modal("show");
+				}
+			}
+		});
+		
+		return false;
+	});
+		
 	// 해외배송 입력
-	$(document).on('change','.odPayment .area_overseas #rdi-overs1',function(e){
+	$(document).on('change','.odPayment .area_overseas #rdi-overs1', function(e){
 		$('.info_box.overs2').hide();
 		$('.info_box.overs1').show();
 		return false;
-	}).on('change','.odPayment .area_overseas #rdi-overs2',function(e){
+	}).on('change','.odPayment .area_overseas #rdi-overs2', function(e){
 		$('.info_box.overs1').hide();
 		$('.info_box.overs2').show();
 		return false;
 	});
+	
+	// 사은품지급안내 팝업열기
+	$("#btn_infoGift_pop").on("click",function(e){
+		$.ajax({
+			type		: "POST",
+			url 		: "/order/freegiftInfoPop",
+			dataType 	: "html",
+			success 	: function(result) {
+				if (result != null) {
+					$("#infoGiftPop").html(result);
+					$("#infoGiftPop").modal("show");
+				}
+			}
+		});
+		
+		return false;
+	});
 
 	// 할인쿠폰 확인
 	$(document).on('click','.odPayment .area_seldiscount .btn_coupon_toggle',function(e){
@@ -984,51 +1103,13 @@ $(document).ready( function() {
 	});
 
 	// 개인정보동의 열고닫기
-	$(document).on('click','.area_paymentinfo .payinfo_blk a',function(e){
+	$(document).on('click','.area_paymentinfo .payinfo_blk a',function(e){		
 		e.preventDefault();
 		$(this).parents('.payinfo_blk').toggleClass('on');
 		var privacyToggle = $(this).find('span');
 		$(privacyToggle).text($(privacyToggle).text() == '보기' ? '닫기' : '보기');
 		return false;
 	});
-	
-	
-	
-
-	// 배송지변경 팝업열기
-	$(document).on('click','#btn_adrsChange_pop',function(e){
-		$("#adrsChangePop").modal("show");
-		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");
-		return false;
-	});
-
-	// 배송요청사항 팝업열기
-	$(document).on('click','#btn_rqstModify_pop',function(e){
-		$("#rqstModifyPop").modal("show");
-		return false;
-	});
-	
-	
-	
-	
-	
-
-	// 사은품지급안내 팝업열기
-	$(document).on('click','#btn_infoGift_pop',function(e){
-		$("#infoGiftPop").modal("show");
-		return false;
-	});
 
 	// 간편결제등록 > STEP1.이용약관 팝업열기
 	$(document).on('click','.btn_addcard',function(e){
@@ -1093,7 +1174,6 @@ $(document).ready( function() {
 				$("#wmsDelv").text(wmsCnt);
 				$("#wmsDelvTitle").css("display", "block");
 				$("#shotDelvTitle").css("display", "none");
-				
 				$(".tag_stype2").css("display", "none");
 
 				// 자사몰 총알배송
@@ -1134,19 +1214,25 @@ $(document).ready( function() {
 			$("#resDelvArea").css("display", "block");
 		}
 	});
-
-	$(function(){
-		$('.od .od_cont').on('click','.area_overseas input',function(e){
-			//해외배송 입력
-			e.preventDefault();
-			$(this).parent('div').find('.info_box').show();
-			$(this).parent('div').siblings('div').find('.info_box').hide();
-		}).on('click','.btn_coupon_toggle',function(e){
-			//할인쿠폰 확인
-			e.preventDefault();
-			$('.coupon_list').toggle();
-			$(this).toggleClass('on');
+	
+	// 사은품선택 라디오 버튼 기능
+	$(".freegiftRdo").on("click", function() {
+		var total_gift 		= 0;
+		var total_deduct 	= 0;
+		
+		$(".freegiftRdo").each(function(){
+			// 라디오버튼 사은품 체크
+			if ($(this).is(":checked")) {
+				// 수령거부가 아닐때 체크
+				if ($(this).val() != "noSel") {
+					total_gift 		+= 1;
+					total_deduct 	+= parseInt($(this).attr("usepoint"));
+				}
+			}
 		});
+		
+		$(".total_gift").text(total_gift);			// 사은품총선택개수
+		$(".total_deduct").text(total_deduct);		// 사은품총사용포인트
 	});
 </script>
 </th:block>

src/main/webapp/WEB-INF/views/web/order/OrderFreegiftInfoPopWeb.html

@@ -0,0 +1,22 @@
+<!-- 사은품지급안내 팝업 -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="infoGiftLabel">STYLE24 사은품 지급 안내</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">사은품지급안내 내용입니다. 사은품지급안내 내용입니다.사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다. 사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.
+				사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.
+				사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.
+				사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
+				내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.</div>
+		</div>
+	</div>
+</div>
+<!-- //사은품지급안내 팝업 -->

src/main/webapp/WEB-INF/views/web/order/OrderFreegiftInfoWeb.html

@@ -1,26 +0,0 @@
-<!-- 사은품지급안내 팝업 -->
-<div class="modal fade od_pop infoGift_pop" id="infoGiftPop"
-	tabindex="-1" role="dialog" aria-labelledby="infoGiftLabel"
-	aria-hidden="true">
-	<div class="modal-dialog" role="document">
-		<div class="modal-content">
-			<div class="modal-header">
-				<h5 class="modal-title" id="infoGiftLabel">STYLE24 사은품 지급 안내</h5>
-			</div>
-			<div class="modal-body">
-				<div class="pop_cont">사은품지급안내 내용입니다. 사은품지급안내 내용입니다.사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다. 사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.
-					사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.
-					사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.
-					사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내
-					내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.사은품지급안내 내용입니다.</div>
-			</div>
-		</div>
-	</div>
-</div>
-<!-- //사은품지급안내 팝업 -->