112233

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

@@ -8,6 +8,7 @@
 		</div>
 		<div class="modal-body">
 			<div class="pop_cont">
+			
 				<!-- 상품쿠폰적용 -->
 				<th:block th:if="${goodsApplyCpnList.size() > 0}">
 					<h6>상품쿠폰</h6>
@@ -32,11 +33,6 @@
 													<div class="item_coupon"></div>
 												</div>
 												<ul class="list">
-													<input type="hidden" name="cpnType" value="goodsCpn"/>
-													<input type="hidden" name="cpnCartSq" th:value="${goods.cartSq}"/>
-													<input type="hidden" name="custCpnSq" value="0"/>
-													<input type="hidden" name="cpnDcAmt" value="0"/>
-															
 													<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true"추가  -->
 													<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">
 														<li th:value="${goodsCpn.custCpnSq}" th:data="${goodsCpn.cpnDcAmt}">
@@ -59,6 +55,10 @@
 													<li value="0" data="0">
 														<div class="item_coupon empty"><p class="empty">적용 안함</p></div>
 													</li>
+													<input type="hidden" name="cpnType" value="goodsCpn"/>
+													<input type="hidden" name="cpnCartSq" th:value="${goods.cartSq}"/>
+													<input type="hidden" name="custCpnSq" value="0"/>
+													<input type="hidden" name="cpnDcAmt" value="0"/>
 												</ul>
 											</div>
 										</div>
@@ -75,10 +75,6 @@
 					<h6>장바구니 쿠폰</h6>
 					<div class="area_cart_coupon">
 						<div class="form_field">
-							<input type="hidden" name="cpnType" value="cartCpn"/>
-							<input type="hidden" name="custCpnSq" value="0"/>
-							<input type="hidden" name="cpnDcAmt" value="0"/>
-							
 							<th:block th:each="cartCpn, k : ${cartCpnList}">
 								<div class="cartCpn" th:value="${cartCpn.custCpnSq}">
 									<input type="hidden" name="dcWay" th:value="${cartCpn.dcWay}"/>
@@ -102,8 +98,12 @@
 											<p class="discount"><span th:text="${#numbers.formatInteger(cartCpn.cpnDcAmt, 1, 'COMMA')}"></span>원 할인</p>
 										</div>
 									</label>
+						
 								</div>
 							</th:block>
+							<input type="hidden" name="cpnType" value="cartCpn"/>
+							<input type="hidden" name="custCpnSq" value="0"/>
+							<input type="hidden" name="cpnDcAmt" value="0"/>
 						</div>
 					</div>
 				</th:block>

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

@@ -1,105 +1,99 @@
-<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">
-					<div class="area_adrsinfo">
-						<h6>배송지 정보</h6>
-						<div class="default_addrs">
-							<div class="form_field">
-								<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked="">
-								<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="받는 분">
-								</div>
-							</div>
+<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">
+			<div class="area_adrsinfo">
+				<h6>배송지 정보</h6>
+				<div class="default_addrs">
+					<div class="form_field">
+						<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked="">
+						<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="">
 						</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="휴대폰 번호" >
-								</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="">
 						</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="우편번호">
-									<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="recipZipcode" placeholder="배송주소" id="">
 						</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="상세주소">
-								</div>
-							</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 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="상세주소">
-								</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="recipDtlAddr" placeholder="상세주소" id="">
 						</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="문앞" 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>
-					<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">
 //컨텐츠 호출

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

@@ -1,69 +1,62 @@
 <!-- 배송지변경 팝업 -->
 <form name="delvAddrChangeForm" id="delvAddrChangeForm">
-<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>
-					<!-- 배송지목록 -->
-					<th:block th:each="deliveryAddr, index : ${deliveryAddrList}">
-						<li>
-							<div class="adrs_box">
-								<dl>
-									<div>
-										<input type="hidden" name="recipNm" 			th:value="${deliveryAddr.recipNm}"/>
-										<input type="hidden" name="recipPhnno" 			th:value="${deliveryAddr.recipPhnno}"/>
-										<input type="hidden" name="recipZipcode" 		th:value="${deliveryAddr.recipZipcode}"/>
-										<input type="hidden" name="recipBaseAddr" 		th:value="${deliveryAddr.recipBaseAddr}"/>
-										<input type="hidden" name="recipDtlAddr" 		th:value="${deliveryAddr.recipDtlAddr}"/>
-										<input type="hidden" name="delvMemo" 			th:value="${deliveryAddr.delvMemo}"/>
-										
-										<dt><span class="sr-only">배송지명</span></dt>
-										<dd>
-											<th:block th:text="${deliveryAddr.recipNm}"></th:block>
-											<span class="icon_tag">
-												<th:block th:if="${deliveryAddr.defaultYn} == 'Y'">
-													<em class="tag">기본 배송지</em>
-												</th:block>
-												<th:block th:if="${deliveryAddr.shotDelvUseYn} == 'Y'">
-													<em class="tag primary_line">총알배송</em>
-												</th:block>
-											</span>
-										</dd>
-									</div>
-									<div>
-										<dt><span class="sr-only">휴대폰 번호</span></dt>
-										<dd th:text="${deliveryAddr.recipPhnno}"></dd>
-									</div>
-									<div>
-										<dt><span class="sr-only">배송주소</span></dt>
-										<dd th:text="${deliveryAddr.recipBaseAddr} + ' ' + ${deliveryAddr.recipDtlAddr}"></dd>
-									</div>
-									<div>
-										<dt>배송요청 사항</dt>
-										<dd th:text="${deliveryAddr.delvMemo}"></dd>
-									</div>
-									<button type="button" class="btn btn_default btn_sm btn_addrModify_pop" th:value="${deliveryAddr.custDelvAddrSq}"><span>수정</span></button>
-									<button type="button" class="btn btn_dark btn_sm btn_sel_delvAddr" th:value="${deliveryAddr.custDelvAddrSq}"><span>선택</span></button>
-								</dl>
+<div class="modal-header">
+	<h5 class="modal-title" id="adrsChangeLabel">배송지 선택</h5>
+</div>
+<div class="modal-body">
+	<div class="pop_cont">
+		<ul>
+			<!-- 배송지목록 -->
+			<th:block th:each="deliveryAddr, index : ${deliveryAddrList}">
+				<li>
+					<div class="adrs_box">
+						<dl>
+							<div>
+								<dt><span class="sr-only">배송지명</span></dt>
+								<dd>
+									<th:block th:text="${deliveryAddr.recipNm}"></th:block>
+									<span class="icon_tag">
+										<th:block th:if="${deliveryAddr.defaultYn} == 'Y'">
+											<em class="tag">기본 배송지</em>
+										</th:block>
+										<th:block th:if="${deliveryAddr.shotDelvUseYn} == 'Y'">
+											<em class="tag primary_line">총알배송</em>
+										</th:block>
+									</span>
+								</dd>
+							</div>
+							<div>
+								<dt><span class="sr-only">휴대폰 번호</span></dt>
+								<dd th:text="${deliveryAddr.recipPhnno}"></dd>
+							</div>
+							<div>
+								<dt><span class="sr-only">배송주소</span></dt>
+								<dd th:text="${deliveryAddr.recipBaseAddr} + ' ' + ${deliveryAddr.recipDtlAddr}"></dd>
 							</div>
-						</li>
-					</th:block>
-					<!-- //배송지목록 -->
-				</ul>
-			</div>
-		</div>
-		<div class="modal-footer">
-			<button class="btn btn_dark" id="btn_addrAdd_pop"><span>배송지 추가</span></button>
-		</div>
+							<div>
+								<dt>배송요청 사항&nbsp;:&nbsp;</dt>
+								<dd th:text="${deliveryAddr.delvMemo}"></dd>
+							</div>
+						</dl>
+						<button type="button" class="btn btn_default btn_sm btn_addrModify_pop" th:value="${deliveryAddr.custDelvAddrSq}"><span>수정</span></button>
+						<button type="button" class="btn btn_dark btn_sm btn_sel_delvAddr" th:value="${deliveryAddr.custDelvAddrSq}"><span>선택</span></button>
+						
+						<input type="hidden" name="recipNm" 			th:value="${deliveryAddr.recipNm}"/>
+						<input type="hidden" name="recipPhnno" 			th:value="${deliveryAddr.recipPhnno}"/>
+						<input type="hidden" name="recipZipcode" 		th:value="${deliveryAddr.recipZipcode}"/>
+						<input type="hidden" name="recipBaseAddr" 		th:value="${deliveryAddr.recipBaseAddr}"/>
+						<input type="hidden" name="recipDtlAddr" 		th:value="${deliveryAddr.recipDtlAddr}"/>
+						<input type="hidden" name="delvMemo" 			th:value="${deliveryAddr.delvMemo}"/>
+					</div>
+				</li>
+			</th:block>
+		</ul>
 	</div>
 </div>
-<a href="#close-modal" rel="modal:close" id="adrsChangePop_close" class="close-modal">Close</a>
+<div class="modal-footer">
+	<button class="btn btn_dark" id="btn_adrsAdd_pop"><span>배송지 추가</span></button>
+</div>
 </form>
-<!-- //배송지변경 팝업 -->
 
 <script th:inline="javascript">
 //컨텐츠 호출

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

@@ -420,23 +420,71 @@
 </div>
 </form>
 
-<!-- 배송지변경 -->
-<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 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>
+	</div>
+	<a href="#close-modal" rel="modal:close" id="adrsChangePop_close" class="close-modal">Close</a>
+</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 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>
+	</div>
+	<a href="#close-modal" rel="modal:close" id="adrsAddPop_close" class="close-modal">Close</a>
+</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 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>
+	</div>
+	<a href="#close-modal" rel="modal:close" id="adrsModifyPop_close" class="close-modal">Close</a>
+</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 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>
+	</div>
+	<a href="#close-modal" rel="modal:close" id="rqstModifyPop_close" class="close-modal">Close</a>
+</div>
+<!-- //배송요청사항수정 팝업 -->
 
 <!-- 사은품지급안내 팝업 -->
-<div class="modal fade od_pop infoGift_pop" id="infoGiftPop" tabindex="-1" role="dialog" aria-labelledby="infoGiftLabel" aria-hidden="true"></div>
+<div class="modal fade 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>
+	</div>
+	<a href="#close-modal" rel="modal:close" id="infoGiftPop_close" class="close-modal">Close</a>
+</div>
+<!-- //사은품지급안내 팝업 -->
 
 <!-- 할인쿠폰 변겅 팝업 -->
-<div class="modal fade od_pop couponModify_pop" id="couponModifyPop" tabindex="-1" role="dialog" aria-labelledby="couponModifyLabel" aria-hidden="true"></div>
+<div class="modal fade couponModify_pop" id="couponModifyPop" tabindex="-1" role="dialog" aria-labelledby="couponModifyLabel" aria-hidden="true">
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<!-- 할인쿠폰 변겅 팝업 내용 -->
+		</div>
+	</div>
+	<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>
+</div>
+<!-- //할인쿠폰 변겅 팝업 -->
 
 <script th:inline="javascript">
 // 배송관련정보 변수선언
@@ -591,7 +639,7 @@ var deliveryAddrInfoSet = function(temp) {
 						gagajf.showProgressbar(true);
 					},
 					success 	: function(result) {
-						$("#adrsAddPop").html(result);
+						$("#adrsAddPop .modal-dialog .modal-content").html(result);
 						$("#adrsAddPop").modal("show");
 					}
 				});	
@@ -609,7 +657,7 @@ var deliveryAddrInfoSet = function(temp) {
 					dataType 	: "html",
 					success 	: function(result) {
 						if (result != null) {
-							$("#rqstModifyPop").html(result);
+							$("#rqstModifyPop .modal-dialog .modal-content").html(result);
 							$("#rqstModifyPop").modal("show");
 						}
 					}
@@ -655,7 +703,6 @@ var fnGetDailyDeliveryCheck = function (temp) {
 			, function (result) {
 				// 총알배송여부체크
 				var tempShotDelvYn = "N";
-				
 				if (parseInt(result) > 0) {
 					tempShotDelvYn = "Y";
 				}
@@ -1387,7 +1434,7 @@ var custCpnApply = function(obj) {
 					
 					// 할인율일때 할인금액 
 					if (dcWay == "G240_11") {
-						cartCpnDcAmt = (tempAmt * dcVal) / 100;
+						cartCpnDcAmt = parseInt((tempAmt * dcVal) / 100);
 						cartCpnDcSumAmt = cartCpnDcSumAmt + cartCpnDcAmt;
 
 						$(this).parent().find(".cartCpnSq").text(obj.attr("value"));
@@ -1741,9 +1788,9 @@ var custCpnSumAmtCal = function() {
 
 // 2. 버튼기능구현
 // 2.1 배송지변경 팝업열기
-$('#btn_adrsChange_pop').on("click", function(){
-	$("#adrsChangePop").modal("show");
-});
+// $('#btn_adrsChange_pop').on("click", function(){
+	// $("#adrsChangePop").modal("show");
+// });
 
 $(document).ready( function() {
 	//해외배송 입력