교환/반품 택배사 추가 임시 커밋

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

@@ -690,6 +690,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 2021.05.03 은행목록추가
 		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
 
+		// 2021.08.26 card007 택배사목록 추가
+		mav.addObject("shipCompanyList", rendererService.getShipCompanyList());
+
 		mav.setViewName(super.getDeviceViewName("/mypage/NoMemberReturnForm"));
 
 		return mav;

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

@@ -24,6 +24,7 @@
 			<input type="hidden" name="accountNm" 	th:value="${oneData.accountNm}"/>
 			<input type="hidden" name="bankCd" 		th:value="${oneData.bankCd}"/>
 			<input type="hidden" name="chgReason"/>
+			<input type="hidden" name="shipCompCd"/>
 
 			<div class="inner wide bg_beige">
 				<div class="order_number">
@@ -235,7 +236,7 @@
 									<div class="">
 										<dt><span>택배사 선택</span></dt> <!-- 210409_수정 : class sr-only 삭제 -->
 										<dd>
-											<div class="select_custom select_courier ">
+											<div class="select_custom select_courier">
 												<div class="combo">
 													<div class="select">택배사를 선택하세요.</div>
 												</div>
@@ -484,9 +485,8 @@
 		<div class="popup_con">
 			<div class="button_list">
 				<th:block th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}">
-					<button type="button" th:attr="shipCompCd=${oneData.cd}"><span th:text="${oneData.cdNm}"></span></button>
+					<button type="button" th:attr="shipCompCd=${oneData.cd}" onclick="fnSelectShipComp(this);"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
-				<input type="hidden" name="shipCompCd" />
 			</div>
 		</div>
 	</div>
@@ -629,6 +629,7 @@ var fnReturn = function() {
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
 	data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
+	data.shipCompCd			= $('#returnForm input[name=shipCompCd]').val();
 
 	let jsonData = JSON.stringify(data);
 
@@ -893,6 +894,16 @@ $('#btn_bank_return').click(function() {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
 });
+
+// 택배사 버튼 클릭 이벤트
+var fnSelectShipComp = function(param) {
+	let shipCompCd = $(param).attr('shipCompCd');
+	$('#returnForm input[name=shipCompCd]').val(shipCompCd);
+	$("#returnForm .select_custom.select_courier .select").text($(param).find("span").text());
+
+	// 팝업 닫기
+	$("#returnCourierPop .popup_close").trigger("click");
+}
 </script>
 
 <script>

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

@@ -24,6 +24,7 @@
 			<input type="hidden" name="accountNm" 	th:value="${oneData.accountNm}"/>
 			<input type="hidden" name="bankCd" 		th:value="${oneData.bankCd}"/>
 			<input type="hidden" name="chgReason"/>
+			<input type="hidden" name="shipCompCd"/>
 
 			<div class="inner wide bg_beige">
 				<div class="order_number">
@@ -231,6 +232,16 @@
 										<dt><span>반송 주소</span></dt>
 										<dd th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></dd>
 									</div>
+									<div class="">
+										<dt><span>택배사 선택</span></dt> <!-- 210409_수정 : class sr-only 삭제 -->
+										<dd>
+											<div class="select_custom select_courier">
+												<div class="combo">
+													<div class="select">택배사를 선택하세요.</div>
+												</div>
+											</div>
+										</dd>
+									</div>
 									<div class="phone">
 										<dt><span>반송 송장번호</span></dt>
 										<dd><input type="number" pattern="\d*" class="form_control" name="wdInvoiceNo" data-valid-type="numeric" value="" oninput='handleOnInput(this, 20)' placeholder="송장번호를 입력해주세요."></dd>
@@ -463,6 +474,24 @@
 </div>
 <!-- //210408_ 추가 : 은행 선택 팝업 -->
 
+<!-- 210819_ 추가 : 택배사 선택 팝업 -->
+<div id="returnCourierPop" class="popup_box returnCourierPop" style="display: none;">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">택배사 선택 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="button_list">
+				<th:block th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}">
+					<button type="button" th:attr="shipCompCd=${oneData.cd}" onclick="fnSelectShipComp(this);"><span th:text="${oneData.cdNm}"></span></button>
+				</th:block>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- //210819_ 추가 : 택배사 선택 팝업 -->
+
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 var isLogin 		= [[${isLogin}]];
@@ -605,6 +634,7 @@ var fnReturn = function() {
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
 	data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
+	data.shipCompCd			= $('#returnForm input[name=shipCompCd]').val();
 
 	let jsonData = JSON.stringify(data);
 
@@ -863,6 +893,16 @@ $('#btn_bank_return').click(function() {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
 });
+
+// 택배사 버튼 클릭 이벤트
+var fnSelectShipComp = function(param) {
+	let shipCompCd = $(param).attr('shipCompCd');
+	$('#returnForm input[name=shipCompCd]').val(shipCompCd);
+	$("#returnForm .select_custom.select_courier .select").text($(param).find("span").text());
+	
+	// 팝업 닫기
+	$("#returnCourierPop .popup_close").trigger("click");
+}
 </script>
 
 <script>

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

@@ -228,11 +228,12 @@
 												<div class="form_field">
 													<div class="select_custom select_courier">
 														<div class="combo">
+															<input type="hidden" name="shipCompCd"/>
 															<div class="select">택배사를 선택하세요.</div>
 															<ul class="list">
 																<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
 																<!-- <li class="selected">택배사를 선택하세요.</li> -->
-																<li th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></li>
+																<li th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:attr="shipCompCd=${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnSelectShipComp(this);"></li>
 															</ul>
 														</div>
 													</div>
@@ -450,30 +451,31 @@
 		}
 
 		// 추가배송비 PG 처리
-		let addPayCost = $('#returnForm input[name=addPayCost]').val();
-		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
-
-		let data = {};
-		data.ordNo = oneData.ordNo;
-		data.ordChgSq = 0;
-		data.chgReason = chgReason;
-		data.chgMemo = $('#returnForm textarea[name=chgMemo]').val();
-		data.accountNo = $('#returnForm input[name=accountNo]').val();
-		data.accountNm = $('#returnForm input[name=accountNm]').val();
-		data.bankCd = $('#returnForm input[name=bankCd]').val();
-		data.isCustomer = isCustomer;
-		data.wdGb = wdGb;
-		data.chgerNm = wdGb == 'W' ? $('#chgerNm').text() : '';
-		data.chgerZipcode = wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
-		data.chgerBaseAddr = wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
-		data.chgerDtlAddr = wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
-		data.chgerPhnno = wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
-		data.chgerRtnMemo = wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
-		data.ordDtlNoArr = ordDtlNoArr;
-		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
-		data.addPayCost = addPayCost;
-		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
-		data.delvFeeCdGrp = oneData.delvFeeCdGrp;
+		let addPayCost 			= $('#returnForm input[name=addPayCost]').val();
+		let wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
+
+		let data 				= {};
+		data.ordNo 				= oneData.ordNo;
+		data.ordChgSq 			= 0;
+		data.chgReason 			= chgReason;
+		data.chgMemo 			= $('#returnForm textarea[name=chgMemo]').val();
+		data.accountNo 			= $('#returnForm input[name=accountNo]').val();
+		data.accountNm 			= $('#returnForm input[name=accountNm]').val();
+		data.bankCd 			= $('#returnForm input[name=bankCd]').val();
+		data.isCustomer 		= isCustomer;
+		data.wdGb 				= wdGb;
+		data.chgerNm 			= wdGb == 'W' ? $('#chgerNm').text() : '';
+		data.chgerZipcode 		= wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr		= wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerPhnno 		= wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+		data.chgerRtnMemo 		= wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
+		data.ordDtlNoArr 		= ordDtlNoArr;
+		data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
+		data.addPayCost 		= addPayCost;
+		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+		data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
+		data.shipCompCd 		= $('#returnForm input[name=shipCompCd]').val();
 
 		let jsonData = JSON.stringify(data);
 
@@ -620,7 +622,6 @@
 		// 반품 사유 설정
 		$(param).parent().parent().find('input[name=chgReason]').val(chgReason);
 
-		console.log('isCustomer : ' + isCustomer);
 		// 환불금액 계산
 		fnChangeReturnQty();
 	}
@@ -660,6 +661,14 @@
 		// 반품처리
 		fnReturn();
 	}
+	
+	// 택배사 변경 이벤트
+	var fnSelectShipComp = function(param) {
+		let shipCompCd = $(param).attr('shipCompCd');
+
+		// 반품 사유 설정
+		$(param).parent().parent().find('input[name=shipCompCd]').val(shipCompCd);
+	}
 </script>
 
 </th:block>

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

@@ -230,7 +230,7 @@
 															<ul class="list">
 																<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" 추가  -->
 																<!-- <li class="selected">택배사를 선택하세요.</li> -->
-																<option th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:value="${oneData.cd}" th:text="${oneData.cdNm}"></option>
+																<option th:if="${shipCompanyList}" th:each="oneData, status : ${shipCompanyList}" th:attr="shipCompCd=${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnSelectShipComp(this);"></option>
 															</ul>
 														</div>
 													</div>
@@ -447,32 +447,33 @@
 		}
 
 		// 추가배송비 PG 처리
-		let addPayCost = $('#returnForm input[name=addPayCost]').val();
-		let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
+		let addPayCost 			= $('#returnForm input[name=addPayCost]').val();
+		let wdGb 				= $('#returnForm input[name=wdGb]:radio:checked').val();
 
 		let data = {};
-		data.ordNo = oneData.ordNo;
-		data.ordNm = oneData.ordNm;
-		data.ordPhnno = oneData.ordPhnno;
-		data.ordChgSq = 0;
-		data.chgReason = chgReason;
-		data.chgMemo = $('#returnForm textarea[name=chgMemo]').val();
-		data.accountNo = $('#returnForm input[name=accountNo]').val();
-		data.accountNm = $('#returnForm input[name=accountNm]').val();
-		data.bankCd = $('#returnForm input[name=bankCd]').val();
-		data.isCustomer = isCustomer;
-		data.wdGb = wdGb;
-		data.chgerNm = wdGb == 'W' ? $('#chgerNm').text() : '';
-		data.chgerZipcode = wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
-		data.chgerBaseAddr = wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
-		data.chgerDtlAddr = wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
-		data.chgerPhnno = wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
-		data.chgerRtnMemo = wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
-		data.ordDtlNoArr = ordDtlNoArr;
-		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
-		data.addPayCost = addPayCost;
-		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
-		data.delvFeeCdGrp = oneData.delvFeeCdGrp;
+		data.ordNo 				= oneData.ordNo;
+		data.ordNm 				= oneData.ordNm;
+		data.ordPhnno 			= oneData.ordPhnno;
+		data.ordChgSq 			= 0;
+		data.chgReason 			= chgReason;
+		data.chgMemo 			= $('#returnForm textarea[name=chgMemo]').val();
+		data.accountNo 			= $('#returnForm input[name=accountNo]').val();
+		data.accountNm 			= $('#returnForm input[name=accountNm]').val();
+		data.bankCd 			= $('#returnForm input[name=bankCd]').val();
+		data.isCustomer 		= isCustomer;
+		data.wdGb 				= wdGb;
+		data.chgerNm 			= wdGb == 'W' ? $('#chgerNm').text() : '';
+		data.chgerZipcode 		= wdGb == 'W' ? $('#returnForm input[name=chgerZipcode]').val() : '';
+		data.chgerBaseAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerBaseAddr]').val() : '';
+		data.chgerDtlAddr 		= wdGb == 'W' ? $('#returnForm input[name=chgerDtlAddr]').val() : '';
+		data.chgerPhnno 		= wdGb == 'W' ? $('#returnForm input[name=chgerPhnno]').val() : '';
+		data.chgerRtnMemo 		= wdGb == 'W' ? $('#returnForm input[name=chgerRtnMemo]').val() : '';
+		data.ordDtlNoArr 		= ordDtlNoArr;
+		data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
+		data.addPayCost 		= addPayCost;
+		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+		data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
+		data.shipCompCd 		= $('#returnForm input[name=shipCompCd]').val();
 
 		let jsonData = JSON.stringify(data);
 
@@ -657,6 +658,14 @@
 		// 반품처리
 		fnReturn();
 	}
+
+	// 택배사 변경 이벤트
+	var fnSelectShipComp = function(param) {
+		let shipCompCd = $(param).attr('shipCompCd');
+		
+		// 반품 사유 설정
+		$(param).parent().parent().find('input[name=shipCompCd]').val(shipCompCd);
+	}
 </script>
 
 </th:block>