교환 옵션 optCd2 -> optCd로 변경 커밋

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

@@ -401,6 +401,7 @@
 		     , Z.ORD_DTL_NO
 		     , Z.ORD_DTL_ITEM_SQ
 		     , Z.ITEM_CD
+		     , Z.OPT_CD
 		     , Z.OPT_CD1
 		     , Z.OPT_CD2
 		     , Z.COLOR_NM
@@ -452,7 +453,7 @@
 		         WHERE O.ORD_NO = #{ordNo}
 		           AND OD.ORD_DTL_NO = #{ordDtlNo}
 		  ) Z
-		 GROUP BY Z.ORD_NO, Z.ORD_DTL_NO, Z.ORD_DTL_ITEM_SQ, Z.ITEM_CD, Z.OPT_CD1, Z.OPT_CD2
+		 GROUP BY Z.ORD_NO, Z.ORD_DTL_NO, Z.ORD_DTL_ITEM_SQ, Z.ITEM_CD, Z.OPT_CD, Z.OPT_CD1, Z.OPT_CD2
 		        , Z.COLOR_NM, Z.GOODS_TYPE, Z.SELF_GOODS_YN, Z.ITEM_NM, Z.GOODS_STAT
 	</select>
 

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

@@ -143,7 +143,7 @@ var fnSaveOption = function() {
 		data.chgOptCd2 		= chgOptCd2;
 		dataArr.push(data);
 	});
-	
+
 	fnChangeOptionCallback(dataArr);
 
 	$('.close-modal').trigger('click');
@@ -160,7 +160,10 @@ $(document).on('click','.optionChangePop .option_box button',function(){
 
 // 버튼 색
 $(document).on('click','.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
+	//$('.popup_box .button_list button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 

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

@@ -446,7 +446,9 @@ var fnExchange = function() {
 				cancelReq.supplyCompCd 		= supplyCompCd;
 				cancelReq.excDelvFee 		= excDelvFee;
 				cancelReq.rtnDelvFee 		= rtnDelvFee;
-				cancelReq.ordChgOpt 		= chgOpt.chgOptCd2;
+				// 2021.07.26 교환옵션 optCd2 -> optCd로 변경 처리
+				//cancelReq.ordChgOpt 		= chgOpt.chgOptCd2;
+				cancelReq.ordChgOpt 		= chgOpt.chgOptCd;
 				cancelReq.chgQty 			= chgOpt.chgQty;
 				cancelReqList.push(cancelReq);
 			});
@@ -756,7 +758,10 @@ $('.popup_close').on("click",function(){
 
 // 버튼 색
 $(document).on('click', '.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
+	//$('.popup_box .button_list button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 

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

@@ -441,7 +441,7 @@ var fnExchange = function() {
 			let json 		= $(item).val();
 			let jsonData 	= JSON.parse(json);
 			$.each(jsonData, function (index, chgOpt) {
-				let cancelReq 	= {};
+				let cancelReq 				= {};
 				cancelReq.ordDtlNo 			= chgOpt.ordDtlNo;
 				cancelReq.ordDtlItemSq 		= chgOpt.ordDtlItemSq;
 				cancelReq.delvFeeCd 		= delvFeeCd;
@@ -760,7 +760,10 @@ $('.popup_close').on("click",function(){
 
 // 버튼 색
 $(document).on('click', '.popup_box .button_list button',function(){
-	$('.popup_box .button_list button').removeClass('on');
+	//$('.popup_box .button_list button').removeClass('on');
+	$.each($(this).parent().find('button'), function(idx, item) {
+		$(item).removeClass('on');
+	});
 	$(this).addClass('on');
 });
 

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

@@ -30,7 +30,8 @@
 								<div class="form_field">
 									<div class="select_custom exchange_option">
 										<div class="combo">
-											<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd}">
+											<input type="hidden" name="chgOptCd" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd}">
+											<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}">
 											<div class="select" th:text="${oneData.optCd2}"></div>
 											<ul class="list">
 												<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" / 품절표기 data-soldout="true" 추가  -->

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

@@ -438,7 +438,9 @@
 					cancelReq.supplyCompCd = supplyCompCd;
 					cancelReq.excDelvFee = excDelvFee;
 					cancelReq.rtnDelvFee = rtnDelvFee;
-					cancelReq.ordChgOpt = chgOpt.chgOptCd2;
+					// 2021.07.26 교환옵션 optCd2 -> optCd로 변경 처리
+					//cancelReq.ordChgOpt = chgOpt.chgOptCd2;
+					cancelReq.ordChgOpt = chgOpt.chgOptCd;
 					cancelReq.chgQty = chgOpt.chgQty;
 					cancelReqList.push(cancelReq);
 				});