Merge branch 'jsshin' into develop

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

@@ -412,6 +412,7 @@
 		      , CPH.OCCUR_GB
 		      , CPH.OCCUR_DTL_DESC
 		      , CPH.PNT_AMT
+		      , CPH.ORD_NO
 		      , CPH.ORD_DTL_NO
 		      , CPH.REVIEW_SQ
 		      , DATE_FORMAT(CPH.SWITCH_DUE_DT, '%Y%m%d%H%i%S')  AS SWITCH_DUE_DT

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

@@ -572,14 +572,14 @@
 		{headerName: "주문자전화번호", field: "ordTelno", width: 120, cellClass: 'text-center'},
 		{headerName: "주문자휴대폰", field: "ordPhnno", width: 130, cellClass: 'text-center'},
 		{
-			headerName: "주문상세상태", field: "ordDtlStat", width: 100, cellClass: 'text-center',
+			headerName: "주문상세상태", field: "ordDtlStat", width: 130, cellClass: 'text-center',
 			valueFormatter: function (params) {
 				return gagaAgGrid.lookupValue(orderDtlStatList, params.value);
 			}
 		},
 		{headerName: "수령인", field: "recipNm", width: 100, cellClass: 'text-center'},
 		{
-			headerName: "상품코드", field: "goodsCd", width: 100, cellClass: 'text-center',
+			headerName: "상품코드", field: "goodsCd", width: 150, cellClass: 'text-center',
 			cellRenderer: function (params) {
 				return '<a href="javascript:void(0);">' + params.value + '</a>';
 			}
@@ -594,7 +594,7 @@
 	// 1:1문의 내역 그리드
 	const columnCounselDefs = [
 		{
-			headerName: "상담분류", field: "counselClsf", width: 100, cellClass: 'text-center',
+			headerName: "상담분류", field: "counselClsf", width: 150, cellClass: 'text-center',
 			valueFormatter: function (params) {
 				return gagaAgGrid.lookupValue(counselClsfList, params.value);
 			}
@@ -714,7 +714,7 @@
 			}
 		},
 		{
-			headerName: "포인트사유", field: "occurGb", width: 100, cellClass: 'text-center',
+			headerName: "포인트사유", field: "occurGb", width: 150, cellClass: 'text-center',
 			valueFormatter: function (params) {
 				return gagaAgGrid.lookupValue(pntOccurGbList, params.value);
 			}
@@ -751,7 +751,7 @@
 			}
 		},
 		{
-			headerName: "발생구분", field: "occurGb", width: 100, cellClass: 'text-center',
+			headerName: "발생구분", field: "occurGb", width: 150, cellClass: 'text-center',
 			valueFormatter: function (params) { return gagaAgGrid.lookupValue(giftCardOccurGbList, params.value); }
 		},
 		{
@@ -865,7 +865,7 @@
 	//회원접촉이력 그리드
 	const columnContactDefs = [
 		{
-			headerName: "접촉유형", field: "contactType", width: 150, cellClass: 'text-center',
+			headerName: "접촉유형", field: "contactType", width: 180, cellClass: 'text-center',
 			valueFormatter: function (params) {
 				return gagaAgGrid.lookupValue(contactTypeList, params.value);
 			}
@@ -1148,6 +1148,14 @@
 		}
 	};
 
+	// 상품평내역 셀 클릭 이벤트
+	gridReviewOptions.onCellClicked = function (event) {
+		if (event.colDef.field === 'reviewContent') {
+			let reviewSq = event.data.reviewSq;
+			cfnOpenReviewDetailPopup(reviewSq);
+		}
+	};
+
 	// 1:1문의 내역 셀 클릭 이벤트
 	gridCounselOptions.onCellClicked = function (event) {
 		if (event.colDef.field === 'questTitle') {
@@ -1164,13 +1172,6 @@
 		}
 	};
 
-	// 상품평내역 셀 클릭 이벤트
-	gridReviewOptions.onCellClicked = function (event) {
-		if (event.colDef.field === 'reviewTitle') {
-			let reviewSq = event.data.reviewSq;
-			cfnOpenReviewDetailPopup(reviewSq);
-		}
-	};
 
 	// 주소지 셀 클릭 이벤트
 	gridAddrOptions.onCellClicked = function (event) {