마이페이지 단테 수정 임시 커밋

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

@@ -405,7 +405,7 @@ var fnCancel = function() {
 		if (result.cancelYn == 'Y') {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-				cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+				cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

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

@@ -139,7 +139,7 @@
 						</div>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(exchangeDtl.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_20'}">

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

@@ -181,7 +181,7 @@
 						<!-- 결제대기(교환) -->
 						<th:block th:if="${cre.chgStat == 'G685_21' or (cre.chgGb == 'G680_40' and cre.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<!-- //결제대기(교환) -->

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

@@ -107,7 +107,7 @@
 							</div>
 						</div>
 						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
+							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${#numbers.formatInteger(returnDtl.addPayCost, 1, 'COMMA')}원 결제 후 반품 가능합니다.|"></p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_50'}">반품 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}">고객님이 반품하신 상품을 검수 중에 있습니다.</p>

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

@@ -84,25 +84,27 @@
 											<div class="name" th:text="${ordDtl.goodsNm}"></div>
 										</div>
 										<div class="od_opt">
-											<div class="option">
-												<!-- 세트상품 -->
-												<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											<!-- 세트상품 -->
+											<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${ordDtl.itemNmArr[status.index]}"></em>
 														<em th:text="${option}"></em>
 														<em th:text="${ordDtl.optCd2Arr[status.index]}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //세트상품 -->
-												<!-- 일반상품 -->
-												<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											</th:block>
+											<!-- //세트상품 -->
+											<!-- 일반상품 -->
+											<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${ordDtl.colorNm}"></em>
 														<em th:text="${ordDtl.optCd2}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //일반상품 -->
-											</div>
+											</th:block>
+											<!-- //일반상품 -->
 										</div>
 										<div class="od_calc">
 											<p class="point"><span th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
@@ -952,7 +954,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

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

@@ -326,6 +326,7 @@
 				</div>
 				<div class="required_group" id="addDeliveryFee" style="display:none">
 					<p>배송비 <span class="c_primary" id="addPayCost">0원</span> 추가 결제가 필요합니다.</p>
+					<input type="hidden" name="addPayCost"/>
 				</div>
 				<div class="btn_group btn_group_flex">
 					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"><span>취소</span></button></div>

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

@@ -404,7 +404,7 @@ var fnCancel = function() {
 		if (result.cancelYn == 'Y') {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-				cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
+				cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

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

@@ -124,7 +124,7 @@
 						</div>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(exchangeDtl.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<th:block th:if="${exchangeDtl.chgStat == 'G685_20'}">

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

@@ -171,7 +171,7 @@
 						<!-- 결제대기(교환) -->
 						<th:block th:if="${cre.chgStat == 'G685_21' or (cre.chgGb == 'G680_40' and cre.chgStat == 'G685_32')}">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')}원 결제 후 교환 가능합니다.|"></p>
 							</div>
 						</th:block>
 						<!-- //결제대기(교환) -->

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

@@ -97,7 +97,7 @@
 							</div>
 						</div>
 						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
+							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${#numbers.formatInteger(returnDtl.addPayCost, 1, 'COMMA')}원 결제 후 반품 가능합니다.|"></p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_50'}">반품 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_30'}">고객님이 반품하신 상품을 검수 중에 있습니다.</p>

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

@@ -320,7 +320,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button" qty=0 onclick="fnChangeExchangeQty(this);">
+					<button type="button" class="on" qty=0 onclick="fnChangeExchangeQty(this);">
 						<span>수량 0개</span>
 					</button>
 					<th:block th:each="num : ${#numbers.sequence(1, exchange.ordCanChgQty)}">

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

@@ -70,24 +70,26 @@
 											<div class="name" th:text="${ordDtl.goodsNm}"></div>
 										</div>
 										<div class="od_opt">
-											<div class="option">
-												<!-- 세트상품 -->
-												<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											<!-- 세트상품 -->
+											<th:block th:if="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${option}"></em>
 														<em th:text="${ordDtl.optCd2Arr[status.index]}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //세트상품 -->
-												<!-- 일반상품 -->
-												<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
-													<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+											</th:block>
+											<!-- //세트상품 -->
+											<!-- 일반상품 -->
+											<th:block th:unless="${ordDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${ordDtl.colorNmArr}">
+													<div class="option">
 														<em th:text="${ordDtl.colorNm}"></em>
 														<em th:text="${ordDtl.optCd2}"></em>
-													</th:block>
+													</div>
 												</th:block>
-												<!-- //일반상품 -->
-											</div>
+											</th:block>
+											<!-- //일반상품 -->
 										</div>
 										<div class="od_calc">
 											<p class="sale_price" th:if="${(ordDtl.ordAmt - ordDtl.cnclRtnAmt) > (ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt)}">
@@ -728,7 +730,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

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

@@ -325,6 +325,7 @@
 				</div>
 				<div class="required_group" id="addDeliveryFee" style="display:none">
 					<p>배송비 <span class="c_primary" id="addPayCost">0원</span> 추가 결제가 필요합니다.</p>
+					<input type="hidden" name="addPayCost"/>
 				</div>
 				<div class="btn_group btn_group_flex">
 					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"><span>취소</span></button></div>

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

@@ -309,7 +309,7 @@
 			if (result.cancelYn == 'Y') {
 				// 취소 처리
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+					cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 				}, true);
 			} else {
 				mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

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

@@ -593,7 +593,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

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

@@ -307,7 +307,7 @@
 			if (result.cancelYn == 'Y') {
 				// 취소 처리
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
+					cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 				}, true);
 			} else {
 				mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

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

@@ -95,7 +95,7 @@
 												</div>
 												<div class="button_box">
 													<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
-													<th:block th:if="${ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35' or ordDtl.ordDtlStat == 'G013_40')}">
+													<th:block th:if="${ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35')}">
 														<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>
 													
@@ -444,7 +444,7 @@
 					if (cancelYn == 'Y') {
 						// 전체취소 처리
 						gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-							cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+							cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 						}, true);
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');

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

@@ -402,7 +402,7 @@
 
 					// 버튼 처리
 					// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
-					if (ordDtl.payStat != 'G016_10' && (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40')) {
+					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';
 					}