AS-IS 데이터 취소 방어 처리 커밋

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

@@ -302,6 +302,7 @@ public class TsfOrderController extends TsfBaseController {
 		
 		mav.addObject("devTempYn"			, devTempYn);								// 개발자모드가능여부
 		mav.addObject("frontGb"				, TsfSession.getFrontGb());					// 프론트구분
+		mav.addObject("isApp"				, TsfSession.getAttribute("isApp"));		// 앱여부
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
 		
 		return mav;

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

@@ -132,9 +132,12 @@
 								<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+										<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+										<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 										<div class="goods_btn_wrap btn_group_flex">
 											<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></div>
 										</div>
+										</th:block>
 									</th:block>
 									<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 										<div class="goods_btn_wrap btn_group_flex">

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

@@ -38,7 +38,10 @@
 							<div class="goods_date">선물일<span class="date" th:text="${order.ordDt}"></span></div>
 						</th:block>
 						<th:block th:if="${order.allCanYn == 'Y' and order.ordReqChgQty == 0}">
+							<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+							<th:block th:if="${#numbers.formatInteger(#strings.replace(order.ordDt, '.', ''), 1)} >= 20210901">
 							<a href="javascript:void(0);" id="btn_all_delete" class="delete_btn" onclick="fnAllCancel();">주문 전체 취소</a> <!-- 210409_추가 : btn_all_delete id 추가 -->
+							</th:block>
 						</th:block>
 						<th:block th:if="${allDecideYn == 'Y' and order.ordReqChgQty == 0}">
 							<a href="javascript:void(0)" id="btn_all_confirm" class="purchase_btn" th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
@@ -142,9 +145,12 @@
 								<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+										<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+										<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 										<div class="goods_btn_wrap btn_group_flex">
 											<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></div>
 										</div>
+										</th:block>
 									</th:block>
 									<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 										<div class="goods_btn_wrap btn_group_flex">

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

@@ -134,6 +134,8 @@
 							<!-- 2021.07.08 card007 교환상품은 취소 안되게 수정 -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 								<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+									<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+									<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 									<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');">
@@ -141,6 +143,7 @@
 											</button>
 										</div>
 									</div>
+									</th:block>
 								</th:block>
 								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 									<div class="goods_btn_wrap btn_group_flex">

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

@@ -112,9 +112,12 @@
 							<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 								<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+									<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+									<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 									<div class="goods_btn_wrap btn_group_flex">
 										<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel', 'noMember');"><span>주문 취소</span></button></div>
 									</div>
+									</th:block>
 								</th:block>
 								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 									<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>

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

@@ -33,7 +33,10 @@
 					<div class="goods_top">
 						<div class="goods_date">주문일<span class="date" th:text="${order.ordDt}"></span></div>
 						<th:block th:if="${order.allCanYn == 'Y' and order.ordReqChgQty == 0}">
+							<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+							<th:block th:if="${#numbers.formatInteger(#strings.replace(order.ordDt, '.', ''), 1)} >= 20210901">
 							<a href="javascript:void(0);" id="btn_all_delete" class="delete_btn" onclick="fnAllCancel();">주문 전체 취소</a> <!-- 210409_추가 : btn_all_delete id 추가 -->
+							</th:block>
 						</th:block>
 						<th:block th:if="${allDecideYn == 'Y' and order.ordReqChgQty == 0}">
 							<a href="javascript:void(0)" id="btn_all_confirm" class="purchase_btn" th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
@@ -125,9 +128,12 @@
 								<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+										<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+										<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 										<div class="goods_btn_wrap btn_group_flex">
 											<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel', 'noMember');"><span>주문 취소</span></button></div>
 										</div>
+										</th:block>
 									</th:block>
 									<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 										<div class="goods_btn_wrap btn_group_flex">

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

@@ -90,6 +90,8 @@
 							<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 								<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+									<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+									<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 									<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');">
@@ -97,6 +99,7 @@
 											</button>
 										</div>
 									</div>
+									</th:block>
 								</th:block>
 								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 									<div class="goods_btn_wrap btn_group_flex">

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -2919,6 +2919,11 @@ $(document).ready( function() {
 // PG 카카오페이 결제준비 처리
 var fnKakaoPaymentReady = function() {
 	let nextRedirectUrl = $('#order_info input[name=nextRedirectMobileUrl]').val();
+	let isApp = [[${isApp}]];
+
+	if (isApp == 'true') {
+		nextRedirectUrl = $('#order_info input[name=nextRedirectAppUrl]').val();
+	}
 
 	window.location.href = nextRedirectUrl;
 }

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

@@ -131,7 +131,10 @@
 													<!-- 주문취소 버튼(결제완료, 상품준비중, 출고처지정) -->
 													<th:block th:if="${ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35'}">
 														<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+															<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+															<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+															</th:block>
 														</th:block>
 														<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>

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

@@ -48,7 +48,10 @@
 								<div class="goods_head">
 									<p th:unless="${order.giftPackYn == 'Y'}">주문일 <span th:text="${order.ordDt}"></span></p>
 									<p th:if="${order.giftPackYn == 'Y'}">선물일 <span th:text="${order.ordDt}"></span></p>
+									<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+									<th:block th:if="${#numbers.formatInteger(#strings.replace(order.ordDt, '.', ''), 1)} >= 20210901">
 									<li><a href="javascript:void(0)" th:if="${allCanYn == 'Y' and order.ordReqChgQty == 0}" onclick="fnAllCancel();">주문전체취소</a></li>
+									</th:block>
 									<li><a href="javascript:void(0)" th:if="${allDecideYn == 'Y' and order.ordReqChgQty == 0}"  th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
 								</div>
 								<div class="goods_cont">
@@ -137,7 +140,10 @@
 														<!-- 주문취소 버튼(결제완료, 상품준비중, 출고처지정) -->
 														<th:block th:if="${ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35'}">
 															<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+																<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+																<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 																<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+																</th:block>
 															</th:block>
 															<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 																<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>

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

@@ -524,7 +524,10 @@
 						// 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\');"><span>주문 취소</span></button></p>\n';
+								// 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리
+								if (Number(ordDtl.ordDt.replaceAll('.', '')) >= 20210901) {
+									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';

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

@@ -95,7 +95,10 @@
 													<!-- 주문취소 버튼(결제완료, 상품준비중, 출고처지정) -->
 													<th:block th:if="${ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35'}">
 														<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+															<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+															<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+															</th:block>
 														</th:block>
 														<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 															<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>

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

@@ -47,7 +47,10 @@
 								<div class="goods_head">
 									<p th:unless="${order.giftPackYn == 'Y'}">주문일 <span th:text="${order.ordDt}"></span></p>
 									<p th:if="${order.giftPackYn == 'Y'}">선물일 <span th:text="${order.ordDt}"></span></p>
+									<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+									<th:block th:if="${#numbers.formatInteger(#strings.replace(order.ordDt, '.', ''), 1)} >= 20210901">
 									<li><a href="javascript:void(0)" th:if="${order.allCanYn == 'Y' and order.ordReqChgQty == 0}" onclick="fnAllCancel();">주문전체취소</a></li>
+									</th:block>
 								</div>
 								<div class="goods_cont">
 									<!-- 주문상품 -->
@@ -99,7 +102,10 @@
 													<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
 													<th:block th:if="${ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35'}">
 														<th:block th:if="${ordDtl.ordExchGb == 'O'}">
+															<!-- 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리 -->
+															<th:block th:if="${#numbers.formatInteger(#strings.replace(ordDtl.ordDt, '.', ''), 1)} >= 20210901">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}, ordCanChgQty=${ordDtl.ordCanChgQty}" onclick="fnCreateChange(this, 'cancel', 'noMember');"><span>주문 취소</span></button></p>
+															</th:block>
 														</th:block>
 														<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 															<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>

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

@@ -414,7 +414,10 @@
 					// 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';
+							// 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리
+							if (Number(ordDtl.ordDt.replaceAll('.', '')) >= 20210901) {
+								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';
 						}