Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.admin.git into develop

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

@@ -871,10 +871,12 @@ public class TsaBusinessController extends TsaBaseController {
 	 */
 	@PostMapping("/account/check")
 	@ResponseBody
-	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount, HttpServletRequest request) {
+	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
 		custAccount.setIpAddress(TscSession.getIpAddress());
 		boolean isValid = false;
-		log.info("characterEncoding ===> {}", request.getCharacterEncoding());
+
+		String fileEncoding = System.getProperty("file.encoding");
+		log.info("fileEncoding ::: {}", fileEncoding);
 
 		log.info("custAccount.getAccountNm() ::: {}", custAccount.getAccountNm());
 		log.info("custAccount.getBankCd() ::: {}",custAccount.getBankCd());

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

@@ -166,19 +166,25 @@ public class TsaCustomerController extends TsaBaseController {
 
 		counselService.updateQnaAnswer(counsel);
 
-		// 일대일문의상세 조회
-		Counsel tCounsel = counselService.getOneToOneQna(counsel.getCounselSq());
-
-//		// TODO. 고객이 SMS답변수신을 요청했을 때
-//		if (counsel.getSmsReqYn().equals("Y")) {
-//			try {
-//				// 문의답변완료안내 카카오알림톡 발송
-//				kakaoService.sendQnaAnswer(tCounsel);
-//			} catch (Exception e) {
-//				// Do nothing
-//			}
-//		}
-
+		// TODO. 고객이 SMS답변수신을 요청했을 때
+		if (counsel.getSmsReqYn().equals("Y")) {
+			try {
+				if (counsel.getCounselType().equals("C")) {
+					// 일대일문의상세 조회
+					Counsel tCounsel = counselService.getOneToOneQna(counsel.getCounselSq());
+					// 1:1문의답변완료안내 카카오알림톡 발송
+					kakaotalkService.sendOneToOneAnswerNotify(tCounsel,tCounsel.getCustNo());
+				}else if (counsel.getCounselType().equals("G")) {
+					// 상품문의상세 조회
+					Counsel tCounsel = counselService.getGoodsQna(counsel.getCounselSq());
+					// 상품문의답변완료안내 카카오알림톡 발송
+					kakaotalkService.sendGoodsAskNotify(tCounsel,tCounsel.getCustNo());					
+				}
+				
+			} catch (Exception e) {
+				// Do nothing
+			}
+		}
 		return super.ok(message.getMessage("SUCC_0001"));
 	}
 

src/main/webapp/WEB-INF/views/board/NoticeForm.html

@@ -618,7 +618,7 @@
 		gagaAgGrid.createGrid('gridList', gridOptions);
 		
 		// Create a summernote
-		let snOptions = gagaSn.getToolbarOptions('media');
+		let snOptions = gagaSn.getToolbarOptions();
 		gagaSn.createSummernote(snOptions, '#noticeContent');
 		
 		$("#fileCnt").trigger('change');

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

@@ -28,6 +28,7 @@
 			<form id="qnaDetailForm" name="qnaDetailForm" action="#" th:action="@{'/customer/qna/answer/save'}" th:method="post" th:object="${counselInfo}">
 				<input type="hidden" name="counselSq" th:value="*{counselSq}"/>
 				<input type="hidden" name="smsReqYn" th:value="*{smsReqYn}"/>
+				<input type="hidden" name="counselType" value="G"/>
 				
 				<h4>상담정보</h4>
 				<table class="tableStyle" aria-describedby="상담정보">

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

@@ -28,6 +28,7 @@
 			<form id="qnaDetailForm" name="qnaDetailForm" action="#" th:action="@{'/customer/qna/answer/save'}" th:method="post" th:object="${counselInfo}">
 				<input type="hidden" name="counselSq" th:value="*{counselSq}"/>
 				<input type="hidden" name="smsReqYn" th:value="*{smsReqYn}"/>
+				<input type="hidden" name="counselType" value="C"/>
 				
 				<h4>상담정보</h4>
 				<table class="tableStyle" aria-describedby="상담정보">

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -884,8 +884,10 @@
 		$("#mcTable"+tableDataId).find("tr[name=subTextPopRow]").find("input[name=subText]").val(result[0].dtlTitle1);
 		$("#mcTable"+tableDataId).find("tr[name=linkPopRow]").find("input[name=link]").val('/planning/detail/form?planSq='+result[0].planSq);
 		$("#mcTable"+tableDataId).find("tr[id=mobImgPop]").find("input[name=imgPath]").val(result[0].mainPimg);
-		$("#mcTable"+tableDataId).find('.mobImg').find("#bannerPreViewUrlPop_"+tableDataId).attr('src', $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
-		$("#mcTable"+tableDataId).find('.mobImg').find("#imgViewPop_"+tableDataId).removeClass("off").addClass("on");
+		if(!gagajf.isNull(result[0].mainPimg)){
+			$("#mcTable"+tableDataId).find('.mobImg').find("#bannerPreViewUrlPop_"+tableDataId).attr('src', $("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
+			$("#mcTable"+tableDataId).find('.mobImg').find("#imgViewPop_"+tableDataId).removeClass("off").addClass("on");
+		}
 
 		let stdt = result[0].dispStdt.split(" ");
 		let eddt = result[0].dispEddt.split(" ");
@@ -913,6 +915,10 @@
 			var thisIdx = $(this).find("input[name=tableIdx]").val();
 			var contentsTypeVal = $(this).find("input:radio[name=contentsType"+thisIdx+"]:checked").val();
 			var textColorVal = $(this).find("input:radio[name=thumTextColor"+thisIdx+"]:checked").val();
+			var imgVal = $(this).find(".pcImgFile").find("input[name=imgPath]").val();
+			var newImgVal = $(this).find(".pcImgFile").find("input[name=newImgFile]").val();
+			var mImgVal = $(this).find(".mobImgFile").find("input[name=imgPath]").val();
+			var mNewImgVal = $(this).find(".mobImgFile").find("input[name=newImgFile]").val();
 
 			if(gagajf.isNull(contentsTypeVal)){
 				mcxDialog.alert('컨텐츠 유형을 선택해주세요.');
@@ -929,6 +935,14 @@
 				mcxDialog.alert('썸네일 글자 색상을 선택해주세요.');
 				dataBool = false;
 			}
+			if(gagajf.isNull(imgVal) && gagajf.isNull(newImgVal)){
+				mcxDialog.alert((i+1)+'번째 이미지를 선택해주세요.');
+				dataBool = false;
+			}
+			if(gagajf.isNull(mImgVal) && gagajf.isNull(mNewImgVal)){
+				mcxDialog.alert((i+1)+'번째 모바일용 이미지를 선택해주세요.');
+				dataBool = false;
+			}
 		});
 		if(!dataBool){
 			return false;
@@ -1374,7 +1388,13 @@
 			html += '<th>이미지';
 		}
 		html += '</th>';
-		html += '<td><div class="uFile w300">';
+		html += '<td><div class="uFile w300';
+		if(idx>1){
+			html += ' mobImgFile';
+		}else{
+			html += ' pcImgFile';
+		}
+		html +=' ">';
 		html += '<input id="filePop_'+imgIndex+'" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, '+imgIndex+')"/>';
 		html += '<label for="filePop_'+imgIndex+'" class="uFileLabel">파일선택</label>';
 		html += '<input type="hidden" name="imgPath" value="'+imgPath+'"/>';
@@ -1428,7 +1448,7 @@
 		var html = '<tr class="mobImg" name="imgPopRow" id="mobImgPop">';
 		html += '<th>모바일용 이미지';
 		html += '</th>';
-		html += '<td><div class="uFile w300">';
+		html += '<td><div class="uFile w300 mobImgFile">';
 		html += '<input id="filePop_'+imgMobIndex+'" name="file" type="file" class="uFileInput w300" onchange="fnPopFileUpload(this, '+imgMobIndex+')"/>';
 		html += '<label for="filePop_'+imgMobIndex+'" class="uFileLabel">파일선택</label>';
 		html += '<input type="hidden" name="imgPath" value="'+imgPath+'"/>';

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

@@ -296,9 +296,6 @@
 		 {headerName: '문항유형'		, field:'pollQtypeNm', width:100, cellClass: 'text-center'},
 		 {headerName: '문항제목'		, field:'pollQtitle', width:230, cellClass: 'text-center'},
 		 {headerName: '등록일'		, field:'regDt'	, width:200, cellClass: 'text-center'},
-		/*{headerName: '투표율'		, field:'voteRate'	, width:80, cellClass: 'text-center'
-			, cellRenderer : function(params) { return gagajf.isNull(params.value) ? '0%' : params.value + '%'; }
-		}, */
 	];
 
 	var columnDefsVote = [
@@ -315,7 +312,6 @@
 		{headerName: 'ques8'	    , field:'dummy8'	, width:200, cellClass: 'text-center',enableValue: true},
 		{headerName: 'ques9'	    , field:'dummy9'	, width:200, cellClass: 'text-center',enableValue: true},
 		{headerName: 'ques10'	    , field:'dummy10'	, width:200, cellClass: 'text-center',enableValue: true},
-		/* {headerName: '투표자회원번호'	, field:'ansCustNo'	, width:200, cellClass: 'text-center'}, */
 		
 	];
 
@@ -366,12 +362,6 @@
 		}
 	}
 
-	// Grid 속성 변경
-/* 	var fnChangeGridProperty = function() {
-		
-		
-	} */
-	
 	// 투표자 조회
 	var fnSearchVote = function(data) {
 		for (var i = 1; i <= 10 ; i++) {
@@ -391,16 +381,6 @@
 			gridOptionsVote.columnApi.resetColumnState();
 			gridOptionsVote.api.setRowData(dataList.pollList);
 			
-			// 컬럼 숨김 처리
-			/*  for (var k = 1; k <= 10; k++) {
-				// 컬럼 숨긴걸 초기화 한다.
-				gagaAgGrid.showOrHideColumn(gridOptionsVote, 'ques' + k, true);
-			
-				// 컬럼을 숨긴다.
-				if (k > dataList.questionList.length) {
-					gagaAgGrid.showOrHideColumn(gridOptionsVote, 'ques' + k, false);
-				}
-			}  */
 		});
 
 	}