From 797b36e42f4f0c15ed78dc46f9fd0841d545557f Mon Sep 17 00:00:00 2001
From: jazz <jazz>
Date: Tue, 3 Mar 2026 10:55:12 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?=
 =?UTF-8?q?=EB=A7=88=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=9D=BC?=
 =?UTF-8?q?=EB=B0=98=EC=A3=BC=EB=AC=B8=EC=83=81=EC=84=B8=EB=82=B4=EC=97=AD?=
 =?UTF-8?q?=20=EA=B2=B0=EC=A0=9C=EC=B7=A8=EC=86=8C=20=EC=A1=B0=EA=B1=B4=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp    | 7 ++-----
 .../webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp  | 6 ++++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp
index 042937e6..9875c17b 100644
--- a/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal/mpage/ordr/OrdrDtlR.jsp
@@ -98,7 +98,7 @@
 
                 const checkLength = $(row).find('input[name="goodsCheck"]:checked').length;
 
-                /** 결제 확인상태인 경우 전체취소 불가*/
+                /** 결제 확인상태인 경우 개별취소 불가*/
                 if ('${order.ordrSttusCd}' == '25'){
                     alert('결제확인 상태에서는 전체 취소만 가능합니다.');
                     return false;
@@ -1464,10 +1464,7 @@
                                                                                 </c:when>
                                                                                 <c:when test="${goods.ordrSttusCd > 34 && goods.ordrSttusCd < 55}">
                                                                                     <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" id="inqireDlvy" class="btn-ordr-sttus  btn outline sm full">배송조회</a>
-                                                                                    <c:if test="${ goods.purchsDcsnAt eq 'N' }">
-                                                                                        <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('<c:out value="${order.sopmalCd}"/>', '<c:out value="${order.ordrInnb}"/>', '<c:out value="${shipping.ordrDlvyInnb}"/>', '<c:out value="${setleDt}"/>', '<c:out value="${setleTyCd}"/>', '<c:out value="${order.ordrSttusCd}"/>');" class="btn-ordr-sttus btn gray sm full">결제취소</a>
-                                                                                    </c:if>
-                                                                                </c:when>
+                                                                                    <a href="javascript:void(0);" id="reqstRefund" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a>                                                                                </c:when>
                                                                                 <c:when test="${goods.ordrSttusCd > 54 && goods.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">
                                                                                     <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('<c:out value="${order.ordrInnb}"/>');" id="inqireDlvy"  class="btn-ordr-sttus btn outline sm full">배송조회</a>
                                                                                     <a href="javascript:void(0);" id="reqstRefund" class="btn-ordr-sttus btn gray sm full" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a>
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp
index d027b757..d27aa08e 100644
--- a/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp
+++ b/src/main/webapp/WEB-INF/views/sopmal_m/mpage/ordr/OrdrDtlR.jsp
@@ -677,7 +677,9 @@
                         <c:when test="${'04' == order.ordrTyCd || '05' == order.ordrTyCd}"> <%-- 선물하기, 여러곳배송 --%>
                             <div class="detailTop">
                                 <p class="detailTop__title">총 <em><c:out value="${fn:length(data.shippingList)}"/>곳</em>의 배송지로 주문하셨습니다.</p>
-                                <button class="btn sm gray2">전체 결제취소</button>
+                                <c:if test="${order.ordrSttusCd == 25}">
+                                <button class="btn sm gray2" onclick="fn_call_setle_cancl_pop('${order.sopmalCd}', '${order.ordrInnb}', '${goods.ordrDlvyInnb}','${setleDt}', '${setleTyCd}'); return false;">전체 결제취소</button>
+                                </c:if>
                             </div>
                             <div class="orderDetailTop">
                             <span class="orderDetailTop__date"><c:out value="${order.ordrRceptDt}"/></span>
@@ -742,7 +744,7 @@
                                                                     </c:when>
                                                                     <c:when test="${goods.ordrSttusCd > 34 && goods.ordrSttusCd < 55}">
                                                                         <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('${order.ordrInnb}');" class="btn outline sm full">배송조회</a>
-                                                                        <a href="javascript:void(0);" onclick="fn_call_setle_cancl_pop('${order.sopmalCd}', '${order.ordrInnb}', '${goods.ordrDlvyInnb}','${setleDt}', '${setleTyCd}', '${order.ordrSttusCd}');" class="btn gray full">결제취소</a>
+                                                                        <a href="javascript:void(0);" class="btn gray sm full" style="margin-top: 5px;" onclick="fn_pop_m2mqna_regist('<c:out value="${order.ordrInnb}"/>');">반품신청</a>
                                                                     </c:when>
                                                                     <c:when test="${goods.ordrSttusCd > 54 && goods.ordrSttusCd < 76 && order.sknEnvrnCd ne 'POS'}">
                                                                         <a href="javascript:void(0);" onclick="fn_call_dlvy_sweettracker_pop('${order.ordrInnb}');" class="btn outline sm full">배송조회</a>