Merge branch 'sowon' into develop

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

@@ -89,6 +89,7 @@
 		, TAB_STOCK AS (
 		    SELECT G.GOODS_CD
 		         , SUM(S.CURR_STOCK_QTY - S.BASE_STOCK_QTY) 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 S
 		    WHERE  G.GOODS_CD = S.GOODS_CD
@@ -98,6 +99,7 @@
 		    UNION ALL 
 		    SELECT G.GOODS_CD
 		         , SUM(S.CURR_STOCK_QTY - S.BASE_STOCK_QTY) 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
@@ -109,6 +111,7 @@
 		     , G.GOODS_CD
 		     , FN_GET_GOODS_NM(G.GOODS_NM,G.GOODS_GB,G.FOREIGN_BUY_YN,G.PARALLEL_IMPORT_YN,G.ORDER_MADE_YN) AS GOODS_FULL_NM /*상품FULL명*/
 		     , G.GOODS_TNM
+		     , G.GOODS_TYPE
 		     , G.MAIN_COLOR_CD
 		     , G.LIST_PRICE
 		     , FN_GET_BENEFIT_PRICE(#{frontGb},G.GOODS_CD,G.CURR_PRICE,#{custGb})                     AS CURR_PRICE    /*현재판매가*/
@@ -116,6 +119,7 @@
 		     , GI.SYS_IMG_NM
 		     , GI.SYS_IMG_NM2
 		     , S.STOCK_QTY_SUM
+		     , S.OPT_CD
 		     , G.MIN_ORD_QTY 
 		     <choose>
 		         <when test="custNo != null and custNo > 0"> <!-- 로그인 했으면 -->

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

@@ -446,7 +446,7 @@
 					<h3><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_WISHLIST);">위시리스트</a></h3>
 				</div>
 				<div class="quick_body" id="quickMenuWishList"> <!-- 최근 본 상품 없을 시 nodata 클래스 추가 --> <!-- 비로그인 시 need_login 클래스 추가 -->
-					<div class="product_count"><span class='c_primary' id="quickMenuWishListCount">50</span>개의 상품</div>
+<!-- 					<div class="product_count"><span class='c_primary' id="quickMenuWishListCount">50</span>개의 상품</div>
 					<div class="itemsGrp">
 						<div class="item_prod">
 							<div class="item_state">
@@ -484,7 +484,7 @@
 							<p>로그인 후 이용 가능한 서비스입니다.</p>
 							<button type="button" class="btn btn_sm"><span>로그인</span></button>
 						</div>
-					</div>
+					</div> -->
 				</div>
 			</div>
 			<div class="coupon quick_con quick04"> <!-- 퀵메뉴_나의 쿠폰 -->

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

@@ -208,7 +208,7 @@
 				tmtbHtml += '<div class="txt_content">'	+ useGiftcard.goodsNm + '</div>';
 				tmtbHtml += '</td>';
 				tmtbHtml += '<td><span class="amount_minus"> <em>'
-						+ '-'
+						/* + '-' */
 						+ ' '
 						+ useGiftcard.gfcdAmt.addComma()
 						+ '</em>원';

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

@@ -43,7 +43,7 @@
                             <div class="item_prod" th:class="${SocialData.stockQtySum == 0 ? 'item_prod sold_out' : 'item_prod'}">
                                 <div class="item_state"> <!-- item_state AD soldout -->
                                     <button type="button" th:class="${SocialData.likeIt == 'likeit'}? 'itemLike active' : 'itemLike'" onclick="cfnPutWishList(this);" th:attr="goodsCd=${SocialData.goodsCd}, ithrCd='', contentsLoc='', planDtlSq=''">관심상품 추가</button>
-                                    <a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${SocialData.goodsCd}]])">
+                                    <a href="javascript:void(0);" class="itemLink"> <!-- th:onclick="cfnGoToGoodsDetail([[${SocialData.goodsCd}]])" -->
                                         <div class="itemPic">
                                             <img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + SocialData.sysImgNm}">
                                         </div>
@@ -57,7 +57,7 @@
 											<span class=" itemPercent" th:text="${#numbers.formatDecimal(SocialData.dcRate,1,0)} + '%'"></span>
                                         </p>100 - ROUND((Z.CURR_PRICE / Z.LIST_PRICE) * 100 ,0) AS DC_RATE 
                                         <div class="shopBagBtn">
-                                            <button class="btn btn_defalt" onclick="socialAddCart(this)" th:attr="goodsCd=${SocialData.goodsCd}, minOrdQty=${SocialData.minOrdQty},  goodsType=${SocialData.goodsType}">
+                                            <button type="button" class="btn btn_defalt" onclick="socialAddCart(this)" th:attr="goodsCd=${SocialData.goodsCd}, minOrdQty=${SocialData.minOrdQty}, goodsType=${SocialData.goodsType}, optCd=${SocialData.optCd}">
                                                 <span>쇼핑백 담기</span>
                                             </button>
                                         </div>
@@ -85,14 +85,14 @@ var socialAddCart = function (obj) {
 	cart.cartGb = btnType;
 	cart.afLinkCd = $(obj).attr("afLinkCd");
 	cart.ithrCd = "";
-	cart.contentsLoc "";
-	cart.planDtlSq = '';
+	cart.contentsLoc =  "";
+	cart.planDtlSq = "";
 	params.push(cart); 
 	
 	// 장바구니담기
 	if (params.length > 0){
 		cfnAddCart(params);	
-	}
+	} 
 }
 $(function(){
        /* 핫딜 countDown */