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

src/main/java/com/style24/front/biz/service/TsfCartService.java

@@ -283,7 +283,7 @@ public class TsfCartService {
 				} else {
 					sb.append(cart.getCustNo());
 				}
-				sb.append("\n AND CD.ITEM_CD = '").append(param.getItemCd()).append("' \n AND CD.OPT_CD = '").append(param.getOptCd()).append("'");
+				sb.append("\n AND CD.ITEM_CD = '").append(param.getItemCd()).append("' \n AND CD.OPT_CD = '").append(param.getOptCd()).append("' AND C.CART_GB = 'G026_BC' ");
 				if (i < cartInfos.size()) {
 					i++;
 					sb.append("\n UNION ALL \n");

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

@@ -109,7 +109,7 @@
 											</div>
 											<div class="goods_box">
 												<div class="gd_item">
-													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}')|">
+													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|">
 														<span class="thumb" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, uxImgUrl=${@environment.getProperty('domain.uximage')}">
 															<img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" src="/" width="100%" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"  th:alt="${cart.sysImgNm}" alt="">
 														</span>
@@ -225,7 +225,7 @@
 											</div>
 											<div class="goods_box">
 												<div class="gd_item">
-													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}')|">
+													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|">
 														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'" src="/" width="100%"  th:alt="${cart.sysImgNm}" alt=""></span>
 														<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
 														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
@@ -345,7 +345,7 @@
 											</div>
 											<div class="goods_box">
 												<div class="gd_item">
-													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}')|">
+													<a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|">
 														<span class="thumb"><img th:src="${IMG_PATH} + '/' + ${cart.sysImgNm} + '?RS=100'" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'" src="/" width="100%"  th:alt="${cart.sysImgNm}" alt=""></span>
 														<p><span class="brand" th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span></p>
 														<p><span class="name" th:text="${cart.goodsNm}"></span></p>
@@ -1204,8 +1204,12 @@
 		}
 
 		// 페이지 이동
-		function fnGoToGoodsDetail(goodsCd) {
-			cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+		function fnGoToGoodsDetail(goodsCd, ordCanYn) {
+			if(ordCanYn == "Y") {
+				cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+			} else {
+				mcxDialog.alert("현재 구매가 불가능한 상품입니다.");
+			}
 		}
 
 		// 전체선택 버튼