마이페이지 임시 커밋

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

@@ -642,6 +642,7 @@ public class TsfMypageController extends TsfBaseController {
 		result.set("allCanYn"		, allCanYn);							// 무통장입금전 전체취소 여부 
 		result.set("isCustomer"		, orderChange.getIsCustomer());			// 변경사유 (고객, 회사)
 		result.set("wdGb"			, orderChange.getWdGb());				// 회수방법
+		result.set("wdInvoiceNo"	, orderChange.getWdInvoiceNo());		// 회수송장번호
 
 		// 4. 주문변경 회수지정보 추가
 		result.set("chgerNm"		, orderChange.getChgerNm());			// 변경자명

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

@@ -364,7 +364,7 @@
 			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
 
 			// 추가배송비 영역 설정
-			if (refundPayAmt > 0) {
+			if (refundPayAmt < 0) {
 				refundPayAmt = spanRefundAmt;
 				$('#addDeliveryFee').css('display', '');
 				$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');

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

@@ -113,11 +113,21 @@
 														<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
 														</th:block>
+
+														<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_20' or ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35' or ordDtl.ordDtlStat == 'G013_40'}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+														</th:block>
 														
 														<!-- 리뷰 쓰기 버튼 -->
 														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 														</th:block>
+
+														<!-- 쇼핑백담기 버튼(구매확정) -->
+														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+															<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>
+														</th:block>
 													</th:block>
 													<!-- 주문 -->
 													<th:block th:unless="${order.giftPackYn == 'Y'}">
@@ -277,7 +287,10 @@
 									</tbody></table>
 							</div>
 						</th:block>
-						<h4 class="subH3">주문자/배송지 정보</h4>
+						<!-- 선물 -->
+						<h4 class="subH3" th:if="${oneData.giftPackYn == 'Y'}">주문자 정보</h4>
+						<!-- 주문 -->
+						<h4 class="subH3" th:unless="${oneData.giftPackYn == 'Y'}">주문자/배송지 정보</h4>
 						<div class="tbl type1">
 							<table>
 								<colgroup>
@@ -299,7 +312,30 @@
 											</div>
 										</td>
 									</tr>
-									<tr>
+									<!-- 선물 -->
+									<tr th:if="${oneData.giftPackYn == 'Y'}">
+										<th>
+											선물 받으실 분
+										</th>
+										<td>
+											<div class="single_line">
+												<ul>
+													<li><span th:text="${deliveryAddrInfo.recipNm}"></span></li>
+													<li><span th:text="${deliveryAddrInfo.recipPhnno}"></span></li>
+												</ul>
+											</div>
+										</td>
+									</tr>
+									<tr th:if="${oneData.giftPackYn == 'Y'}">
+										<th>
+											선물 메세지
+										</th>
+										<!-- TODO -->
+										<!-- 선물 메세지 처리 -->
+										<td></td>
+									</tr>
+									<!-- 주문 -->
+									<tr th:unless="${oneData.giftPackYn == 'Y'}">
 										<th>
 											배송지 정보
 										</th>
@@ -420,7 +456,8 @@
 										</dl>
 									</td>
 								</tr>
-								</tbody></table>
+								</tbody>
+							</table>
 						</div>
 						<div class="btn_footer_area">
 							<button type="button" class="btn btn_dark btn_md"><span>확인</span></button>

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

@@ -445,10 +445,20 @@
 							tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>\n';
 						}
 
+						// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
+						if (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40') {
+							tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
+						}
+
 						// 리뷰 쓰기 버튼
 						if (!gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99' && ordDtl.reviewableYn == 'Y' && ordDtl.reviewSq == null) {
 							tag += '					<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" goodsCd="' + ordDtl.goodsCd + '" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>\n';
 						}
+
+						// 쇼핑백담기 버튼(구매확정)
+						if (!gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
+							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';
+						}
 					} else {
 						// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
 						if (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40') {

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

@@ -365,7 +365,7 @@
 
 		// 입점업체의 경우 회수방식 직접배송 처리
 		if (oneData.selfGoodsYn != 'Y') {
-			$('#direct').click();
+			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
 	});
@@ -381,14 +381,6 @@
 			return false;
 		}
 
-		// 반송 송장번호 체크
-		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-		let wdInvoiceNo = $('#returnForm input[name=chgReason]').val();
-		if (wdGb == 'D' && gagajf.isNull(wdInvoiceNo)) {
-			mcxDialog.alert('직접 반송하신 송장번호를 입력해주세요.');
-			return false;
-		}
-
 		// 주문상세번호 및 반품 수량 설정
 		let ordDtlNoArr = [];
 		let cnclRtnReqQtyArr = [];
@@ -413,7 +405,7 @@
 		let accountNm = $('#returnForm input[name=accountNm]').val();
 		let bankCd = $('#returnForm input[name=bankCd]').val();
 
-		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
+		if (paymentInfo.payMeans != 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
 			let data = {};
 			data.ordNo = oneData.ordNo;
 			data.accountNm = oneData.accountNm;
@@ -456,7 +448,7 @@
 		data.accountNm = $('#returnForm input[name=accountNm]').val();
 		data.bankCd = $('#returnForm input[name=bankCd]').val();
 		data.isCustomer = isCustomer;
-		data.wdGb = wdGb;
+		data.wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 		data.chgerNm = $('#chgerNm').text();
 		data.chgerZipcode = $('#returnForm input[name=chgerZipcode]').val();
 		data.chgerBaseAddr = $('#returnForm input[name=chgerBaseAddr]').val();
@@ -464,6 +456,7 @@
 		data.chgerPhnno = $('#returnForm input[name=chgerPhnno]').val();
 		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
 		data.ordDtlNoArr = ordDtlNoArr;
+		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
 
 		let jsonData = JSON.stringify(data);
@@ -548,11 +541,9 @@
 					$('#addDeliveryFee').css('display', '');
 					$('#addPayCost').text(addDelvFee.addComma() + '원');
 					$('#returnForm input[name=addPayCost]').val(addDelvFee);
-					//addPayCost = addDelvFee;
 				} else {
 					$('#addDeliveryFee').css('display', 'none');
 					$('#returnForm input[name=addPayCost]').val(0);
-					//addPayCost = 0;
 				}
 
 				// 금액 설정

src/main/webapp/WEB-INF/views/web/popup/RefundAccountAddPopupFormWeb.html

@@ -105,6 +105,9 @@
 			isValid = result.isValid;
 			if (isValid) {
 				mcxDialog.alert('계좌인증에 성공했습니다.');
+				
+				$('#refundAccountForm .select_custom.select_bank').prop('disabled', true);
+				$('#refundAccountForm input[name=accountNo]').prop('disabled', true);
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
 			}

src/main/webapp/biz/mypage.js

@@ -63,7 +63,7 @@ var fnDecideOrder = function(param) {
 		return false;
 	}
 
-	mcxDialog.confirm('구매확정 처리를 하시겠습니까?', {
+	mcxDialog.confirm('구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?', {
 		cancelBtnText: "취소",
 		sureBtnText: "확인",
 		sureBtnClick: function(){
@@ -92,9 +92,6 @@ var fnCreateReview = function(param) {
 	let ordDtlNo = $(param).attr('ordDtlNo');
 	let goodsCd = $(param).attr('goodsCd');
 
-	console.log(ordNo);
-	console.log(ordDtlNo);
-	console.log(goodsCd);
 	fnReviewCreate(ordNo, ordDtlNo, goodsCd);
 }