마이페이지 단테 수정 임시 커밋

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -460,8 +460,9 @@ public class TsfOrderService {
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
-				// TODO
-				// 배송비 pay_sq update 처리
+				// TB_DELIVERY_FEE PAY_SQ 등록
+				result.setUpdNo(payment.getUpdNo());
+				coreOrderDao.updateDeliveryFeePaySq(result);
 			}
 		} catch(Exception e) {
 			e.printStackTrace();
@@ -501,8 +502,9 @@ public class TsfOrderService {
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
-				// TODO
-				// 배송비 pay_sq update 처리
+				// TB_DELIVERY_FEE PAY_SQ 등록
+				result.setUpdNo(payment.getUpdNo());
+				coreOrderDao.updateDeliveryFeePaySq(result);
 			}
 		} catch(Exception e) {
 			e.printStackTrace();

src/main/webapp/WEB-INF/views/mob/mypage/ChangeOptionPopupFormMob.html

@@ -11,9 +11,12 @@
 						<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}">
 						<li>
 							<div class="option_name">
-								<span>
+								<span th:if="${oneData.goodsType == 'G056_S'}">
 									<em th:text="${oneData.itemNm}"></em> / <em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
 								</span>
+								<span th:unless="${oneData.goodsType == 'G056_S'}">
+									<em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
+								</span>
 							</div>
 							<div class="option_box">
 								<th:block th:if="${oneData.optCd2Arr.length > 0}" th:each="option, idx : ${oneData.optCd2Arr}">
@@ -29,9 +32,12 @@
 					<th:block th:unless="${oneData.selfGoodsYn == 'Y'}">
 						<li>
 							<div class="option_name">
-								<span>
+								<span th:if="${oneData.goodsType == 'G056_S'}">
 									<em th:text="${oneData.itemNm}"></em> / <em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
 								</span>
+								<span th:unless="${oneData.goodsType == 'G056_S'}">
+									<em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
+								</span>
 							</div>
 							<div class="option_select">
 								<div class="select_custom select_option">
@@ -71,7 +77,7 @@
 					</th:block>
 				</th:block>
 			</div>
-			<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}" />
+			<input type="hidden" name="chgOptCd2" th:unless="${oneData.selfGoodsYn == 'Y'}" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}" />
 		</div>
 	</div>
 </div>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html

@@ -232,7 +232,7 @@
 			<div class="inner">
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
-						<h3>교환 회수지 주소</h3>
+						<h3>반품 회수지 주소</h3>
 						<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
 							<button type="button" id="btn_adrsChange_pop" class="btn_popup"  onclick="fnChangeAddr('chger');">
 								<span>회수지 변경</span>

src/main/webapp/WEB-INF/views/mob/mypage/MypageDeliveryInfoFormMob.html

@@ -44,8 +44,8 @@
 							<div class="goods_status">
 								<!-- 선물주문 -->
 								<th:block th:if="${order.giftPackYn == 'Y'}">
-									<p class="dlvr_staus" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-									<p class="dlvr_staus" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 								</th:block>
 								<!-- //선물주문 -->
@@ -298,7 +298,7 @@
 							<!-- 선물주문 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
 								<!-- 배송지등록전 -->
-								<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
 									<div><button type="button" class="btn btn_primary btn_sms_send" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></div>
 								</th:block>
 								<!-- //배송지등록전 -->
@@ -311,7 +311,7 @@
 								
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
 										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
@@ -417,28 +417,32 @@
 							
 							<!-- 선물배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-								<div class="goods_txt">
-									<!-- 배송지등록전 -->
-									<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
+								<!-- 배송지등록전 -->
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
 										<p class="period">입력기한 <span th:text="${ordDtl.giftLimitDt}"></span></p>
-									</th:block>
-									<!-- //배송지등록전 -->
-									
-									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-										<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									</div>
+								</th:block>
+								<!-- //배송지등록전 -->
+								
+								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+										<div class="goods_txt">
 											<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
-										</th:block>
+										</div>
 									</th:block>
-									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									
-									<!-- 선물 취소 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+								</th:block>
+								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								
+								<!-- 선물 취소 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc">주소 입력 기한이 경과되어 선물이 취소 되었습니다.</p>
-									</th:block>
-									<!-- //선물 취소 -->
-								</div>
+									</div>
+								</th:block>
+								<!-- //선물 취소 -->
 							</th:block>
 							<!-- //선물배송일때 -->
 							<!-- //주문상태별 문구정보 정의 -->

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -51,8 +51,8 @@
 							<div class="goods_status">
 								<!-- 선물주문 -->
 								<th:block th:if="${order.giftPackYn == 'Y'}">
-									<p class="dlvr_staus" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-									<p class="dlvr_staus" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 								</th:block>
 								<!-- //선물주문 -->
@@ -440,28 +440,32 @@
 							
 							<!-- 선물배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-								<div class="goods_txt">
-									<!-- 배송지등록전 -->
-									<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+								<!-- 배송지등록전 -->
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc"><span th:text="|‘${deliveryAddrInfo.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
 										<p class="period">입력기한 <span th:text="${ordDtl.giftLimitDt}"></span></p>
-									</th:block>
-									<!-- //배송지등록전 -->
-									
-									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-										<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									</div>
+								</th:block>
+								<!-- //배송지등록전 -->
+								
+								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+										<div class="goods_txt">
 											<p class="cf_txt cf_desc"><span th:text="|‘${deliveryAddrInfo.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
-										</th:block>
+										</div>
 									</th:block>
-									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									
-									<!-- 선물 취소 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+								</th:block>
+								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								
+								<!-- 선물 취소 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc">주소 입력 기한이 경과되어 선물이 취소 되었습니다.</p>
-									</th:block>
-									<!-- //선물 취소 -->
-								</div>
+									</div>
+								</th:block>
+								<!-- //선물 취소 -->
 							</th:block>
 							<!-- //선물배송일때 -->
 							<!-- //주문상태별 문구정보 정의 -->

src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListInfoMob.html

@@ -30,10 +30,8 @@
 								<!-- //배송지등록전 -->
 								
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-										<p class="dlvr_staus">선물 완료</p>
-									</th:block>
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									<p class="dlvr_staus">선물 완료</p>
 								</th:block>
 								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -600,19 +600,19 @@ var fnReturn = function() {
 
 	let jsonData = JSON.stringify(data);
 
-	//gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-	//	if (addPayCost > 0) {
-	//		let ordChgSq = result.ordChgSq;
-	//		let ordNo = result.ordNo;
-	//
-	//		$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
-	//		$('#addPaymentForm input[name=ordNo]').val(ordNo);
-	//
-	//		document.addPaymentForm.submit();
-	//	} else {
-	//		cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
-	//	}
-	//}, true);
+	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		if (addPayCost > 0) {
+			let ordChgSq = result.ordChgSq;
+			let ordNo = result.ordNo;
+
+			$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
+			$('#addPaymentForm input[name=ordNo]').val(ordNo);
+
+			document.addPaymentForm.submit();
+		} else {
+			cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
+		}
+	}, true);
 }
 
 // 반품 수량 변경 이벤트 처리

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreExchangeDetailFormMob.html

@@ -217,7 +217,7 @@
 			<div class="inner">
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
-						<h3>교환 회수지 주소</h3>
+						<h3>반품 회수지 주소</h3>
 						<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
 							<button type="button" class="btn_popup"  onclick="fnChangeAddr('chger');">
 								<span>회수지 변경</span>

src/main/webapp/WEB-INF/views/web/mypage/ChangeOptionPopupFormWeb.html

@@ -8,7 +8,8 @@
 			<div class="modify_option_area" id="modifyOptionArea">
 				<th:block th:if="${exchangeOptionInfo}" th:each="oneData, status : ${exchangeOptionInfo}">
 					<div class="modify_box" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, num=${num}">
-						<div class="name_blk" th:text="|${oneData.itemNm} / ${oneData.colorNm}|"></div>
+						<div class="name_blk" th:if="${oneData.goodsType == 'G056_S'}" th:text="|${oneData.itemNm} / ${oneData.colorNm} / ${oneData.optCd2}|"></div>
+						<div class="name_blk" th:unless="${oneData.goodsType == 'G056_S'}" th:text="|${oneData.colorNm} / ${oneData.optCd2}|"></div>
 						<div class="select_blk">
 							<!-- 옵션교환 라디오 형태 -->
 							<div class="sel_radio" th:if="${oneData.selfGoodsYn == 'Y'}">

src/main/webapp/WEB-INF/views/web/mypage/MypageCreExchangeDetailFormWeb.html

@@ -179,7 +179,7 @@
 						</table>
 					</div>
 					<th:block th:if="${oneData.wdGb == 'W'}">
-						<h4 class="subH3">교환 회수지 주소</h4>
+						<h4 class="subH3">반품 회수지 주소</h4>
 						<div class="tbl type1">
 							<table>
 								<colgroup>

src/main/webapp/WEB-INF/views/web/mypage/MypageDeliveryInfoFormWeb.html

@@ -92,8 +92,8 @@
 											<div class="status_box">
 												<!-- 선물 -->
 												<th:block th:if="${order.giftPackYn == 'Y'}">
-													<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-													<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+													<p th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+													<p th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 													<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 												</th:block>
 												<!-- 주문 -->
@@ -106,7 +106,7 @@
 												<!-- 선물 -->
 												<th:block th:if="${order.giftPackYn == 'Y'}">
 													<!-- SMS 재발송 버튼 -->
-													<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+													<th:block th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
 													</th:block>
 
@@ -116,12 +116,12 @@
 													</th:block>
 
 													<!-- 리뷰 쓰기 버튼 -->
-													<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+													<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 													</th:block>
 
 													<!-- 쇼핑백담기 버튼(구매확정) -->
-													<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+													<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
 													</th:block>
 												</th:block>
@@ -188,12 +188,12 @@
 										<!-- 선물 -->
 										<th:block th:if="${order.giftPackYn == 'Y'}">
 											<!-- 주소 입력 대기중 -->
-											<div class="order_text" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+											<div class="order_text" th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">
 												<p th:text="|${ordDtl.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${ordDtl.giftLimitDt})|"></p>
 											</div>
 
 											<!-- 선물 완료 -->
-											<div class="order_text" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+											<div class="order_text" th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
 												<p th:text="|${ordDtl.recipNm}님께 선물이 발송되었습니다.|"></p>
 											</div>
 

src/main/webapp/WEB-INF/views/web/mypage/MypageExchangeFormWeb.html

@@ -172,7 +172,7 @@
 							</table>
 						</div>
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
-							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
+							<h4 class="subH3">반품 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
 								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
 								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -98,8 +98,8 @@
 												<div class="status_box">
 													<!-- 선물 -->
 													<th:block th:if="${order.giftPackYn == 'Y'}">
-														<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-														<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+														<p th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+														<p th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 														<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 													</th:block>
 													<!-- 주문 -->
@@ -112,7 +112,7 @@
 													<!-- 선물 -->
 													<th:block th:if="${order.giftPackYn == 'Y'}">
 														<!-- SMS 재발송 버튼 -->
-														<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+														<th:block th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
 														</th:block>
 
@@ -122,12 +122,12 @@
 														</th:block>
 														
 														<!-- 리뷰 쓰기 버튼 -->
-														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+														<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 														</th:block>
 
 														<!-- 쇼핑백담기 버튼(구매확정) -->
-														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+														<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
 														</th:block>
 													</th:block>

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -465,9 +465,9 @@
 					tag += '										<div class="status_box">\n';
 					// 상태값 처리
 					if (ordDtl.giftPackYn == 'Y') {
-						if (gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.giftLimitDay >= 0) {
+						if (ordDtl.giftAddrInpYn == 'N' && ordDtl.giftLimitDay >= 0) {
 							tag += '											<p>주소 입력 대기중</p>\n';
-						} else if (!gagajf.isNull(ordDtl.recipBaseAddr)) {
+						} else if (ordDtl.giftAddrInpYn == 'Y' && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
 							tag += '											<p>선물 완료</p>\n';
 						} else if (ordDtl.ordDtlStat == 'G013_98' || ordDtl.ordDtlStat == 'G013_99' || ordDtl.giftLimitDay < 0) {
 							tag += '											<p>선물 취소</p>\n';

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreExchangeDetailFormWeb.html

@@ -176,7 +176,7 @@
 						</table>
 					</div>
 					<th:block th:if="${oneData.wdGb == 'W'}">
-						<h4 class="subH3">교환 회수지 주소</h4>
+						<h4 class="subH3">반품 회수지 주소</h4>
 						<div class="tbl type1">
 							<table>
 								<colgroup>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberExchangeFormWeb.html

@@ -171,7 +171,7 @@
 							</table>
 						</div>
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
-							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
+							<h4 class="subH3">반품 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
 								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
 								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">

src/main/webapp/WEB-INF/views/web/pg/KakaoPaymentRequestWeb.html

@@ -15,7 +15,7 @@
  -->
 <head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
+<!--<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>-->
 <body>
 
 <script th:inline="javascript">

src/main/webapp/WEB-INF/views/web/pg/NaverPaymentRequestWeb.html

@@ -15,7 +15,7 @@
  -->
 <head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
+<!--<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>-->
 <body>
 
 <script th:inline="javascript">