Просмотр исходного кода

AS-IS 데이터 주석 해제 커밋

card007 4 лет назад
Родитель
Сommit
a66c065891

+ 3 - 3
src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -226,7 +226,7 @@
 		   AND O.DISP_YN = 'Y'
 		   AND OD.ORD_DTL_STAT <![CDATA[<>]]> 'G013_25'
 		   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
-		   AND O.REG_DT > 20210901
+		   -- AND O.REG_DT > 20210901
 		</where>
 				) Z
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.GIFT_LIMIT_DT, Z.GIFT_LIMIT_DAY, Z.GIFT_COMPLETE_DT, GIFT_ADDR_INP_YN, Z.DELV_EDDT, Z.AUTO_DECIDE_LEFT_DAY
@@ -280,7 +280,7 @@
 		           AND O.ORD_NO = #{ordNo}
 			</otherwise>
 		</choose>
-		           AND O.REG_DT > 20210901
+		           -- AND O.REG_DT > 20210901
 		         GROUP BY O.ORD_NO
 		       ) Z
 	</select>
@@ -328,7 +328,7 @@
 		   AND O.ORD_NO = #{ordNo}
 			</otherwise>
 		</choose>
-		   AND O.REG_DT > 20210901
+		   -- AND O.REG_DT > 20210901
 		 GROUP BY O.ORD_NO
 		<include refid="selectForPagingFooter"/>
 	</select>

+ 3 - 3
src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -631,7 +631,7 @@
 				</otherwise>
 			</choose>
 		</if>
-		           AND O.REG_DT > 20210901
+		           -- AND O.REG_DT > 20210901
 		  ) Z
 		 GROUP BY Z.ORD_CHG_SQ, Z.CHG_GB, Z.CHG_QTY, Z.ORD_DT, Z.CHG_DATE, Z.CHG_TIME, Z.CHG_ORD_DTL_NO, Z.CHG_STAT, Z.CHG_STAT_NM, Z.CHG_REASON
 		        , Z.ORD_NO, Z.ORD_DTL_NO, Z.GOODS_CD, Z.BRAND_NM, Z.SHOT_DELV_YN, Z.SELF_GOODS_YN, Z.GOODS_NM, Z.GOODS_TYPE, Z.LIST_PRICE
@@ -721,7 +721,7 @@
 				</otherwise>
 			</choose>
 		</if>
-		           AND O.REG_DT > 20210901
+		           -- AND O.REG_DT > 20210901
 		         GROUP BY OCD.ORD_CHG_SQ
 		       ) Z
 	</select>
@@ -809,7 +809,7 @@
 				</otherwise>
 			</choose>
 		</if>
-		 AND O.REG_DT > 20210901
+		 -- AND O.REG_DT > 20210901
 		 GROUP BY OCD.ORD_CHG_SQ
 		<include refid="selectForPagingFooter"/>
 	</select>

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

@@ -133,11 +133,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">
+										<!-- 2021.09.13 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:block th:unless="${ordDtl.ordExchGb == 'O'}">
 										<div class="goods_btn_wrap btn_group_flex">

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

@@ -39,9 +39,10 @@
 						</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">
+							<!-- 2021.09.13 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: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>
@@ -146,11 +147,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">
+										<!-- 2021.09.13 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:block th:unless="${ordDtl.ordExchGb == 'O'}">
 										<div class="goods_btn_wrap btn_group_flex">

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

@@ -135,7 +135,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">
+									<!-- 2021.09.13 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');">
@@ -143,7 +144,7 @@
 											</button>
 										</div>
 									</div>
-									</th:block>
+<!--									</th:block>-->
 								</th:block>
 								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 									<div class="goods_btn_wrap btn_group_flex">

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

@@ -113,11 +113,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">
+									<!-- 2021.09.13 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: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>

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

@@ -34,9 +34,10 @@
 						<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">
+							<!-- 2021.09.13 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: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>
@@ -129,11 +130,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">
+										<!-- 2021.09.13 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:block th:unless="${ordDtl.ordExchGb == 'O'}">
 										<div class="goods_btn_wrap btn_group_flex">

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

@@ -91,7 +91,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">
+									<!-- 2021.09.13 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');">
@@ -99,7 +100,7 @@
 											</button>
 										</div>
 									</div>
-									</th:block>
+<!--									</th:block>-->
 								</th:block>
 								<th:block th:unless="${ordDtl.ordExchGb == 'O'}">
 									<div class="goods_btn_wrap btn_group_flex">

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

@@ -132,9 +132,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">
+															<!-- 2021.09.13 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: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>

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

@@ -49,9 +49,10 @@
 									<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">
+									<!-- 2021.09.13 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>
+<!--									</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">
@@ -141,9 +142,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">
+																<!-- 2021.09.13 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: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>

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

@@ -525,9 +525,10 @@
 						if (ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
 							if (ordDtl.ordExchGb == 'O') {
 								// 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리
-								if (Number(ordDtl.ordDt.replaceAll('.', '')) >= 20210901) {
+								// 2021.09.13 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';

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

@@ -96,9 +96,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">
+															<!-- 2021.09.13 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: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>

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

@@ -48,9 +48,10 @@
 									<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">
+									<!-- 2021.09.13 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>
+<!--									</th:block>-->
 								</div>
 								<div class="goods_cont">
 									<!-- 주문상품 -->
@@ -103,9 +104,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">
+															<!-- 2021.09.13 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: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>

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

@@ -415,9 +415,10 @@
 					if (ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
 						if (ordDtl.ordExchGb == 'O') {
 							// 2021.09.01 card007 AS-IS Data 취소처리 못하게 처리
-							if (Number(ordDtl.ordDt.replaceAll('.', '')) >= 20210901) {
+							// 2021.09.13 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';
 						}