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

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

@@ -626,6 +626,15 @@
 			return false;
 		}
 
+		// 할인방식 할인율 일때, 최대할인금액 0 보다 큰지 체크
+		if($('#CouponForm input:radio[name="rdoDcWay"]:checked').val() == 'G240_11'){
+			if($('#CouponForm').find('input[name=maxDcAmt]').val() < 1){
+				mcxDialog.alert("최대 할인 금액을 입력해주세요.");
+				$('#CouponForm input[name=maxDcAmt]').focus();
+				return false;
+			}
+		}
+
 		return true;
 	}
 
@@ -907,7 +916,7 @@
 			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('disabled', true);
 			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('readonly', true);
 		}else{
-			$("#CouponForm input:radio[name='rdoApplyScope']:radio[value=A]").prop('checked', true);
+			$("#CouponForm input:radio[name='rdoApplyScope']:radio[value=I]").prop('checked', true);
 			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('disabled', false);
 			$("#CouponForm").find("input:radio[name='rdoApplyScope']").attr('readonly', false);
 
@@ -943,7 +952,7 @@
 		if(radioValue == 'G230_10') {
 			$("input:radio[name='rdoApplyScope']:radio[value='I']").prop('checked', true);
 		} else {
-			$("input:radio[name='rdoApplyScope']:radio[value='A']").prop('checked', true);
+			$("input:radio[name='rdoApplyScope']:radio[value='I']").prop('checked', true);
 		}
 
 		$('#CouponForm #cpnType').val(radioValue);
@@ -1048,10 +1057,16 @@
 		let addCnt = 0;
 		let failCnt = 0;
 		let dupliCnt = 0;
+		let goodsDCnt = 0;
 
 		for(let i = 0 ; i < result.length ; i++) {
 			let addChk = true, gridListValue = gagaAgGrid.getAllRowData(OriginGridListOption);		// 받아온 모든 데이터
 
+			if(result[i].goodsType == 'G056_D'){ //딜상품 제외
+				addChk = false;
+				goodsDCnt++;
+			}
+
 			// 받아온 data for
 			for(let j = 0 ; j < gridListValue.length ; j++) {
 				if(gridListValue[j].goodsCd == result[i].goodsCd) {	addChk = false;	dupliCnt++;}				// 중복체크
@@ -1064,8 +1079,8 @@
 			}
 		}
 		uifnPopupClose('popupGoods');
-		failCnt = result.length - addCnt - dupliCnt;
-		mcxDialog.alert("데이터가 적용되었습니다.<br/>" + addCnt + "건 성공, "+ dupliCnt + "건 중복, " + failCnt + "건 실패");
+		failCnt = result.length - addCnt - dupliCnt - goodsDCnt;
+		mcxDialog.alert("데이터가 적용되었습니다.<br/>" + addCnt + "건 성공, "+ dupliCnt + "건 중복, "+ goodsDCnt + "건 딜상품 제외, " + failCnt + "건 실패");
 	}
 
 	// 기간 일수 변경시

src/main/webapp/WEB-INF/views/signin.html

@@ -25,7 +25,8 @@
 <th:block layout:fragment="content">
 	<form name="loginForm" id="loginForm" th:action="@{/login}" method="post">
 		<div class="loginCont">
-			<div class="logo"><img src="/image/login_logo.png" alt="logo"/></div>
+<!-- 			<div class="logo"><img src="/image/login_logo.png" alt="logo"/></div> -->
+			<div class="logo"><img src="/image/logo_STYLE24.png" alt="logo"/></div>
 			<ul>
 				<li>
 					<ul class="loginBox">

src/main/webapp/WEB-INF/views/signin2.html

@@ -25,7 +25,8 @@
 <th:block layout:fragment="content">
 	<form name="certForm" id="certForm" method="post">
 		<div class="loginCont">
-			<div class="logo"><img src="/image/login_logo.png" alt="logo"/></div>
+<!-- 			<div class="logo"><img src="/image/login_logo.png" alt="logo"/></div> -->
+			<div class="logo"><img src="/image/logo_STYLE24.png" alt="logo"/></div>
 			<div class="certiFrm">
 				<h2><i class="fa fa-envelope-o" aria-hidden="true"></i>보안인증</h2>
 				<div class="alertBox alert-danger" th:style="${error == null ? 'display: none;' : ''}" id="certFailAlert">