마이페이지 오류 수정

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

@@ -1413,7 +1413,7 @@ public class TsfMypageController extends TsfBaseController {
 	 */
 	@PostMapping("/track/withdraw/popup/form")
 	@ResponseBody
-	public ModelAndView trackWithdrawPopupForm(OrderChange orderChange) {
+	public ModelAndView trackWithdrawPopupForm(@RequestBody OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
 		// 스윗트래커 정보 조회

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

@@ -517,7 +517,7 @@ $('#btn_bank_certi').on('click', function () {
 		data.accountNm 	= accountNm;
 		data.accountNo 	= accountNo;
 		data.bankCd 	= bankCd;
-		data.ordNo 		= ordNo;
+		data.ordNo 		= oneData.ordNo;
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -558,9 +558,9 @@ $('#btn_bank_return').click(function() {
 		
 		if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
 			// 부모창의 input 값으로 환불계좌정보 설정
-			$('#returnForm input[name=accountNo]').val(accountNo);
-			$('#returnForm input[name=accountNm]').val(accountNm);
-			$('#returnForm input[name=bankCd]').val(bankCd);
+			$('#cancelForm input[name=accountNo]').val(accountNo);
+			$('#cancelForm input[name=accountNm]').val(accountNm);
+			$('#cancelForm input[name=bankCd]').val(bankCd);
 			
 			// 팝업 닫기
 			$("#refundAccountPop .popup_close").trigger("click");

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

@@ -223,12 +223,12 @@
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
 						<h3>회수 정보</h3>
-						<button type="button" class="btn_popup" onclick="fnGoToWithdrawDelivery()"><span>회수 조회</span></button>
+						<button type="button" class="btn_popup" th:attr="wdInvoiceNo=${oneData.wdInvoiceNo}, shipCompCd=${oneData.shipCompCd}" onclick="fnGoToWithdrawDelivery(this)"><span>회수 조회</span></button>
 					</div>
 					<div class="tbl tbl_row">
 						<dl>
 							<dt class="sr-only">택배회사/송장번호</dt>
-							<dd><span th:text="|${oneData.shipCompNm} / ${oneData.wdInvoiceNo}|"></span> / <span th:text="${oneData.wdInvoiceNo}"></span></dd>
+							<dd><span th:text="|${oneData.shipCompNm}|"></span> / <span th:text="${oneData.wdInvoiceNo}"></span></dd>
 						</dl>
 					</div>
 				</div>

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

@@ -296,15 +296,15 @@ var fnGoToCreDetail = function(param) {
 	});
 
 	/* 210409_추가 : alert 모음 */
-	$(document).on("click", "#btn_purchase_confirm", function(){
-		mcxDialog.confirm("구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?", {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",  // Confirmation button text
-			sureBtnClick: function() {  // Confirm button click callback
-				alert("9,999P가 적립되었습니다.");
-			}
-		});
-	});
+	//$(document).on("click", "#btn_purchase_confirm", function(){
+	//	mcxDialog.confirm("구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?", {
+	//		cancelBtnText: "취소",
+	//		sureBtnText: "확인",  // Confirmation button text
+	//		sureBtnClick: function() {  // Confirm button click callback
+	//			alert("9,999P가 적립되었습니다.");
+	//		}
+	//	});
+	//});
 
 	$(document).on("click", "#btn_sms_alert", function(){
 		mcxDialog.alert("SMS로 선물내역을 다시 전송하였습니다.", { 

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

@@ -143,56 +143,131 @@
 								
 								<!-- 배송중 (교환가능, 반품가능) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55'">
-									<!-- 교환가능, 반품가능 -->
-									<th:block th:if="${ordDtl.changeableYn} == 'Y' or ${ordDtl.returnableYn} == 'Y'">
-										<div class="goods_btn_wrap btn_group_flex">
-											<th:block th:if="${ordDtl.changeableYn} == 'Y'">
-												<div><button type="button" class="btn btn_default btn_exch_req" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></div>
-											</th:block>
-											<th:block th:if="${ordDtl.returnableYn} == 'Y'">
-												<div><button type="button" class="btn btn_default btn_rtn_req" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></div>
-											</th:block>
-										</div>
-									</th:block>
-									<!-- //교환가능, 반품가능 -->
-									
-									<!-- 리뷰사용가능, 리뷰등록전일때 -->
-									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" class="btn btn_default btn_delv_sch"><span>배송 조회</span></button></div>
+									<div class="goods_btn_wrap btn_group_flex btn_count">
+										<!-- 교환불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //교환불가 -->
+										<!-- 교환가능 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_exch_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange');">
+													<span>교환 신청</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //교환가능 -->
+										<!-- 반품가능 -->
+										<th:block th:if="${ordDtl.returnableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_rtn_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');">
+													<span>반품 신청</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- 반품가능 -->
+										<!-- 반품불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //반품불가 -->
+
+										<!-- 교환불가, 반품불가 -->
+										<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //교환불가, 반품불가 -->
+
+<!--										<div><button type="button" class="btn btn_default btn_delv_sch" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></div>-->
+
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
 											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
 										</th:block>
 										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
-									<!-- //리뷰사용가능, 리뷰등록전일때 -->
 								</th:block>
 								<!-- //배송중 (교환가능, 반품가능) -->
 								
 								<!-- 배송완료 (교환가능, 반품가능) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 									<div class="goods_btn_wrap btn_group_flex">
-										<!-- 교환가능, 반품가능 -->
+										<!-- 교환불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //교환불가 -->
+										<!-- 교환가능 -->
 										<th:block th:if="${ordDtl.changeableYn} == 'Y'">
-											<div><button type="button" class="btn btn_default btn_exch_req" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></div>
+											<div>
+												<button type="button" class="btn btn_default btn_exch_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange');">
+													<span>교환 신청</span>
+												</button>
+											</div>
 										</th:block>
+										<!-- //교환가능 -->
+										<!-- 반품가능 -->
 										<th:block th:if="${ordDtl.returnableYn} == 'Y'">
-											<div><button type="button" class="btn btn_default btn_rtn_req" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></div>
+											<div>
+												<button type="button" class="btn btn_default btn_rtn_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');">
+													<span>반품 신청</span>
+												</button>
+											</div>
 										</th:block>
-										<!-- //교환가능, 반품가능 -->
-										
-										<div><button type="button" id="btn_purchase_confirm btn_ord_confirm" class="btn btn_primary" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></div>
-									</div>
-									<div class="goods_btn_wrap btn_group_flex">
+										<!-- //반품가능 -->
+										<!-- 반품불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //반품불가 -->
 										<!-- 교환불가, 반품불가 -->
-										<th:block th:if="${ordDtl.changeableYn} == 'N' or ${ordDtl.returnableYn} == 'N'">
-											<div><button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+										<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
 										</th:block>
 										<!-- //교환불가, 반품불가 -->
-										
+
+										<!-- 구매확정 -->
+										<th:block th:if="${ordDtl.ordReqChgQty == 0}">
+											<div>
+												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">
+													<span>구매 확정</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //구매확정 -->
+
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
-											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
+											<div>
+												<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">
+													<span>리뷰 쓰기</span>
+												</button>
+											</div>
 										</th:block>
 										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
@@ -477,27 +552,18 @@
 	</section>
 </main>
 
-<form id="exchangeForm" name="exchangeForm" th:action="@{'/mypage/exchange/form'}" th:method="post">
-	<input type="hidden" name="ordNo"/>
-	<input type="hidden" name="ordDtlNo"/>
-	<input type="hidden" name="delvFeeCd"/>
-</form>
-<form id="returnForm" name="returnForm" th:action="@{'/mypage/return/form'}" th:method="post">
-	<input type="hidden" name="ordNo"/>
-	<input type="hidden" name="ordDtlNo"/>
-	<input type="hidden" name="delvFeeCd"/>
-</form>
-<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
-	<input type="hidden" name="ordNo"/>
-	<input type="hidden" name="ordDtlNo"/>
-	<input type="hidden" name="delvFeeCd"/>
-</form>
-
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('배송조회');
+		
+		// 버튼 클래스 설정
+		$.each($('.btn_count'), function(idx, item) {
+			if ($(item).children().length > 3 && !$(item).hasClass('col2')) {
+				$(item).addClass('col2');
+			}
+		});
 	});
 </script>
 

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

@@ -145,6 +145,18 @@
 								
 								<!-- 배송준비중-->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
+									<div class="goods_btn_wrap btn_group_flex">
+										<div>
+											<button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+										<div>
+											<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+												<span>쇼핑백 담기</span>
+											</button>
+										</div>
+									</div>
 								</th:block>
 								<!-- //배송준비중-->
 								
@@ -924,22 +936,6 @@
 	</section>
 </main>
 
-<form id="exchangeForm" name="exchangeForm" th:action="@{'/mypage/exchange/form'}" th:method="post">
-	<input type="hidden" name="ordNo"/>
-	<input type="hidden" name="ordDtlNo"/>
-	<input type="hidden" name="delvFeeCd"/>
-</form>
-<form id="returnForm" name="returnForm" th:action="@{'/mypage/return/form'}" th:method="post">
-	<input type="hidden" name="ordNo"/>
-	<input type="hidden" name="ordDtlNo"/>
-	<input type="hidden" name="delvFeeCd"/>
-</form>
-<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
-	<input type="hidden" name="ordNo"/>
-	<input type="hidden" name="ordDtlNo"/>
-	<input type="hidden" name="delvFeeCd"/>
-</form>
-
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let giftMsg				= [[${orderInfo.giftMsg}]];		// 선물메세지

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

@@ -239,7 +239,8 @@ $(document).ready(function() {
 				if (scrollTemp) {
 					var tempPage 	= parseInt($("#searchForm input[name=pageNo]").val());
 					tempPage 		= tempPage + 1;
-					
+					console.log(totalPage);
+					console.log(tempPage)
 					if (totalPage > tempPage) {
 						scrollTemp = false;
 						fnGetInfiniteScrollDataList(tempPage);
@@ -412,15 +413,15 @@ $(function() { gagaInfiniteScroll.getHistory(); });
 	});
 
 	/* 210409_추가 : alert 모음 */
-	$(document).on("click", "#btn_purchase_confirm", function(){
-		mcxDialog.confirm("구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?", {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",  // Confirmation button text
-			sureBtnClick: function() {  // Confirm button click callback
-				alert("9,999P가 적립되었습니다.");
-			}
-		});
-	});
+	//$(document).on("click", "#btn_purchase_confirm", function(){
+	//	mcxDialog.confirm("구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?", {
+	//		cancelBtnText: "취소",
+	//		sureBtnText: "확인",  // Confirmation button text
+	//		sureBtnClick: function() {  // Confirm button click callback
+	//			alert("9,999P가 적립되었습니다.");
+	//		}
+	//	});
+	//});
 
 	$(document).on("click", "#btn_sms_alert", function(){
 		mcxDialog.alert("SMS로 선물내역을 다시 전송하였습니다.", { 
@@ -432,15 +433,21 @@ $(function() { gagaInfiniteScroll.getHistory(); });
 	
 	// 등급쿠폰 다운 클릭 이벤트
 	var fnDownloadCoupon = function() {
-		let url = '/mypage/coupon/download/all';
-
-		let data = {};
-		data.custNo = customerInfo.custNo;
-
-		let jsonData = JSON.stringify(data);
-
-		gagajf.ajaxJsonSubmit(url, jsonData, function() {
-			fnReloadCouponCount();
+		let url = '/planning/event/custgrade/coupon/down';
+		
+		let params = JSON.stringify({});
+		gagajf.ajaxJsonSubmit(url, params, function(result) {
+			let message = '이미 다운로드를 완료 하셨습니다.';
+			if (result.isDownload) {
+				message = '총 ' + result.downloadCnt + '장의 쿠폰을 다운로드 하였습니다.';
+			}
+			
+			mcxDialog.alertC(message, {
+				sureBtnText: "확인",
+				sureBtnClick: function () {
+					fnReloadCouponCount();
+				}
+			});
 		});
 	}
 	

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

@@ -136,6 +136,18 @@
 							
 							<!-- 배송준비중-->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
+								<div class="goods_btn_wrap btn_group_flex">
+									<div>
+										<button type="button" class="btn btn_default btn_cncl_complete" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+											<span>1:1 문의</span>
+										</button>
+									</div>
+									<div>
+										<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+											<span>쇼핑백 담기</span>
+										</button>
+									</div>
+								</div>
 							</th:block>
 							<!-- //배송준비중-->
 							

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

@@ -213,12 +213,12 @@
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
 						<h3>회수 정보</h3>
-						<button type="button" class="btn_popup" onclick="fnGoToWithdrawDelivery()"><span>회수 조회</span></button>
+						<button type="button" class="btn_popup" th:attr="wdInvoiceNo=${oneData.wdInvoiceNo}, shipCompCd=${oneData.shipCompCd}" onclick="fnGoToWithdrawDelivery(this)"><span>회수 조회</span></button>
 					</div>
 					<div class="tbl tbl_row">
 						<dl>
 							<dt class="sr-only">택배회사/송장번호</dt>
-							<dd><span th:text="|${oneData.shipCompNm} / ${oneData.wdInvoiceNo}|"></span> / <span th:text="${oneData.wdInvoiceNo}"></span></dd>
+							<dd><span th:text="|${oneData.shipCompNm}|"></span> / <span th:text="${oneData.wdInvoiceNo}"></span></dd>
 						</dl>
 					</div>
 				</div>

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

@@ -129,6 +129,13 @@
 								
 								<!-- 배송준비중-->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
+									<div class="goods_btn_wrap btn_group_flex">
+										<div>
+											<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+												<span>쇼핑백 담기</span>
+											</button>
+										</div>
+									</div>
 								</th:block>
 								<!-- //배송준비중-->
 								

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

@@ -100,6 +100,13 @@
 							
 							<!-- 배송준비중-->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
+								<div class="goods_btn_wrap btn_group_flex">
+									<div>
+										<button type="button" class="btn btn_default btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+											<span>쇼핑백 담기</span>
+										</button>
+									</div>
+								</div>
 							</th:block>
 							<!-- //배송준비중-->
 							

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

@@ -218,7 +218,7 @@
 										<th>회수 정보</th>
 										<td>
 											<th:block th:text="|${oneData.shipCompNm} / ${oneData.wdInvoiceNo}|"></th:block>
-											<button type="button" class="btn btn_default btn_sm" th:attr="shipCompCd=${oneData.shipCompCd}, wdInvoiceNo=${oneData.wdInvoiceNo}" onclick="fnGoToWithdrawDelivery()"><span>회수조회</span></button>
+											<button type="button" class="btn btn_default btn_sm" th:attr="shipCompCd=${oneData.shipCompCd}, wdInvoiceNo=${oneData.wdInvoiceNo}" onclick="fnGoToWithdrawDelivery(this)"><span>회수조회</span></button>
 										</td>
 									</tr>
 								</tbody>

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

@@ -317,21 +317,6 @@
 			<!-- // CONT-BODY -->
 		</div>
 	</div>
-	<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/exchange/form'}" th:method="post">
-		<input type="hidden" name="ordNo"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="delvFeeCd"/>
-	</form>
-	<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/return/form'}" th:method="post">
-		<input type="hidden" name="ordNo"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="delvFeeCd"/>
-	</form>
-	<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
-		<input type="hidden" name="ordNo"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="delvFeeCd"/>
-	</form>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];

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

@@ -235,8 +235,15 @@
 													<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로 ${ordDtl.delvResDt} 출고 예정입니다.|"></p>
 												</div>
 												
-												<!-- 배송중, 배송완료 -->
-												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
+												<!-- 배송중 -->
+												<div class="order_text" th:if="${(ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55') and (ordDtl.changeableYn == 'N' or ordDtl.returnableYn == 'N')}">
+													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+													<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+												</div>
+												
+												<!-- 배송완료 -->
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_60'}">
 													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
 													<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
 													<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>

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

@@ -157,13 +157,21 @@
 												<p th:if="${!#strings.isEmpty(ordDtl.delvResDt)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
 											</div>
 											
-											<!-- 배송중, 배송완료 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
+											<!-- 배송중 -->
+											<div class="order_text" th:if="${(ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55') and (ordDtl.changeableYn == 'N' or ordDtl.returnableYn == 'N')}">
+												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다.</p>
+												<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다.</p>
+												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다.</p>
+											</div>
+
+											<!-- 배송완료 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_60'}">
 												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다.</p>
 												<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다.</p>
 												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다.</p>
 												<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
 											</div>
+
 										</div>
 									</th:block>
 									<!-- //주문상품 -->

src/main/webapp/biz/mypage.js

@@ -344,8 +344,7 @@ var fnReceipt = function(param) {
 		option = 'width=370, height=625';
 	} else if (param == 'cancel') {
 		if (refundYn == 'Y') {
-			// TODO
-			// 취소전표 확인 처리
+			// URL 설정
 			receiptWin += '?cmd=card_bill';
 			receiptWin += '&tno=' + oneData.pgTid;
 			receiptWin += '&order_no=' + oneData.ordNo;