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

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/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/common/fragments/FooterWeb.html

@@ -1216,7 +1216,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/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);