Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -393,8 +393,8 @@ public class TsfPlanningService {
 	public void savePollCustAnswer(Poll poll) {
 		poll.setCustNo(TsfSession.getInfo().getCustNo());
 		// 단수형
+		int ansIndex = planningDao.getPollCustAnswerIndex();
 		if(poll.getPollQsq_10()!=null && poll.getPollQsq_10()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_10 =poll.getPollQsq_10().split("/");
 			for (int i = 0; i < pollQsq_10.length; i++) {
 				String[] temp = pollQsq_10[i].split("-");
@@ -412,7 +412,6 @@ public class TsfPlanningService {
 		
 		//복수형
 		if(poll.getPollQsq_20()!=null && poll.getPollQsq_20()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_20 =poll.getPollQsq_20().split("/");
 			for (int i = 0; i < pollQsq_20.length; i++) {
 				String[] temp = pollQsq_20[i].split("-");
@@ -431,7 +430,6 @@ public class TsfPlanningService {
 		
 		//단답형
 		if(poll.getPollQsq_30()!=null && poll.getPollQsq_30()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_30 =poll.getPollQsq_30().split("/");
 			for (int i = 0; i < pollQsq_30.length; i++) {
 				String[] temp = pollQsq_30[i].split("-");
@@ -449,7 +447,6 @@ public class TsfPlanningService {
 		
 		//서룰형
 		if(poll.getPollQsq_40()!=null && poll.getPollQsq_40()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_40 =poll.getPollQsq_40().split("/");
 			for (int i = 0; i < pollQsq_40.length; i++) {
 				String[] temp = pollQsq_40[i].split("-");

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

@@ -2177,18 +2177,12 @@ public class TsfMypageController extends TsfBaseController {
 	@RequestMapping("/account/check")
 	@ResponseBody
 	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
-		custAccount.setIpAddress(TsfSession.getIpAddress());
 		boolean isValid = false;
-		
-		log.info("custAccount.getAccountNm() ::: {}",custAccount.getAccountNm());
-		log.info("custAccount.getBankCd() ::: {}",custAccount.getBankCd());
-		log.info("custAccount.getAccountNo() ::: {}",custAccount.getAccountNo());
-		
 		GagaMap result = coreKcpService.checkAccount(custAccount);
 		if ("0000".equals(result.get("resCd"))) {
 			isValid = true;
 		}
-		result.set("isValid", isValid);
+		result.setBoolean("isValid", isValid);
 		return result;
 	}
 

src/main/webapp/WEB-INF/views/mob/callcenter/OneToOneQnaRegisterFormMob.html

@@ -91,7 +91,6 @@
 												<div class="info_addfile">
 													<ul>
 														<li>사진은 이미지당 10MB 이하의 JPEG, JPG, PNG 파일 2장까지 첨부 가능합니다.</li>
-														<li>파일명에 한글은 사용 불가입니다.</li>
 														<li>첨부된 사진은 문의 외의 목적으로는 사용되지 않습니다.</li>
 													</ul>
 												</div>

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

@@ -655,8 +655,9 @@ var fnChooseFile = function(obj) {
 					                reader.onload = function (e) { $(".pics").find("img").last().attr("src", e.target.result); }
 
 					                reader.readAsDataURL(rotateFile);
+
 					            }, fileType)
-					        }, { orientation: true });
+					        }, { orientation: 1});
 						}
 				); 
 		}

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaRegisterFormWeb.html

@@ -98,7 +98,6 @@
 												<div class="info_addfile">
 													<ul>
 														<li>- 사진은 최대 20MB 이하의 JPG,PNG,GIF <span>파일2장까지 첨부 가능</span>합니다.</li>
-														<li>- 파일명에 한글은 사용불가입니다.</li>
 														<li>- 첨부된 사진은 문의 외의 목적으로는 사용되지 않습니다.</li>
 													</ul>
 												</div>

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

@@ -130,7 +130,7 @@
 		for (var i = 0; i < date.length; i++) {
 			$("#searchDt").append(	"<li onclick='fnChangeDate(this.value)' value='"+ date[i].year + "" + date[i].month + "'>" + date[i].year	+ "년" +  "  " + date[i].month + "월 </li>")
 		}
-		$(".select").append("<li class='selected' value='"+date[0].year+""+date[0].month+"'>"+ date[0].year + "년" +  "  " + date[0].month + "월 </li>"); // 현재년도 선택 */ 
+		$(".select").html(date[0].year + "년"  +  "  " + date[0].month + "월"); // 현재년도 선택 */ 
 	}
 	appendYear($("#searchDt"));
 

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

@@ -132,7 +132,7 @@
 		for (var i = 0; i < date.length; i++) {
 			$("#searchDt").append(	"<li onclick='fnChangeDate(this.value)' value='"+ date[i].year + "" + date[i].month + "'>" + date[i].year	+ "년" +  "  " + date[i].month + "월 </li>")
 		}
-		$(".select").append("<li onclick='fnChangeDate(this.value)' value='"+date[0].year+""+date[0].month+"'>"+ date[0].year + "년"  +  "  " + date[0].month + "월 </li>"); // 현재년도 선택 */ 
+		$(".select").html(date[0].year + "년"  +  "  " + date[0].month + "월"); // 현재년도 선택 */ 
 	}
 	appendYear($("#searchDt"));
 
@@ -267,7 +267,7 @@
 		});
 		// 셀렉트박스 데이터 설정
 		fnChangeDate();
-
+		
 	});
 
 </script>

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

@@ -377,7 +377,6 @@
 				</div>
 			</div>
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.kollus.js"></script>
-<script type="text/javascript" src="/ux/plugins/load-image.all.min.js"></script>
 <!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/exif-js"></script> -->
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
@@ -595,16 +594,6 @@ var fnChooseFile = function(obj) {
 							// 업로드한 파일명 설정
 							$(".pics").children().eq(0).append("<input type='hidden' name='orgFileNmArr' id='orgFileNm"+(picLength+1)+"' value='"+result.oldFileName+"'>");
 							$(".pics").children().eq(0).append("<input type='hidden' name='sysFileNmArr' id='sysFileNm"+(picLength+1)+"' value='"+result.newFileName+"'>");
-							
-							var limg = loadImage(file, function (img, data) {
-					            img.toBlob(function (blob) {
-					                var rotateFile = new File([blob], file.name, { type: fileType });
-					                var reader = new FileReader();
-					                reader.onload = function (e) { $(".pics").find("img").eq(0).attr("src", e.target.result); }
-
-					                reader.readAsDataURL(rotateFile);
-					            }, fileType)
-					        }, { orientation: true });
 						}
 				); 
 		}else{