교환상품 취소 불가 처리 임시 커밋

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

@@ -130,14 +130,31 @@
 							<!-- //입금대기 (1:1문의, 쇼핑백 담기) -->
 
 							<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
+							<!-- 2021.07.08 card007 교환상품은 취소 안되게 수정 -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
-								<div class="goods_btn_wrap btn_group_flex">
-									<div>
-										<button type="button" class="btn btn_default btn_cncl_complete" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');">
-											<span>주문 취소</span>
-										</button>
+								<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+									<div class="goods_btn_wrap btn_group_flex">
+										<div>
+											<button type="button" class="btn btn_default btn_cncl_complete" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');">
+												<span>주문 취소</span>
+											</button>
+										</div>
 									</div>
-								</div>
+								</th:block>
+								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
+									<div class="goods_btn_wrap btn_group_flex">
+										<div>
+											<button type="button" class="btn btn_default btn_cncl_complete" onclick="fnGoToOneToOnePage();">
+												<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>
 							</th:block>
 							<!-- //결제완료, 상품준비중, 출고처지정 (주문취소) -->
 							

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

@@ -88,13 +88,24 @@
 
 							<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
-								<div class="goods_btn_wrap btn_group_flex">
-									<div>
-										<button type="button" class="btn btn_default btn_cncl_complete" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel', 'noMember');">
-											<span>주문 취소</span>
-										</button>
+								<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+									<div class="goods_btn_wrap btn_group_flex">
+										<div>
+											<button type="button" class="btn btn_default btn_cncl_complete" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel', 'noMember');">
+												<span>주문 취소</span>
+											</button>
+										</div>
 									</div>
-								</div>
+								</th:block>
+								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
+									<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>
 							</th:block>
 							<!-- //결제완료, 상품준비중, 출고처지정 (주문취소) -->
 							

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

@@ -505,8 +505,14 @@
 						}
 					} else {
 						// 주문취소 버튼(결제완료, 상품준비중, 출고처지정)
+						// 2021.07.08 card007 교환상품은 취소 안되게 수정
 						if (ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
+							if (ordDtl.ordExchGb == 'O') {
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
+							} else {
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
+								tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
+							}
 						}
 
 						// 교환신청 버튼(배송중, 출고완료, 배송완료)
@@ -552,7 +558,7 @@
 							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
 						}
 
-						// 1:1문의 버튼(구매확정)
+						// 1:1문의 버튼(입금대기, 배송준비중, 구매확정)
 						if (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_40' || (ordDtl.ordDtlStat == 'G013_70' && (ordDtl.reviewableYn == 'N' || ordDtl.reviewSq > 0))) {
 							tag += '											<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>\n';
 						}

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

@@ -403,8 +403,13 @@
 
 					// 버튼 처리
 					// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
-					if (ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35')) {
-						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\', \'noMember\');"><span>주문 취소</span></button></p>\n';
+					// 2021.07.08 card007 교환상품은 취소 안되게 수정
+					if (ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
+						if (ordDtl.ordExchGb == 'O') {
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\', \'noMember\');"><span>주문 취소</span></button></p>\n';
+						} else {
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>\n';
+						}
 					}
 
 					// 교환신청 버튼(배송중, 출고완료, 배송완료)