Merge branch 'sowon' into develop

src/main/java/com/style24/persistence/domain/Social.java

@@ -66,6 +66,7 @@ public class Social extends TscBaseDomain{
 		private String optCd;
 		private String goodsType;
 		private String brandGroupNm;	//브랜드 그룹명
+		private String compsGoodsCd;
 		
 		
 		// 고객

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

@@ -102,9 +102,10 @@
 		     --  , COMPS_GOODS_CD
 		         , SUM(case WHEN SOLDOUT_YN = 'Y' THEN 0
 		              ELSE CURR_STOCK_QTY END ) AS STOCK_QTY_SUM
-		           , GROUP_CONCAT(DISTINCT CONCAT(OPT_CD ,':' ,CASE WHEN SOLDOUT_YN = 'Y' THEN 'Y'
+		         , GROUP_CONCAT(DISTINCT OPT_CD) AS OPT_CD
+		           <!-- , GROUP_CONCAT(DISTINCT CONCAT(OPT_CD ,':' ,CASE WHEN SOLDOUT_YN = 'Y' THEN 'Y'
 		                          ELSE CASE WHEN CURR_STOCK_QTY > 0 THEN 'N' ELSE 'Y' END
-		                          END) ) AS OPT_CD
+		                          END) ) AS OPT_CD -->
 		    FROM (
 		             SELECT G.GOODS_CD
 		                  , GC.COMPS_GOODS_CD
@@ -124,16 +125,6 @@
 		         ) Z
 		    WHERE  NUMB = 1
 		    GROUP BY GOODS_CD
-		   <!--  SELECT G.GOODS_CD
-		         , SUM(caSE WHEN S.SOLDOUT_YN = 'Y' THEN 0
-		                    ELSE S.CURR_STOCK_QTY - S.BASE_STOCK_QTY END ) AS STOCK_QTY_SUM
-		         , MIN(CASE WHEN S.SOLDOUT_YN = 'N' THEN S.OPT_CD ELSE 'XXX' END) AS OPT_CD 
-		    FROM   TAB_GOODS G
-		         , VW_STOCK_COMPOSE S
-		    WHERE  G.GOODS_CD = S.GOODS_CD
-		    AND    G.GOODS_TYPE != 'G056_N'
-		    AND    S.DISP_YN = 'Y' /*노출하는상품만*/
-		    GROUP  BY G.GOODS_CD		 -->
 		    )
 		SELECT G.BRAND_GROUP_NM
 		     , G.GOODS_CD
@@ -152,6 +143,7 @@
 		     , S.STOCK_QTY_SUM
 		     , S.OPT_CD
 		     , G.MIN_ORD_QTY 
+		     , (SELECT GROUP_CONCAT(COMPS_GOODS_CD)  FROM TB_GOODS_COMPOSE WHERE GOODS_CD = G.GOODS_CD) AS COMPS_GOODS_CD  
 		     <choose>
 		         <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->
 		     , IF(W.GOODS_CD IS NULL,'','likeit')                                                           AS LIKE_IT       /*위시리스트담긴상품*/

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -124,7 +124,14 @@ let fnGetSocialList = function(result) {
 		
 		html += '		</a>';
 		html += '			<div class="shopBag">';
-		html += '				<button class="btn btn_default" onclick="socialAddCart(this)" goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'"><span>쇼핑백담기</span></button>';
+		if (item.goodsType == 'G056_N') {
+			html += '				<button class="btn btn_default" onclick="socialAddCart(this)" goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'"><span>쇼핑백담기</span></button>';
+		}else if(item.goodsType == 'G056_D'){
+			html += '<button class="btn btn_default"  onclick="socialGoodsDeal()"><span>쇼핑백담기</span></button>';
+		}else{
+			html += '<button class="btn btn_default" onclick="socialSetAddCart(this)" compsGoodsCd=\''+item.compsGoodsCd+'\',goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'"><span>쇼핑백담기</span></button>';
+		}
+		
 		html += '			</div>';
 		html += '	</div>';
 		html += '</div>';
@@ -133,7 +140,11 @@ let fnGetSocialList = function(result) {
 	return html;
 }
 
-
+//딜상품일 경우 alert
+var socialGoodsDeal = function() {
+	mcxDialog.alert("해당 상품은 옵션 선택 후 쇼핑백 담기가 가능합니다.");
+	return;
+}
 
 var fnSocialListSearch = function() {
 	fnSocialInfiniteScrollInit();

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -256,23 +256,23 @@ let planCornerList = [[${planCornerList}]];
 if(planCornerList.length>0){
 	var html = '';
 	
-	html += '<div class="cont_head">';
-	html += '     <div class="sticky_nav">';
-	html += '         <ul>    ';
+	html += '<div class="cont_head">\n';
+	html += '     <div class="sticky_nav">\n';
+	html += '         <ul>\n    ';
 	$.each(planCornerList, function(idx, item)  {
-		html += '             <li><a href="#brand'+(idx+1)+'">'+item.cornerNm+'</a></li>';
+		html += '             <li><a href="#brand'+(idx+1)+'">'+item.cornerNm+'</a></li>\n';
 	})
 	
-	html += '         </ul>';
-	html += '     </div>';
-	html += '</div>';
-	html += '<div class="cont_body">';
-	html += '     <div class="list_content">';
+	html += '         </ul>\n';
+	html += '     </div>\n';
+	html += '</div>\n';
+	html += '<div class="cont_body">\n';
+	html += '     <div class="list_content">\n';
 	$.each(planCornerList, function(idx, item)  {
-		html += '         <div id="brand'+(idx+1)+'" class="dp_item_list">';
-		html += '             <div class="item_header">';
-		html += '                 <h4>'+item.cornerNm+'</h4>';
-		html += '             </div>';
+		html += '         <div id="brand'+(idx+1)+'" class="dp_item_list">\n';
+		html += '             <div class="item_header">\n';
+		html += '                 <h4>'+item.cornerNm+'</h4>\n';
+		html += '             </div>\n';
 		html += '             <div class="itemsGrp';
 		if (item.cornerDispType == 'G045_1') {
 			html += ' cut1';
@@ -285,35 +285,35 @@ if(planCornerList.length>0){
 		}else if(item.cornerDispType == 'G045_5'){
 			html += ' cut5';
 		}
-		html += '">';
+		html += '">\n';
 		$.each(planCornerGoodsList, function(idx2, item2)  {
 			if (item2.cornerNm == item.cornerNm) {
-				html += '                 <div class="item_prod">';
-				html += '                     <div class="item_state">';
+				html += '                 <div class="item_prod">\n';
+				html += '                     <div class="item_state">\n';
 				html += '		<button type="button" class="itemLike';
 				if(item2.likeIt == 'likeit'){
 					html += ' likeit';
 				}
 				html += ' "';
-				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 				
-				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
-				html += '                             <div class="itemPic">';
-				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
-				html += '                             </div>';
-				html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>';
-				html += '                             <div class="itemName">'+item2.goodsNm+'</div>';
+				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">\n';
+				html += '                             <div class="itemPic">\n';
+				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">\n';
+				html += '                             </div>\n';
+				html += '                             <p class="itemBrand">'+item2.brandGroupNm+'</p>\n';
+				html += '                             <div class="itemName">'+item2.goodsNm+'</div>\n';
 				html += '                             <p class="itemPrice">'+item2.currPrice.addComma();
 				if (item2.currPrice != item2.listPrice) {
-					html += '                                 <span class="itemPrice_original">'+item2.listPrice.addComma()+'</span>';
+					html += '                                 <span class="itemPrice_original">'+item2.listPrice.addComma()+'</span>\n';
 				}
 				if (item2.dcRate != 0) {
-					html += '                                 <span class=" itemPercent">'+item2.dcRate.addComma()+'%</span>';
+					html += '                                 <span class=" itemPercent">'+item2.dcRate.addComma()+'%</span>\n';
 				}
 				
 				
-				html += '                             </p>';
-				html += '                             <div class="itemcolorchip">';
+				html += '                             </p>\n';
+				html += '                             <div class="itemcolorchip">\n';
 				if(!gagajf.isNull(item2.colorChips)){
 					var colorArr = item2.colorChips.split(",");
 					var colorCd = '';
@@ -323,42 +323,40 @@ if(planCornerList.length>0){
 						colorCd = colorInfo[0];
 						rgbColor = colorInfo[1];
 						if(rgbColor=='#FFFFFF'){
-							html += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>';
+							html += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>\n';
 						}else{
-							html += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>';
+							html += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>\n';
 						}
 					}
 				}
-				html += '                             </div>';
+				html += '                             </div>\n';
 				if(!gagajf.isNull(item2.icon)){
 					var iconArr = item2.icon.split(",");
 					var iconGb = '';
 					var iconNm = '';
-					html += '	<p class="itemBadge">';
+					html += '	<p class="itemBadge">\n';
 					for(let i=0; i<iconArr.length; i++){
 						var iconInfo = iconArr[i].split(":");
 						iconGb = iconInfo[0];
 						iconNm = iconInfo[1];
-						html += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>';
+						html += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>\n';
 					}
-					html += '	</p>';
+					html += '	</p>\n';
 				}
 				if(item2.goodsTnm != null){
-					html += '			<div class="itemComment">'+item2.goodsTnm+'</div>';
+					html += '			<div class="itemComment">'+item2.goodsTnm+'</div>\n';
 				}
-				html += '                         </a>';
-				html += '                     </div>';
-				html += '                 </div>';
+				html += '                         </a>\n';
+				html += '                     </div>\n';
+				html += '                 </div>\n';
 			}
 			
 		})
-		html += '             </div>';
-		html += '         </div>';
+		html += '             </div>\n';
+		html += '         </div>\n';
 	})
-	
-	html += '     </div>';
-	html += ' </div>';
-	
+	html += '     </div>\n';
+	html += ' </div>\n';
 	
 	$("#cornerList").append(html);
 	
@@ -368,68 +366,68 @@ if(review.length>0){
 	
 	var html = '';
 	
-	html += ' <div class="cont_head">';
-	html += ' 	<div>';
-	html += '		<h4>'+review[0].title+'</h4>';
-	html += ' 	</div>';
-	html += '	<div class="cont_body">';
-	html += ' 		<div class="review_list">';
+	html += ' <div class="cont_head">\n';
+	html += ' 	<div>\n';
+	html += '		<h4>'+review[0].title+'</h4>\n';
+	html += ' 	</div>\n';
+	html += '	<div class="cont_body">\n';
+	html += ' 		<div class="review_list">\n';
 	$.each(review, function(idx, item)  {
-		html += '		<div class="reviw_box">'
-		html += '			<div class="best_review">';
+		html += '		<div class="reviw_box">\n'
+		html += '			<div class="best_review">\n';
 		if(item.reviewSysImg!= null){
-			html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'\', \'Y\',\''+item.reviewSq+'\');">';
+			html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'Y\', \'Y\',\''+item.reviewSq+'\');">\n';
 		}else{
-			html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'\', \'N\',\''+item.reviewSq+'\');">';
+			html += '				<a href="javascript:void();" id="btn_pdBestReview_pop" onclick="cfGoodsReviewDetail(\''+item.goodsCd+'\',\'Y\', \'N\',\''+item.reviewSq+'\');">\n';
 		}
 		
-		html += '					<div class="pic">';
+		html += '					<div class="pic">\n';
 		if(item.reviewSysImg!= null){
 			if (item.fileGb == 'M') { 
-				html += '								<span class="thumb mov" style="background-image: url('+ _uploadImageUrl+item.reviewSysImg +');"></span>';	
+				html += '								<span class="thumb mov" style="background-image: url('+ _uploadImageUrl+item.reviewSysImg +');"></span>\n';	
 			}else{
-				html += '								<span class="thumb" style="background-image: url('+ _uploadImageUrl +item.reviewSysImg +');"></span>';			
+				html += '								<span class="thumb" style="background-image: url('+ _uploadImageUrl +item.reviewSysImg +');"></span>\n';			
 			}
 		}else{
-			html += '								<span class="thumb" style="background-image: url('+ _uploadGoodsUrl+'/'+item.sysImgNm +');"></span>';	
+			html += '								<span class="thumb" style="background-image: url('+ _uploadGoodsUrl+'/'+item.sysImgNm +');"></span>\n';	
 		}
 		
-		html += '                   </div>';
-		html += '                  <div class="star_score">';
-		html += '                      <span class="star">';
-		html += '                          <em class="progbar" style="width:'+(item.score*20)+'%;"></em> <!-- 평점 style로 표기 -->';
-		html += '                      </span>';
+		html += '                   </div>\n';
+		html += '                  <div class="star_score">\n';
+		html += '                      <span class="star">\n';
+		html += '                          <em class="progbar" style="width:'+(item.score*20)+'%;"></em>\n';
+		html += '                      </span>\n';
 		if(item.bestYn == 'Y'){
-			html += '<em class="ico ico_besttag"></em>';	
+			html += '<em class="ico ico_besttag"></em>\n';	
 		}
-		html += '                  </div>';
-		html += '                  <div class="txt_best_review">';
-		html += '                      <p>'+item.reviewContent+'</p>';
-		html += '                  </div>';
-		html += '                  <div class="info_writer">';
-		html += '                      <span class="wr_id">'+item.maskingCustId+'</span>';
-		html += '                      <span class="wr_date">'+item.regDt+'</span>';
-		html += '                  </div>';
-		html += '              </a>';
-		html += '          </div>';
-		html += '          <div class="review_item">';
-		html += '              <div class="item_prod">';
-		html += '                  <div class="item_state">';
-		html += '                      <a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">';
-		html += '                          <div class="itemPic">';
-		html += '                            	<img alt="" class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">';
-		html += '                          </div>';
-		html += '                          <div class="itemName">'+item.goodsNm+'</div>';
-		html += '                          <p class="itemPrice">'+item.currPrice.addComma()+'</p>';
-		html += '                      </a>';
-		html += '                  </div>';
-		html += '              </div>';
-		html += '          </div>';
-		html += '      </div>  ';
+		html += '                  </div>\n';
+		html += '                  <div class="txt_best_review">\n';
+		html += '                      <p>'+item.reviewContent+'</p>\n';
+		html += '                  </div>\n';
+		html += '                  <div class="info_writer">\n';
+		html += '                      <span class="wr_id">'+item.maskingCustId+'</span>\n';
+		html += '                      <span class="wr_date">'+item.regDt+'</span>\n';
+		html += '                  </div>\n';
+		html += '              </a>\n';
+		html += '          </div>\n';
+		html += '          <div class="review_item">\n';
+		html += '              <div class="item_prod">\n';
+		html += '                  <div class="item_state">\n';
+		html += '                      <a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+		html += '                          <div class="itemPic">\n';
+		html += '                            	<img alt="" class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
+		html += '                          </div>\n';
+		html += '                          <div class="itemName">'+item.goodsNm+'</div>\n';
+		html += '                          <p class="itemPrice">'+item.currPrice.addComma()+'</p>\n';
+		html += '                      </a>\n';
+		html += '                  </div>\n';
+		html += '              </div>\n';
+		html += '          </div>\n';
+		html += '      </div>\n';
 	});
-	html += '       </div>                    ';
-	html += '	 </div>';
-	html += '</div>';
+	html += '       </div>\n                    ';
+	html += '	 </div>\n';
+	html += '</div>\n';
 
 	$("#G082_10").append(html);
 }
@@ -437,27 +435,27 @@ if(review.length>0){
 if(image.length>0){
 	var html = '';
 	
-	html += '<div class="cont_body">     ';
-	html += '    <div class="mid_banner">';
-	html += '        <div class="swiper-container">';
-	html += '            <div class="swiper-wrapper">';
+	html += '<div class="cont_body">\n     ';
+	html += '    <div class="mid_banner">\n';
+	html += '        <div class="swiper-container">\n';
+	html += '            <div class="swiper-wrapper">\n';
 	for (var i = 0; i < image.length; i++) {
-		html += '                	<div class="swiper-slide">';
+		html += '                	<div class="swiper-slide">\n';
 		if (image[i].linkOpenGb == 'M') {
-			html += '                    	<a href="'+image[i].linkUrl+'" target="_self">><img alt="" src="'+ _uploadImageUrl + image[i].itemVal +'"></a>';
+			html += '                    	<a href="'+image[i].linkUrl+'" target="_self">><img alt="" src="'+ _uploadImageUrl + image[i].itemVal +'"></a>\n';
 		}else{
-			html += '                    	<a href="'+image[i].linkUrl+'" target="_blank">><img alt="" src="'+ _uploadImageUrl + image[i].itemVal +'"></a>';
+			html += '                    	<a href="'+image[i].linkUrl+'" target="_blank">><img alt="" src="'+ _uploadImageUrl + image[i].itemVal +'"></a>\n';
 		}
 		
-		html += '                	</div>';
+		html += '                	</div>\n';
 	}
-	html += '            </div>';
-	html += '        </div>';
-	html += '        <div class="swiper-button-prev"></div>';
-	html += '        <div class="swiper-button-next"></div>';
-	html += '        <div class="swiper-pagination"></div>';
-	html += '    </div>';
-	html += '</div>';
+	html += '            </div>\n';
+	html += '        </div>\n';
+	html += '        <div class="swiper-button-prev"></div>\n';
+	html += '        <div class="swiper-button-next"></div>\n';
+	html += '        <div class="swiper-pagination"></div>\n';
+	html += '    </div>\n';
+	html += '</div>\n';
 	
 	
 	$("#G082_30").append(html);
@@ -476,55 +474,55 @@ if(goods1.length>0){
 	for (var i = 0; i < template.length; i++) {
 		var html = '';
 		if(template[i].tmplType == 'G082_50' && array[0] == template[i].planContSq && typeof array[0] != 'undefined') {
-			html += '<div class="cont_head">';
-			html += '	<div>';
-			html += '        <h4>';
+			html += '<div class="cont_head">\n';
+			html += '	<div>\n';
+			html += '        <h4>\n';
 			if (template[i].linkUrl != null && template[i].linkUrl != '') { /* 링크 변경 예정 */
 				if (template[i].linkOpenGb == 'M') { //본창
-					html += '        <a href="'+template[i].linkUrl+'" target="_self">'+template[i].title+' <i class="ico_arrow"></i></a>';
+					html += '        <a href="'+template[i].linkUrl+'" target="_self">'+template[i].title+' <i class="ico_arrow"></i></a>\n';
 				}else{
-					html += '        <a href="'+template[i].linkUrl+'" target="_blank">'+template[i].title+' <i class="ico_arrow"></i></a>';
+					html += '        <a href="'+template[i].linkUrl+'" target="_blank">'+template[i].title+' <i class="ico_arrow"></i></a>\n';
 				}
 				
 			}else{
-				html += '        <a href="javascript:void(0)">'+template[i].title+'</a>';
+				html += '        <a href="javascript:void(0)">'+template[i].title+'</a>\n';
 			}
-			html += '		</h4>';
-			html += '    </div>';
-			html += '</div>';
-			html += '<div class="cont_body">';
-			html += '    <div class="dp_listItems_cont type1">';
-			html += '        <ul>';
+			html += '		</h4>\n';
+			html += '    </div>\n';
+			html += '</div>\n';
+			html += '<div class="cont_body">\n';
+			html += '    <div class="dp_listItems_cont type1">\n';
+			html += '        <ul>\n';
 		$.each(goods1, function(idx, item)  {
 			if (item.planContSq == template[i].planContSq) {
-				html += '            <li>';
-				html += '                <div class="dp_listItems">';
-				html += '                    <div class="dp_listItems_img">';
-				html += '                        <img src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'" alt="">';
-				html += '                    </div>';
-				html += '                    <div class="dp_listItems_info">';
-				html += '                        <div class="dp_listItems_brand">'+item.brandGroupNm+'</div>';
-				html += '                        <div class="dp_listItems_name">'+item.goodsNm+'<br></div>';
-				html += '                        <div class="dp_listItems_price">';
-				html += '                            <span class="price">'+item.currPrice.addComma()+'</span>';
+				html += '            <li>\n';
+				html += '                <div class="dp_listItems">\n';
+				html += '                    <div class="dp_listItems_img">\n';
+				html += '                        <img src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'" alt="">\n';
+				html += '                    </div>\n';
+				html += '                    <div class="dp_listItems_info">\n';
+				html += '                        <div class="dp_listItems_brand">'+item.brandGroupNm+'</div>\n';
+				html += '                        <div class="dp_listItems_name">'+item.goodsNm+'<br></div>\n';
+				html += '                        <div class="dp_listItems_price">\n';
+				html += '                            <span class="price">'+item.currPrice.addComma()+'</span>\n';
 				if (item.currPrice != item.listPrice) {
-					html += '                            <del>'+item.listPrice.addComma()+'</del>';
-					html += '                            <span class="percent">'+Math.floor(item.dcRate)+'%</span>';
+					html += '                            <del>'+item.listPrice.addComma()+'</del>\n';
+					html += '                            <span class="percent">'+Math.floor(item.dcRate)+'%</span>\n';
 				}
-				html += '                        </div>';
+				html += '                        </div>\n';
 				if(item.goodsTnm != null){
-					html += '                        <div class="itemComment">'+item.goodsTnm+'</div>';
+					html += '                        <div class="itemComment">'+item.goodsTnm+'</div>\n';
 				}
-				html += '                        <div class="ui_row">';
-				html += '                            <button type="button" class="btn btn_default" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')"><span>자세히 보기</span></button>';
-				html += '                        </div>';
-				html += '                    </div>';
-				html += '                </div>';
-				html += '            </li>';
+				html += '                        <div class="ui_row">\n';
+				html += '                            <button type="button" class="btn btn_default" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')"><span>자세히 보기</span></button>\n';
+				html += '                        </div>\n';
+				html += '                    </div>\n';
+				html += '                </div>\n';
+				html += '            </li>\n';
 			}
 		});
-		html += '        </ul>';
-		html += '    </div>       ';
+		html += '        </ul>\n';
+		html += '    </div>\n       ';
 		html += '</div>';
 		$("#G082_50" +array[0]).append(html);
 	}
@@ -546,58 +544,58 @@ if(goods2.length>0){
 		var html = '';
 		
 		if(template[i].tmplType == 'G082_51' && array[0] == template[i].planContSq && typeof array[0] != 'undefined'){
-			html += '<div class="cont_head">';
-			html += '	<div>';
-			html += '        <h4>';
+			html += '<div class="cont_head">\n';
+			html += '	<div>\n';
+			html += '        <h4>\n';
 				if (template[i].linkUrl != null && template[i].linkUrl != '') { /* 링크 변경 예정 */
 					if (template[i].linkOpenGb == 'M') { //본창
-						html += '        <a href="'+template[i].linkUrl+'" target="_self">'+template[i].title+' <i class="ico_arrow"></i></a>';
+						html += '        <a href="'+template[i].linkUrl+'" target="_self">'+template[i].title+' <i class="ico_arrow"></i></a>\n';
 					}else{
-						html += '        <a href="'+template[i].linkUrl+'" target="_blank">'+template[i].title+' <i class="ico_arrow"></i></a>';
+						html += '        <a href="'+template[i].linkUrl+'" target="_blank">'+template[i].title+' <i class="ico_arrow"></i></a>\n';
 					}
 				}else{
-					html+='            <a href="javascript:void(0)">'+template[i].title+'</a>';
+					html+='            <a href="javascript:void(0)">'+template[i].title+'</a>\n';
 				}
-			html += '        </h4>';
-			html += '    </div>';
-			html += '</div>';
-			html += '<div class="cont_body">';
-			html += '    <div class="dp_listItems_cont type2">';
-			html += '        <div class="swiper-container">';
-			html += '            <div class="swiper-wrapper">';
+			html += '        </h4>\n';
+			html += '    </div>\n';
+			html += '</div>\n';
+			html += '<div class="cont_body">\n';
+			html += '    <div class="dp_listItems_cont type2">\n';
+			html += '        <div class="swiper-container">\n';
+			html += '            <div class="swiper-wrapper">\n';
 			$.each(goods2, function(idx, item) {
 				if (item.planContSq == template[i].planContSq) {
-					html += '                <div class="swiper-slide">';
-					html += '                    <div class="item_prod">';
-					html += '                        <div class="item_state">';
-					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">';
-					html += '                                <div class="itemPic">';
-					html += '                                    <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">';
-					html += '                                </div>';
-					html += '                                <p class="itemBrand">'+item.brandGroupNm+'</p>';
-					html += '                                <div class="itemName">'+item.goodsNm+'</div>';
+					html += '                <div class="swiper-slide">\n';
+					html += '                    <div class="item_prod">\n';
+					html += '                        <div class="item_state">\n';
+					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+					html += '                                <div class="itemPic">\n';
+					html += '                                    <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
+					html += '                                </div>\n';
+					html += '                                <p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+					html += '                                <div class="itemName">'+item.goodsNm+'</div>\n';
 					html += '                                <p class="itemPrice">'+item.currPrice.addComma();
 					if (item.currPrice != item.listPrice) {
-						html+='                                    <span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
-						html+='                                    <span class=" itemPercent">'+Math.floor(item.dcRate)+'%</span>';
+						html+='                                    <span class="itemPrice_original">'+item.listPrice.addComma()+'</span>\n';
+						html+='                                    <span class=" itemPercent">'+Math.floor(item.dcRate)+'%</span>\n';
 					}
-					html += '                                </p>';
+					html += '                                </p>\n';
 					if(item.goodsTnm != null){
-						html += '                        <div class="itemComment">'+item.goodsTnm+'</div>';
+						html += '                        <div class="itemComment">'+item.goodsTnm+'</div>\n';
 					}
-					html += '                            </a>';
-					html += '                        </div>';
-					html += '                    </div>';
-					html += '                </div>           ';
+					html += '                            </a>\n';
+					html += '                        </div>\n';
+					html += '                    </div>\n';
+					html += '                </div>\n           ';
 				}
 			});
-			html += '            </div>';
-			html += '        </div>';
-			html += '        <div class="swiper-button-prev"></div>';
-			html += '        <div class="swiper-button-next"></div>';
-			html += '        <div class="swiper-pagination"></div>';
-			html += '    </div>       ';
-			html += '</div>';
+			html += '            </div>\n';
+			html += '        </div>\n';
+			html += '        <div class="swiper-button-prev"></div>\n';
+			html += '        <div class="swiper-button-next"></div>\n';
+			html += '        <div class="swiper-pagination"></div>\n';
+			html += '    </div>\n       ';
+			html += '</div>\n';
 			$("#G082_51" +array[0]).append(html);
 		}
 		
@@ -618,59 +616,58 @@ if(goods4.length>0){
 	for (var i = 0; i < template.length; i++) {
 		var html = '';
 		if(template[i].tmplType == 'G082_52' && array[0] == template[i].planContSq && typeof array[0] != 'undefined'){
-			html += '<div class="cont_head">';
-			html += '<div>';
-			html += '        <h4>';
+			html += '<div class="cont_head">\n';
+			html += '<div>\n';
+			html += '        <h4>\n';
 			if (template[i].linkUrl != null && template[i].linkUrl != '') { /* 링크 변경 예정 */
 				if (template[i].linkOpenGb == "M") { //본창
-					html += '        <a href="'+template[i].linkUrl+'" target="_self">'+template[i].title+' <i class="ico_arrow"></i></a>';
+					html += '        <a href="'+template[i].linkUrl+'" target="_self">'+template[i].title+' <i class="ico_arrow"></i></a>\n';
 				}else{
-					html += '        <a href="'+template[i].linkUrl+'" target="_blank">'+template[i].title+' <i class="ico_arrow"></i></a>';
+					html += '        <a href="'+template[i].linkUrl+'" target="_blank">'+template[i].title+' <i class="ico_arrow"></i></a>\n';
 				}
 			}else{
-				html+='            <a href="javascript:void(0)">'+template[i].title+'</a>';
+				html+='            <a href="javascript:void(0)">'+template[i].title+'</a>\n';
 			}
-			html += '        </h4>';
-			html += '    </div>';
-			html += '</div>';
-			html += '<div class="cont_body">';
-			html += '    <!-- 상품 노출 4열 type3 -->';
-			html += '    <div class="dp_listItems_cont type3">';
-			html += '        <div class="swiper-container">';
-			html += '            <div class="swiper-wrapper">';
+			html += '        </h4>\n';
+			html += '    </div>\n';
+			html += '</div>\n';
+			html += '<div class="cont_body">\n';
+			html += '    <div class="dp_listItems_cont type3">\n';
+			html += '        <div class="swiper-container">\n';
+			html += '            <div class="swiper-wrapper">\n';
 			$.each(goods4, function(idx, item) {
 				if (item.planContSq == template[i].planContSq) {
-					html += '                <div class="swiper-slide">';
-					html += '                    <div class="item_prod">';
-					html += '                        <div class="item_state">';
-					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">';
-					html += '                                <div class="itemPic">';
-					html += '                                    <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">';
-					html += '                                </div>';
-					html += '                                <p class="itemBrand">'+item.brandGroupNm+'</p>';
-					html += '                                <div class="itemName">'+item.goodsNm+'</div>';
+					html += '                <div class="swiper-slide">\n';
+					html += '                    <div class="item_prod">\n';
+					html += '                        <div class="item_state">\n';
+					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+					html += '                                <div class="itemPic">\n';
+					html += '                                    <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
+					html += '                                </div>\n';
+					html += '                                <p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+					html += '                                <div class="itemName">'+item.goodsNm+'</div>\n';
 					html += '                                <p class="itemPrice">'+item.currPrice.addComma();
 					if (item.currPrice != item.listPrice) {
-						html+='                                    <span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
-						html+='                                    <span class=" itemPercent">'+Math.floor(item.dcRate)+'%</span>';
+						html+='                                    <span class="itemPrice_original">'+item.listPrice.addComma()+'</span>\n';
+						html+='                                    <span class=" itemPercent">'+Math.floor(item.dcRate)+'%</span>\n';
 					}
-					html += '                                </p>';
+					html += '                                </p>\n';
 					if(item.goodsTnm != null){
-						html += '                        <div class="itemComment">'+item.goodsTnm+'</div>';
+						html += '                        <div class="itemComment">'+item.goodsTnm+'</div>\n';
 					}
-					html += '                            </a>';
-					html += '                        </div>';
-					html += '                    </div>';
-					html += '                </div>';
+					html += '                            </a>\n';
+					html += '                        </div>\n';
+					html += '                    </div>\n';
+					html += '                </div>\n';
 				}
 			});
-			html += '            </div>';
-			html += '        </div>';
-			html += '        <div class="swiper-button-prev"></div>';
-			html += '        <div class="swiper-button-next"></div>';
-			html += '        <div class="swiper-pagination"></div>';
-			html += '    </div>       ';
-			html += '</div>';
+			html += '            </div>\n';
+			html += '        </div>\n';
+			html += '        <div class="swiper-button-prev"></div>\n';
+			html += '        <div class="swiper-button-next"></div>\n';
+			html += '        <div class="swiper-pagination"></div>\n';
+			html += '    </div>\n       ';
+			html += '</div>\n';
 			$("#G082_52" +array[0]).append(html);
 			
 		}
@@ -683,58 +680,58 @@ if(goods4.length>0){
 if(coupon.length>0){
 	var html = '';
 	 
-	html += '<div class="cont_head">';
-	html += '	<div>';
-	html += '		<h4>'+coupon[0].title+'</h4>';
-	html += '	</div>';
-	html += '</div>';
-	html += '<div class="cont_body">';
-	html += '	<div class="coupon_list">';
-	html += '		<ul>';
+	html += '<div class="cont_head">\n';
+	html += '	<div>\n';
+	html += '		<h4>'+coupon[0].title+'</h4>\n';
+	html += '	</div>\n';
+	html += '</div>\n';
+	html += '<div class="cont_body">\n';
+	html += '	<div class="coupon_list">\n';
+	html += '		<ul>\n';
 	$.each(coupon, function(idx, item) {
-		html += '			<li>';
-		html += '				<div class="coupon">';
-		html += '					<div>';
-		html += '						<p class="cp_name">'+item.cpnNm+'</p>';
-		html += '						<p class="cp_cont">';
-		html += '							<span><em>'+item.dcVal.addComma()+'</em>'+item.dcWay+'</span>';
-		html += '						</p>';
+		html += '			<li>\n';
+		html += '				<div class="coupon">\n';
+		html += '					<div>\n';
+		html += '						<p class="cp_name">'+item.cpnNm+'</p>\n';
+		html += '						<p class="cp_cont">\n';
+		html += '							<span><em>'+item.dcVal.addComma()+'</em>'+item.dcWay+'</span>\n';
+		html += '						</p>\n';
 		html += '						<p class="cp_condition">'+item.useCondition;
-		html += '								<span>'+item.issueCondition+'</span>';	
-		html += '						</p>';
-		html += '					</div>';
+		html += '								<span>'+item.issueCondition+'</span>\n';	
+		html += '						</p>\n';
+		html += '					</div>\n';
 		if (item.couponStat == '쿠폰받기') {
-			html += '					<button type="button" id="coupon_'+item.cpnId+'" class="btn btn_dark btn_block btn_coupon_down" onclick="fnPlanCouponDown('+item.cpnId+')">'; 
-			html += '						<span>쿠폰받기</span>';								
-			html += '					</button>';			
+			html += '					<button type="button" id="coupon_'+item.cpnId+'" class="btn btn_dark btn_block btn_coupon_down" onclick="fnPlanCouponDown('+item.cpnId+')">\n'; 
+			html += '						<span>쿠폰받기</span>\n';								
+			html += '					</button>\n';			
 		}else{
 			html += '					<button type="button"';
-			html += '						class="btn btn_dark btn_block btn_coupon_done" disabled>';  
-			html += '						<span>받기완료</span>';								
-			html += '					</button>';			
+			html += '						class="btn btn_dark btn_block btn_coupon_done" disabled>\n';  
+			html += '						<span>받기완료</span>\n';								
+			html += '					</button>\n';			
 		}
-		html += '				</div>';
-		html += '				<button type="button" class="btn_underline"	id="btn_couponInfo_pop" onclick="usePlanInfoCoupon('+item.cpnId+')">';
-		html += '					<span>사용안내</span>';
-		html += '				</button>';
-		html += '			</li>';
+		html += '				</div>\n';
+		html += '				<button type="button" class="btn_underline"	id="btn_couponInfo_pop" onclick="usePlanInfoCoupon('+item.cpnId+')">\n';
+		html += '					<span>사용안내</span>\n';
+		html += '				</button>\n';
+		html += '			</li>\n';
 	});
-	html += '		</ul>';
-	html += '	</div>';
-	html += '</div>';
-	html += '<div class="content dp_announce line">                                                 ';
-	html += '    <div class="cont_head">                                                       ';
-	html += '        <div>                                                                     ';
-	html += '            <h4>유의사항</h4>                                                         ';
-	html += '        </div>                                                                    ';
-	html += '    </div>                                                                        ';
-	html += '    <div class="cont_body">                                                       ';
-	html += '        <div class="announce_txt">                                                ';
-	html += '            <div class="note_txt">                                                ';
-	html += '                <img src="/images/pc/ico_content_find.png" alt="유의사항">            ';
-	html += '                <p>유의사항</p>                                                       ';
-	html += '            </div>                                                                ';
-	html += '            <div class="announce_list">                                           ';
+	html += '		</ul>\n';
+	html += '	</div>\n';
+	html += '</div>\n';
+	html += '<div class="content dp_announce line">\n                                                 ';
+	html += '    <div class="cont_head">\n                                                       ';
+	html += '        <div>\n                                                                     ';
+	html += '            <h4>유의사항</h4>\n                                                         ';
+	html += '        </div>\n                                                                    ';
+	html += '    </div>\n                                                                        ';
+	html += '    <div class="cont_body">\n                                                       ';
+	html += '        <div class="announce_txt">\n                                                ';
+	html += '            <div class="note_txt">\n                                                ';
+	html += '                <img src="/images/pc/ico_content_find.png" alt="유의사항">\n            ';
+	html += '                <p>유의사항</p>\n                                                       ';
+	html += '            </div>\n                                                                ';
+	html += '            <div class="announce_list">\n                                           ';
 	html += coupon[0].note;
 	html += '            </div>                                                                '; 
 	html += '        </div>                                                                    '; 
@@ -819,44 +816,44 @@ var fnSearchCallback = function (result) {
 	 $("#replyList").html('');
 	 if (result!=null) {
 		 var html = '';
-		 html += '<div class="cmt_list_tit">';
-		 html += '	<strong>댓글</strong><span class="cnt">('+result.replyCount.addComma()+')</span>';
-		 html += '</div>';
+		 html += '<div class="cmt_list_tit">\n';
+		 html += '	<strong>댓글</strong><span class="cnt">('+result.replyCount.addComma()+')</span>\n';
+		 html += '</div>\n';
 		 if (result.replyList.length>0) {
-			 html += '<ul class="cmt_list">';
+			 html += '<ul class="cmt_list">\n';
 			 $.each(result.replyList, function (idx, item) {
-				 html += '	<li>';
-				 html += '		<div class="cmt_top">';
-				 html += '			<span class="writer">'+item.maskingCustId+'</span>';
-				 html += '			<span class="date">'+item.entryDt+'</span>';
-				 html += '		</div>';
-				 html += '		<div class="cmt_cont">';
-				 html += '			<div class="img_wrap clear" onclick="fnImgAttach(this)">';
+				 html += '	<li>\n';
+				 html += '		<div class="cmt_top">\n';
+				 html += '			<span class="writer">'+item.maskingCustId+'</span>\n';
+				 html += '			<span class="date">'+item.entryDt+'</span>\n';
+				 html += '		</div>\n';
+				 html += '		<div class="cmt_cont">\n';
+				 html += '			<div class="img_wrap clear" onclick="fnImgAttach(this)">\n';
 				 if (result.replyAttachList.length>0) {
 					for (var i = 0; i < result.replyAttachList.length; i++) {
 						if(result.replyAttachList[i].planEntrySq == item.planEntrySq){
-							html += '				<span class="pics"><img class="picsThumbs" src="'+ _uploadImageUrl +'/'+result.replyAttachList[i].sysFileNm +'"></span>';
+							html += '				<span class="pics"><img class="picsThumbs" src="'+ _uploadImageUrl +'/'+result.replyAttachList[i].sysFileNm +'"></span>\n';
 						}
 					}	
 				 }
 				
-				 html += '			</div>';
-				 html += '			<p>'+item.entryVal1.escapeHtml()+'</p>';
+				 html += '			</div>\n';
+				 html += '			<p>'+item.entryVal1.escapeHtml()+'</p>\n';
 				 if (item.entryCustNo == result.custNo) {
-					 html += '			<button class="btn btn_default btn_del" value="'+item.planEntrySq+'" onclick="fnDelReply(this.value)"><span>삭제</span></button>';
+					 html += '			<button class="btn btn_default btn_del" value="'+item.planEntrySq+'" onclick="fnDelReply(this.value)"><span>삭제</span></button>\n';
 				 }
-				 html += '		</div>';
-				 html += '	</li>';
+				 html += '		</div>\n';
+				 html += '	</li>\n';
 			 });
-			 html += '</ul>';
+			 html += '</ul>\n';
 		}else{
-			html += '<div class="nodata" id="replyNoData"> ';
-			html += '	<div class="txt_box">             ';
+			html += '<div class="nodata" id="replyNoData">\n';
+			html += '	<div class="txt_box">\n             ';
 			html += '		<p>                           ';
 			html += '			등록된 댓글이 없습니다.             ';
 			html += '		</p>                          ';
-			html += '	</div>                            ';
-			html += '</div>                                ';
+			html += '	</div>\n                            ';
+			html += '</div>\n                                ';
 		}
 		 
 	 }

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -102,65 +102,104 @@ var socialAddCart = function (obj) {
 	} 
 }
 
+var socialSetAddCart = function (obj) {
+
+	let cartGoodsList = [];
+	var optCdArr = $(obj).attr("optCd").split(",");
+	var compsGoodsCdArr = $(obj).attr("compsGoodsCd").split(",");
+	
+	for(let i = 0 ; i < compsGoodsCdArr.length ; i++) {
+		let compsList = [];
+		let goodsList = {
+		cartCompsList : new Array()
+	}
+	
+		for(let j = 0 ; j <  optCdArr.length ; j++) { 
+			let temp = new Object;
+			temp.goodsCd = $(obj).attr("goodsCd");
+			temp.optCd = optCdArr[j];
+			temp.goodsQty = $(obj).attr("minOrdQty");
+			temp.goodsType = "G056_S";
+			temp.itemCd =  compsGoodsCdArr[j];
+			temp.cartGb = "C";
+			temp.afLinkCd = $(obj).attr("afLinkCd");
+			temp.ithrCd = "";
+			temp.contentsLoc = "";
+			temp.planDtlSq = "";
+			compsList.push(temp);
+		}  
+	
+		goodsList.cartCompsList = compsList;
+		cartGoodsList.push(goodsList);
+	}
+	cfnAddCart(cartGoodsList);
+}
+
 let fnGetSocialList = function(result) {
 	var html = '';
 
 	$.each(result.dataList, function(idx, item) {
 		
-		html += ' <div class="item_prod">';
+		html += ' <div class="item_prod">\n';
 		if (item.stockQtySum > 0 || item.stockQtySum == null) {
-			html += '    <div class="item_state"> ';
+			html += '    <div class="item_state">\n';
 		}else{
-			html += '    <div class="item_state soldout"> ';
+			html += '    <div class="item_state soldout">\n';
 		}
 		if (item.likeIt == 'likeit') {
-			html += '        <button type="button" class="itemLike active" onclick="cfnPutWishList(this);" onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+			html += '        <button type="button" class="itemLike active" onclick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 		}else{
-			html += '        <button type="button" class="itemLike" onclick="cfnPutWishList(this);" onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+			html += '        <button type="button" class="itemLike" onclick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 		}
 		
-		html += '        <a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\')" >';
-		html += '            <div class="itemPic">';
-		html += '                <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'?RS=550">';
-		html += '            </div>';
-		html += '            <div class="itemSpecialPrice"><span>특가</span></div>';
-		html += '            <p class="itemBrand">'+item.brandGroupNm+'</p>';
-		html += '            <div class="itemName">'+item.goodsNm+'</div>';
-		html += '            <p class="itemPrice">';
+		html += '        <a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\')" >\n';
+		html += '            <div class="itemPic">\n';
+		html += '                <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'?RS=550">\n';
+		html += '            </div>\n';
+		html += '            <div class="itemSpecialPrice"><span>특가</span></div>\n';
+		html += '            <p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+		html += '            <div class="itemName">'+item.goodsNm+'</div>\n';
+		html += '            <p class="itemPrice">\n';
 		html += item.currPrice.addComma() +'원';
 		if (item.currPrice != item.listPrice) {
-			html += '                <span class="itemPrice_original">'+item.listPrice.addComma()+'원</span>';
+			html += '                <span class="itemPrice_original">'+item.listPrice.addComma()+'원</span>\n';
 		}
 		if (item.dcRate != 0) {
-			html += '                                 <span class=" itemPercent">'+item.dcRate.addComma()+'%</span>';
+			html += '                                 <span class=" itemPercent">'+item.dcRate.addComma()+'%</span>\n';
 		}
-		html += '            </p>';
+		html += '            </p>\n';
 		if(item.goodsTnm != null){
-			html += '           <div class="itemComment">'+item.goodsTnm+'</div>';
+			html += '           <div class="itemComment">'+item.goodsTnm+'</div>\n';
 		}
-		html += '        </a>';
+		html += '        </a>\n';
 		if (item.goodsType == 'G056_N') {
-			html += '        	 <div class="shopBagBtn">';
-			html += '                <button type="button" class="btn btn_defalt" onclick="socialAddCart(this)" goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'">';
-			html += '                    <span>쇼핑백 담기</span>';
-			html += '                </button>';
-			html += '            </div>';
+			html += '        	 <div class="shopBagBtn">\n';
+			html += '                <button type="button" class="btn btn_defalt" onclick="socialAddCart(this)" goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'">\n';
+			html += '                    <span>쇼핑백 담기</span>\n';
+			html += '                </button>\n';
+			html += '            </div>\n';
 		}else if(item.goodsType == 'G056_D'){
-			html += '        	 <div class="shopBagBtn">';
-			html += '                <button type="button" class="btn btn_defalt" onclick="socialGoodsDeal()">';
-			html += '                    <span>쇼핑백 담기</span>';
-			html += '                </button>';
-			html += '            </div>';
+			html += '        	 <div class="shopBagBtn">\n';
+			html += '                <button type="button" class="btn btn_defalt" onclick="socialGoodsDeal()">\n';
+			html += '                    <span>쇼핑백 담기</span>\n';
+			html += '                </button>\n';
+			html += '            </div>\n';
+		}else{
+			html += '        	 <div class="shopBagBtn">\n';
+			html += '                <button type="button" class="btn btn_defalt" onclick="socialSetAddCart(this)" compsGoodsCd=\''+item.compsGoodsCd+'\', goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'">\n';
+			html += '                    <span>쇼핑백 담기</span>\n';
+			html += '                </button>\n';
+			html += '            </div>\n';
 		}
-		html += '    </div>';
-		html += '</div>';
+		html += '    </div>\n';
+		html += '</div>\n';
 	});
 	return html;
 	
 }
 // 딜상품일 경우 alert
 var socialGoodsDeal = function() {
-	mcxDialog.alert("해당 상품은 딜상품!");
+	mcxDialog.alert("해당 상품은 옵션 선택 후 쇼핑백 담기가 가능합니다.");
 	return;
 }