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

.gitignore

@@ -14,3 +14,4 @@ target/
 ### MacOS ###
 .DS_Store
 META-INF/context.xml
+/src/test/

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

@@ -1274,7 +1274,6 @@
 		       END             AS ISSUE_CONDITION /*발급수량*/
 		      ,CASE WHEN #{frontGb} = 'P' THEN C.DC_PVAL
 		            WHEN #{frontGb} = 'M' THEN C.DC_MVAL
-		            WHEN #{frontGb} = 'A' THEN C.DC_AVAL
 		            ELSE C.DC_AVAL
 		            END                                       AS DC_VAL
 		      ,CASE WHEN C.DC_WAY = 'G240_10' THEN '원'
@@ -1291,8 +1290,8 @@
 		AND C.CPN_TYPE IN ('G230_11','G230_12','G230_13','G230_14','G230_20','G230_30')
 		AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
 		AND NOW()  <![CDATA[<=]]> IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
-		AND (CASE WHEN 'P' = 'P' THEN C.DC_PVAL
-		         WHEN 'M' = 'P' THEN C.DC_MVAL
+		AND (CASE WHEN #{frontGb} = 'P' THEN C.DC_PVAL
+		          WHEN #{frontGb} = 'M' THEN C.DC_MVAL
 		     ELSE C.DC_AVAL END) > 0                  -- PC, MOBILE,APP 별로 0 보다 큰 쿠폰
 		AND IF (C.TOT_PUB_LIMIT_QTY = 0, 9999999999,C.TOT_PUB_LIMIT_QTY) > (SELECT COUNT(1) FROM TB_CUST_COUPON WHERE CPN_ID = C.CPN_ID) -- 총발행제한수
 		AND IF (C.CUST_PUB_LIMIT_QTY = 0, 9999999999,C.CUST_PUB_LIMIT_QTY) > (SELECT COUNT(1) FROM TB_CUST_COUPON WHERE CPN_ID = C.CPN_ID AND CUST_NO= #{custNo}) -- 고객당발행제한수량
@@ -1379,7 +1378,6 @@
 		       END             AS ISSUE_CONDITION /*발급수량*/
 		      ,CASE WHEN #{frontGb} = 'P' THEN C.DC_PVAL
 		            WHEN #{frontGb} = 'M' THEN C.DC_MVAL
-		            WHEN #{frontGb} = 'A' THEN C.DC_AVAL
 		            ELSE C.DC_AVAL
 		            END                                       AS DC_VAL
 		      ,CASE WHEN C.DC_WAY = 'G240_10' THEN '원'
@@ -1399,8 +1397,8 @@
 		AND C.DOWN_ABL_YN = 'Y'
 		AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
 		AND NOW()  <![CDATA[<=]]> IF (C.PD_GB = 'D', CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59'), C.AVAIL_EDDT)
-		AND (CASE WHEN 'P' = 'P' THEN C.DC_PVAL
-		         WHEN 'M' = 'P' THEN C.DC_MVAL
+		AND (CASE WHEN #{frontGb} = 'P' THEN C.DC_PVAL
+	              WHEN #{frontGb} = 'M' THEN C.DC_MVAL
 		     ELSE C.DC_AVAL END) > 0                  -- PC, MOBILE,APP 별로 0 보다 큰 쿠폰
 		AND IF (C.TOT_PUB_LIMIT_QTY = 0, 9999999999,C.TOT_PUB_LIMIT_QTY) > (SELECT COUNT(1) FROM TB_CUST_COUPON WHERE CPN_ID = C.CPN_ID) -- 총발행제한수
 		AND IF (C.FIRST_ORD_YN = 'Y', (SELECT COUNT(*) FROM TB_ORDER WHERE CUST_NO = #{custNo} AND ORD_DT BETWEEN C.BUY_STDT AND C.BUY_EDDT), 0) = 0 -- 첫구매 

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

@@ -453,7 +453,7 @@
 		/* TsfReivew.getReviewGoodsInfo */
 		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		  -- , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
-		     , GROUP_CONCAT(CONCAT(' ',OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		     , GROUP_CONCAT(CONCAT(' ',OPT_CD1_NM,' / ', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
 		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
 		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		     , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM

src/main/webapp/WEB-INF/views/mob/SigninFormMob.html

@@ -118,11 +118,20 @@
 			mcxDialog.alert("자동 방지 봇을 확인 한뒤 진행 해 주세요.");
 			return;
 		}
+		let loginId = $('#loginForm input[name=loginId]').val();
 
 		// 아이디 저장 먼저 체크후 로그인 시
-		if ($('#chkSaveId').is(':checked') && gagajf.isNull(gagajf.getCookie(ckLoginId))) {
-			if (!gagajf.isNull($('#loginForm input[name=loginId]').val())) {
-				gagajf.setCookie(ckLoginId, $('#loginForm input[name=loginId]').val(), 1);
+		if ($('#chkSaveId').is(':checked')) {
+			let ckLoginIdValue = gagajf.getCookie(ckLoginId);
+			if (gagajf.isNull(ckLoginIdValue)) {
+				if (!gagajf.isNull(loginId)) {
+					gagajf.setCookie(ckLoginId, loginId, 1);
+				}
+			} else {
+				if (ckLoginIdValue !== loginId) {
+					gagajf.setCookie(ckLoginId, ckLoginIdValue, -1);
+					gagajf.setCookie(ckLoginId, loginId, 1);
+				}
 			}
 		}
 

src/main/webapp/WEB-INF/views/mob/cart/CartListAjaxFormMob.html

@@ -1244,7 +1244,7 @@
 			// 페이지 이동
 			function fnGoToGoodsDetail(goodsCd, ordCanYn) {
 				if(ordCanYn == "Y" || !ordCanYn) {
-					cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+					cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd + "&colorCd=&ithrCd=IN18_01");
 				} else {
 					mcxDialog.alert("현재 구매가 불가능한 상품입니다.");
 				}

src/main/webapp/WEB-INF/views/mob/customer/JoinFormMob.html

@@ -41,7 +41,7 @@
 				<div class="form_field">
 					<label class="input_label sr-only">아이디</label>
 					<div class="input_wrap form_full">
-						<input type="text" id="custId" name="custId" placeholder="아이디" class="form_control" required="required" data-valid-type="alphaNumeric" data-valid-name="아이디" minlength="4" maxlength="12" autocomplete="off"/>
+						<input type="text" id="custId" name="custId" placeholder="아이디" class="form_control" required="required" data-valid-type="alphaNumeric" data-valid-name="아이디" minlength="4" maxlength="12" autocomplete="no"/>
 						<span class="usable" style="display:block;"></span>
 					</div>
 					<div id="dupCustIdDiv" class="help_block hide">
@@ -53,7 +53,7 @@
 				<div class="form_field">
 					<label class="input_label sr-only">비밀번호</label>
 					<div class="input_wrap form_full">
-						<input type="password" id="passwd" name="passwd" placeholder="비밀번호 (8~20자 영문, 숫자, 특수문자 중 2가지 이상 조합)" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="off"/><!-- 잘못기입된 경우 class "err" 추가 -->
+						<input type="password" id="passwd" name="passwd" placeholder="비밀번호 (8~20자 영문, 숫자, 특수문자 중 2가지 이상 조합)" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="new-password"/><!-- 잘못기입된 경우 class "err" 추가 -->
 						<!-- case (사용불가 비밀번호일경우,사용가능한 비밀번호일경우) -->
 						<div class="help_block">
 							<!-- 사용불가 비밀번호일경우 -->
@@ -84,7 +84,7 @@
 				<div class="form_field">
 					<label class="input_label sr-only">비밀번호 확인</label>
 					<div class="input_wrap form_full">
-						<input type="password" id="confirmPassword" name="confirmPassword" placeholder="비밀번호 확인" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="off"/><!-- 잘못기입된 경우 class "err" 추가 -->
+						<input type="password" id="confirmPassword" name="confirmPassword" placeholder="비밀번호 확인" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="new-password"/><!-- 잘못기입된 경우 class "err" 추가 -->
 						<!-- case (비밀번호확인 틀렸을경우,비밀번호 일치할경우) -->
 						<div class="help_block">
 							<!-- 비밀번호확인 틀렸을경우 -->
@@ -106,7 +106,7 @@
 				<div class="form_field">
 					<label class="input_label sr-only">이메일</label>
 					<div class="input_wrap form_full">
-						<input type="text" id="email" name="email" placeholder="이메일" class="form_control" required="required" data-valid-name="이메일" maxlength="30" autocomplete="off"/><!-- 잘못기입된 경우 class "err" 추가 -->
+						<input type="text" id="email" name="email" placeholder="이메일" class="form_control" required="required" data-valid-name="이메일" maxlength="30" autocomplete="no" autocapitalize="no"/><!-- 잘못기입된 경우 class "err" 추가 -->
 						<!-- case (이메일 형식이 바르지않을경우,이미 가입되어있는 이메일인경우) -->
 						<div class="help_block">
 							<!-- 이메일 형식이 바르지않을경우 -->

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

@@ -96,38 +96,38 @@
 			</div>
 
 		</div>
-		<form id="secedeCustForm" class="form_wrap" action="/mypage/customer/secede/complete/form" method="post">
-			<div class="inner">
-				<div class="titWrap">
-					<div class="">보안을 위해 회원님의<br>아이디 및 비밀번호를 다시 확인 합니다.</div>
+		<div class="inner">
+			<form id="secedeCustForm" action="/mypage/customer/secede/complete/form" method="post">
+			<div class="titWrap">
+				<div class="">보안을 위해 회원님의<br>아이디 및 비밀번호를 다시 확인 합니다.</div>
+			</div>
+			<div class="tblWrap">
+				<div class="tbl">
+					<table>
+						<colgroup>
+							<col width="*">
+						</colgroup>
+						<tbody>
+							<tr>
+								<td>
+									<div class="form_field">
+										<input type="text" id="custId" name="custId" class="form_control" readonly="readonly"/>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<div class="form_field">
+										<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요." minlength="8" maxlength="20"/>
+									</div>
+								</td>
+							</tr>
+						</tbody>
+					</table>
 				</div>
-					<div class="tblWrap">
-						<div class="tbl">
-							<table>
-								<colgroup>
-									<col width="*">
-								</colgroup>
-								<tbody>
-									<tr>
-										<td>
-											<div class="form_field">
-												<input type="text" id="custId" name="custId" class="form_control" readonly="readonly"/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<div class="form_field">
-												<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요." minlength="8" maxlength="20"/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-					</div>
 			</div>
-		</form>
+			</form>
+		</div>
 		<div class="inner">
 			<div class="announce_txt">
 				<div class="announce_list">

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

@@ -483,13 +483,23 @@ $(document).on('click', '.tabIndex li a', function() {
 $(function(){
 	
 	$('#htopTitle').text('리뷰 쓰기');
+	var tag = '';
+	
 	if (reviewList.goodsType == 'G056_S') {
+		tag += '<em>';
 		$.each(reviewList.colorNmArr, function(index, option) {
-			$("#optionDiv").append('<em>'+reviewList.itemNmArr[index] + ' / ' + option + ' / ' + reviewList.optCd2Arr[index]+'</em>');
+			
+			tag += reviewList.itemNmArr[index] + ' / ' + option + '<br>';
 		});
+		tag += '</em>';
+		$("#optionDiv").append(tag);
 	}else{
-		$(".option").append('<em>'+reviewList.optCd1+'</em><em>'+reviewList.optCd2+'</em>');
+		tag += '<em>';
+		tag += reviewList.optCd1+' / '+reviewList.optCd2;
+		tag += '</em>';
+		$(".option").append(tag);
 	}
+
 	
 	 if(reviewStat=='u'){
 		 var reviewScore = reviewList.score;

src/main/webapp/WEB-INF/views/web/SigninFormWeb.html

@@ -124,11 +124,20 @@
 			mcxDialog.alert("자동 방지 봇을 확인 한뒤 진행 해 주세요.");
 			return;
 		}
+		let loginId = $('#loginForm input[name=loginId]').val();
 
 		// 아이디 저장 먼저 체크후 로그인 시
-		if ($('#chkSaveId').is(':checked') && gagajf.isNull(gagajf.getCookie(ckLoginId))) {
-			if (!gagajf.isNull($('#loginForm input[name=loginId]').val())) {
-				gagajf.setCookie(ckLoginId, $('#loginForm input[name=loginId]').val(), 1);
+		if ($('#chkSaveId').is(':checked')) {
+			let ckLoginIdValue = gagajf.getCookie(ckLoginId);
+			if (gagajf.isNull(ckLoginIdValue)) {
+				if (!gagajf.isNull(loginId)) {
+					gagajf.setCookie(ckLoginId, loginId, 1);
+				}
+			} else {
+				if (ckLoginIdValue !== loginId) {
+					gagajf.setCookie(ckLoginId, ckLoginIdValue, -1);
+					gagajf.setCookie(ckLoginId, loginId, 1);
+				}
 			}
 		}
 

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -1220,7 +1220,7 @@
 		// 페이지 이동
 		function fnGoToGoodsDetail(goodsCd, ordCanYn) {
 			if(ordCanYn == "Y" || !ordCanYn) {
-				cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+				cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd + "&colorCd=&ithrCd=IN18_01");
 			} else {
 				mcxDialog.alert("현재 구매가 불가능한 상품입니다.");
 			}

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1093,7 +1093,8 @@
 							if(info.ordCanQty < 6 && info.ordCanQty > 0) {
 								quickShoppingBagHtml += '			<div class="shape"><span>곧 품절돼요!</span></div>';
 							}
-							quickShoppingBagHtml += "			<a href='javascript:cfnGoToGoodsDetail(\"" + info.goodsCd + "\")' class='itemLink'>";
+							quickShoppingBagHtml += "			<a href='javascript:cfnGoToGoodsDetail(\"" + info.goodsCd + "\",\"\",\"IN22_03\")' class='itemLink'>";
+
 							quickShoppingBagHtml += '				<div class="itemPic">';
 							quickShoppingBagHtml += '					<img alt="BLACK-a" class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + info.sysImgNm + '?RS=120"/>';
 							quickShoppingBagHtml += '				</div>';
@@ -1216,7 +1217,7 @@
 									tag += '			<div class="shape"><span>품절</span></div>';
 								}
 								tag += '			<button type="button" class="itemLike active" goodsCd="'+item.goodsCd+'" onclick="fnWishDelete(this);">관심상품 추가</button>';
-								tag += '			<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+goodsCd+'\',\'\',\'IN22_02\')" class=" itemLink">';	
+								tag += '			<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN22_02\')" class=" itemLink">';	
 								tag += '				<div class="itemPic">';		
 								tag += '					<img class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '" alt="이미지설명"/>';		
 								tag += '				</div>';	

src/main/webapp/WEB-INF/views/web/customer/JoinFormWeb.html

@@ -35,7 +35,7 @@
 					<div class="form_field">
 						<label class="input_label sr-only">아이디</label>
 						<div class="input_wrap form_full">
-							<input type="text" id="custId" name="custId" placeholder="아이디(4~12자)" class="form_control" required="required" data-valid-type="alphaNumeric" data-valid-name="아이디" minlength="4" maxlength="12" autocomplete="off"/>
+							<input type="text" id="custId" name="custId" placeholder="아이디(4~12자)" class="form_control" required="required" data-valid-type="alphaNumeric" data-valid-name="아이디" minlength="4" maxlength="12" autocomplete="no"/>
 							<span class="usable" style="display:block;"></span>
 						</div>
 						<div id="dupCustIdDiv" class="help_block hide">
@@ -47,7 +47,7 @@
 					<div class="form_field">
 						<label class="input_label sr-only">비밀번호</label>
 						<div class="input_wrap form_full">
-							<input type="password" id="passwd" name="passwd" placeholder="비밀번호 (8~20자 영문, 숫자, 특수문자 중 2가지 이상 조합)" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="off"/><!-- 잘못기입된 경우 class "err" 추가 -->
+							<input type="password" id="passwd" name="passwd" placeholder="비밀번호 (8~20자 영문, 숫자, 특수문자 중 2가지 이상 조합)" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="new-password"/><!-- 잘못기입된 경우 class "err" 추가 -->
 							<!-- case (사용불가 비밀번호일경우,사용가능한 비밀번호일경우) -->
 							<div class="help_block">
 								<!-- 사용불가 비밀번호일경우 -->
@@ -78,7 +78,7 @@
 					<div class="form_field">
 						<label class="input_label sr-only">비밀번호 확인</label>
 						<div class="input_wrap form_full">
-							<input type="password" id="confirmPassword" name="confirmPassword" placeholder="비밀번호 확인" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="off"/><!-- 잘못기입된 경우 class "err" 추가 -->
+							<input type="password" id="confirmPassword" name="confirmPassword" placeholder="비밀번호 확인" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="비밀번호" autocomplete="new-password"/><!-- 잘못기입된 경우 class "err" 추가 -->
 							<!-- case (비밀번호확인 틀렸을경우,비밀번호 일치할경우) -->
 							<div class="help_block">
 								<!-- 비밀번호확인 틀렸을경우 -->
@@ -98,7 +98,7 @@
 					<div class="form_field">
 						<label class="input_label sr-only">이메일</label>
 						<div class="input_wrap form_full">
-							<input type="text" id="email" name="email" placeholder="이메일" class="form_control" required="required" data-valid-name="이메일" maxlength="30" autocomplete="off"/><!-- 잘못기입된 경우 class "err" 추가 -->
+							<input type="text" id="email" name="email" placeholder="이메일" class="form_control" required="required" data-valid-name="이메일" maxlength="30" autocomplete="no" autocapitalize="no"/><!-- 잘못기입된 경우 class "err" 추가 -->
 							<!-- case (이메일 형식이 바르지않을경우,이미 가입되어있는 이메일인경우) -->
 							<div class="help_block">
 								<!-- 이메일 형식이 바르지않을경우 -->

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

@@ -63,7 +63,7 @@
 																<img th:src="${imageUrl + '/' + reviewInfo.sysImgNm +'?RS=550'}" width="100%" alt="">
 															</span>
 															<p>
-																<span class="buy_date"><em th:text="${reviewInfo.payDt}"></em>&nbsp;구매</span>
+																<span class="buy_date"><em th:text="${reviewInfo.ordDt}"></em>&nbsp;구매</span>
 															</p>
 															<p>
 																<span class="brand" th:text="${reviewInfo.brandEnm}"></span>
@@ -630,7 +630,7 @@ var fnChooseFile = function(obj) {
 $(document).ready(function() {
 	if (reviewList.goodsType == 'G056_S') {
 		$.each(reviewList.colorNmArr, function(index, option) {
-			$("#optionDiv").append('<span class="option">'+reviewList.itemNmArr[index] + ' / ' + option + ' / ' + reviewList.optCd2Arr[index]+'</span>');
+			$("#optionDiv").append('<span class="option">'+reviewList.itemNmArr[index] + ' / ' + option + '</span>');
 		});
 	}else{
 		$(".option").append(reviewList.optCd1+"&nbsp;/&nbsp;"+reviewList.optCd2);