Merge branch 'style' into card007

# Conflicts:
#	src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

src/main/java/com/style24/admin/biz/web/TsaCustomerController.java

@@ -36,6 +36,7 @@ import com.style24.persistence.domain.CustGrade;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.CustomerSearch;
 import com.style24.persistence.domain.GiftCard;
+import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.Review;
 
@@ -909,8 +910,13 @@ public class TsaCustomerController extends TsaBaseController {
 		customerSearch.setRegNo(TsaSession.getInfo().getUserNo());
 		customerSearch.setPageable(new TscPageRequest(customerSearch.getPageNo() - 1, customerSearch.getPageSize()));
 		customerSearch.getPageable().setTotalCount(customerService.getCustomerOrderListCount(customerSearch));
+		
 		result.set("pageing", customerSearch);
-		result.set("custOrderList", customerService.getCustomerOrderList(customerSearch));
+		
+		Collection<Order> customerOrderList = customerService.getCustomerOrderList(customerSearch);
+		
+		result.set("custOrderList", customerOrderList);
+		
 		return result;
 	}
 

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

@@ -314,6 +314,7 @@
 		INNER JOIN
 		       TB_ORDER_DETAIL OD
 		ON     O.ORD_NO = OD.ORD_NO
+		AND    OD.ORD_DTL_STAT NOT IN ('G013_00')
 		INNER JOIN
 		       TB_ORDER_DETAIL_ITEM ODI
 		ON     OD.ORD_NO = ODI.ORD_NO
@@ -358,6 +359,7 @@
 		INNER JOIN
 		       TB_ORDER_DETAIL OD
 		ON     O.ORD_NO = OD.ORD_NO
+		AND    OD.ORD_DTL_STAT NOT IN ('G013_00')
 		INNER JOIN
 		       TB_ORDER_DETAIL_ITEM ODI
 		ON     OD.ORD_NO = ODI.ORD_NO

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

@@ -10,7 +10,10 @@
 				FROM (  SELECT FG.FREEGIFT_SQ
 							 , FG.FREEGIFT_NM
 							 , FG.FREEGIFT_STAT
-							 , (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = FG.FREEGIFT_STAT) AS FREEGIFT_STAT_NM
+		                     , CASE WHEN FG.FREEGIFT_STAT = 'G232_11' AND FG.FREEGIFT_EDDT <![CDATA[ < ]]>  NOW()
+		                                 THEN '종료'
+		                            ELSE (SELECT CD_NM FROM TB_COMMON_CODE WHERE CD = FG.FREEGIFT_STAT)
+		                       END                                       AS FREEGIFT_STAT_NM
 							 , FG.SELF_YN
 							 , DATE_FORMAT(FG.FREEGIFT_STDT, '%Y.%m.%d') AS FREEGIFT_STDT
 							 , DATE_FORMAT(FG.FREEGIFT_EDDT, '%Y.%m.%d') AS FREEGIFT_EDDT

src/main/webapp/WEB-INF/views/customer/OneToOneQnaDetailForm.html

@@ -152,8 +152,8 @@
 								<button type="button" class="btn btn-warning btn-lg" id="btnAssignCounselor">담당할당</button>
 							</td>
 							<th>할당자</th>
-							<td th:if="${counselInfo?.assignerNm != null}" th:utext="${counselInfo?.assignerNm + ' / ' + counselInfo?.assignedDt}" id="assignerNm"></td>
-							<td th:if="${counselInfo?.assignerNm == null}" id="assignerNm"></td>
+							<td th:if="${counselInfo.assignerNm != null}" th:utext="${counselInfo.assignerNm + ' / ' + counselInfo.assignedDt}" id="assignerNm"></td>
+							<td th:if="${counselInfo.assignerNm == null}" id="assignerNm"></td>
 						</tr>
 					</tbody>
 				</table>

src/main/webapp/WEB-INF/views/marketing/CardPromotionPopupForm.html

@@ -125,7 +125,7 @@
 	</div>
 <script th:inline="javascript">
 /*<![CDATA[*/
-	
+	var cardPrmt = [[${cardPrmt}]];
 	//카드조회팝업
 	var fnCardAdd = function(idx){
 		$('#cardPromotionForm').find('#cardIdx').val(idx);
@@ -322,9 +322,12 @@
 
 	$(document).ready(function() {
 		//gagajf.setDate('#sellTermsP','prmtStd', 'prmtEdd', 't');
-		var date = new Date();
-		$('#cardPromotionForm  input[name=prmtStd]').val(date.format("YYYY-MM-DD"));
-		$('#cardPromotionForm  input[name=prmtEdd]').val(date.format("YYYY-MM-DD"));
+
+		if (cardPrmt == null || gagajf.isNull(cardPrmt.prmtStd) || gagajf.isNull(cardPrmt.prmtStd)) {
+			var date = new Date();
+			$('#cardPromotionForm  input[name=prmtStd]').val(date.format("YYYY-MM-DD"));
+			$('#cardPromotionForm  input[name=prmtEdd]').val(date.format("YYYY-MM-DD"));
+		}
 	});
 
 /*]]>*/

src/main/webapp/WEB-INF/views/order/ExchangeRequestForm.html

@@ -248,6 +248,7 @@ var chgOrdDtlStat;															// 교환상품상세상태값
 var delvAddrSq;																// 교환상품배송지일련번호
 var npayChangeHoldYn		= '';											// 네이버페이 주문형 반품/교환 보류 여부
 var selfGoodsYn 			= cancelRequestTargetList[0].selfGoodsYn;		// 자사,입점여부
+var wdBfSendYn				= ""; 
 
 var temp1 = true;
 var temp2 = true;
@@ -274,6 +275,8 @@ if (ordChgSq > 0) {
 		delvAddrSq			= exchangeInfoList[0].delvAddrSq;			// 교환상품배송지일련번호
 		addPayCost			= exchangeInfoList[0].addPayCost;			// 추가배송비
 	}
+	
+	wdBfSendYn				= orderChangeDetailList[0].wdBfSendYn;			// 선발송여부
 }
 
 // 1. 주문정보(교환대상)
@@ -1398,6 +1401,11 @@ $(document).ready(function() {
 		if (ordChgGb == 'G681_40') {
 			$('#recipButton').css('display', 'none');						// 교환지 수정 버튼
 		}
+		
+		// 2021.10.14 선발송여부 체크
+		if ("Y" == wdBfSendYn) {
+			$('#wdBfSendYn').attr('checked', "checked");
+		}
 
 		// 네이버페이 주문형 보류 버튼 처리
 		if (!gagajf.isNull(npayChangeHoldYn)) {