Merge remote-tracking branch 'origin/develop' into jsh77b

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

@@ -26,7 +26,7 @@
 									<span class="selling_price"><em th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></em>원</span>
 									<th:block th:if="${goods.listPrice != goods.currPrice}">
 										<span class="sale_price"><del><em th:text="${#numbers.formatInteger(goods.listPrice, 1, 'COMMA')}"></em>원</del></span>
-										<span class="sale_percent" th:text="${goods.dcRate + '%'}"></span>
+										<span class="sale_percent" th:text="${#numbers.formatInteger(goods.dcRate, 0, 'COMMA') + '%'}"></span>
 									</th:block>
 								</p>
 							</div>

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

@@ -130,7 +130,7 @@
 							<div class="info_box">
 								<div class="od_name">
 									<div class="brand">
-										<span th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
+										<span th:text="${cart.brandGroupNm}"></span>
 									</div>
 									<div class="name"><a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|" th:text="${cart.goodsNm}"></a></div>
 								</div>
@@ -173,7 +173,7 @@
 							<div><button type="button" class="btn btn_default btn_option_pop01" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|" th:disabled="${cart.ordCanYn.equals('N')}"><span>옵션/수량변경</span></button></div> <!-- 옵션변경_팝업01 호출 -->
 							<div>
 								<button th:if="${cart.soldoutYn.equals('Y') or cart.ordCanYn.equals('N')}" type="button" class="btn btn_primary_line" disabled=""><span>구매 불가</span></button>
-								<button th:if="${cart.soldoutYn.equals('N') and cart.ordCanYn.equals('Y')}" type="button" class="btn btn_primary_line" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로주문</span></button>
+								<button th:if="${cart.soldoutYn.equals('N') and cart.ordCanYn.equals('Y')}" type="button" class="btn btn_primary_line" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로구매</span></button>
 							</div> <!-- 210406_ID 추가 -->
 						</div>
 
@@ -233,7 +233,7 @@
 							<div class="info_box">
 								<div class="od_name">
 									<div class="brand">
-										<span th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
+										<span th:text="${cart.brandGroupNm}"></span>
 									</div>
 									<div class="name"><a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|" th:text="${cart.goodsNm}"></a></div>
 								</div>
@@ -276,7 +276,7 @@
 							<div><button type="button" class="btn btn_default btn_option_pop01" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|" th:disabled="${cart.ordCanYn.equals('N')}"><span>옵션/수량변경</span></button></div> <!-- 옵션변경_팝업01 호출 -->
 							<div>
 								<button th:if="${cart.soldoutYn.equals('Y') or cart.ordCanYn.equals('N')}" type="button" class="btn btn_primary_line" disabled=""><span>구매 불가</span></button>
-								<button th:if="${cart.soldoutYn.equals('N') and cart.ordCanYn.equals('Y')}" type="button" class="btn btn_primary_line" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로주문</span></button>
+								<button th:if="${cart.soldoutYn.equals('N') and cart.ordCanYn.equals('Y')}" type="button" class="btn btn_primary_line" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로구매</span></button>
 							</div> <!-- 210406_ID 추가 -->
 						</div>
 
@@ -356,7 +356,7 @@
 							<div class="info_box">
 								<div class="od_name">
 									<div class="brand">
-										<span th:text="|${cart.brandEnm} ${cart.brandKnm}|"></span>
+										<span th:text="${cart.brandGroupNm}"></span>
 									</div>
 									<div class="name"><a th:href="|javascript:fnGoToGoodsDetail('${cart.goodsCd}', '${cart.ordCanYn}')|" th:text="${cart.goodsNm}"></a></div>
 								</div>
@@ -399,7 +399,7 @@
 							<div><button type="button" class="btn btn_default" th:onclick="|fnChangeCartOptCd(${cart.cartSq})|" th:disabled="${cart.ordCanYn.equals('N')}"><span>옵션/수량변경</span></button></div>
 							<div>
 								<button th:if="${cart.soldoutYn.equals('Y') or cart.ordCanYn.equals('N')}" type="button" class="btn btn_primary_line" disabled=""><span>구매 불가</span></button>
-								<button th:if="${cart.soldoutYn.equals('N') and cart.ordCanYn.equals('Y')}" type="button" class="btn btn_primary_line" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로주문</span></button>
+								<button th:if="${cart.soldoutYn.equals('N') and cart.ordCanYn.equals('Y')}" type="button" class="btn btn_primary_line" th:onclick="|fnSubmitNoMember(${cart.cartSq})|"><span>바로구매</span></button>
 							</div>
 						</div>
 
@@ -1070,7 +1070,7 @@
 						let message = info.goodsNm + " 의 최소 구매수량은 " + info.minOrdQty + "개입니다.\n최소 구매 수량으로 주문하시겠습니까?";
 						fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
 					} else if (info.goodsQty > info.maxOrdQty) {
-						let message = info.goodsNm + " 의 최대 구매 사능 수량은 " + info.maxOrdQty + "개입니다. 최대 구매 가능한 수량으로 주문하시겠습니까?";
+						let message = info.goodsNm + " 의 최대 구매 가능 수량은 " + info.maxOrdQty + "개입니다. 최대 구매 가능한 수량으로 주문하시겠습니까?";
 						fnUpdateConfirmChangeQty(message, info.cartSq, info.maxOrdQty, list, listIndex, cartSqArr, allYn);
 					} else if (listIndex < list.length) {
 						fnOrderValidation(list, listIndex, cartSqArr, allYn);
@@ -1308,7 +1308,7 @@
 					});
 
 					if(cartArr.length < 1) {
-						mcxDialog.alert("선택된 상품이 없습니다.");
+						mcxDialog.alert("삭제하실 상품을 선택해 주세요.");
 						return false;
 					}
 

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

@@ -35,7 +35,7 @@
 									<span class="selling_price"><em th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></em>원</span>
 									<th:block th:if="${goods.listPrice != goods.currPrice}">
 										<span class="sale_price"><del><em th:text="${#numbers.formatInteger(goods.listPrice, 1, 'COMMA')}"></em>원</del></span>
-										<span class="sale_percent" th:text="${goods.dcRate + '%'}"></span>
+										<span class="sale_percent" th:text="${#numbers.formatInteger(goods.dcRate, 0, 'COMMA') + '%'}"></span>
 									</th:block>
 								</p>
 							</div>

src/main/webapp/WEB-INF/views/mob/display/BestMainFormMob.html

@@ -338,7 +338,7 @@
 				var goodsUrl = [[${@environment.getProperty('upload.goods.view')}]];;
 				let lastPage = result.paging.pageable.pageNo;
 				let endRow = result.endRow - result.paging.pageable.pageSize;
-				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow);
+				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else{
 				if($("#bestGoodsForm input[name=pageNo]").val()==1){

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -33,7 +33,9 @@
 												<img th:src="${@environment.getProperty('domain.image') + '/' + item.imgPath1}" alt="">
 											</div>
 											<div class="txtWrap">
-												<p th:text="${item.strTitle1}">겨울정기 가격제안전<br>겨울정기 가격</p>
+												<p class="bText">
+													<input type="hidden" name="bannerTitle" th:value="${item.strTitle1}">
+												</p>
 												<p class="txt_xs" th:text="${item.subText1}">나만의 겨울 스타일 찾기</p>
 											</div>
 										</a>
@@ -165,6 +167,16 @@
 				}
 			});
 		}
+
+		// 배너 슬라이더 <br> 처리
+		$('.bText').each(function (){
+			let tag = '';
+			if(!gagajf.isNull($(this).find("input[name=bannerTitle]").val())){
+				var brText = $(this).find("input[name=bannerTitle]").val();
+				tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				$(this).append(tag);
+			}
+		});
 	</script>
 
 </th:block>

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

@@ -23,7 +23,7 @@
 													<span th:text="${#numbers.formatInteger(goods.price, 1, 'COMMA')}"></span>
 													<th:block th:if="${goods.currPrice != goods.price}">
 														<span class="itemPrice_original" th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
-														<span class="itemPercent" th:text="${#strings.replace(goods.dcRate, '.0', '') + '%'}"></span>
+														<span class="itemPercent" th:text="${#numbers.formatInteger(goods.dcRate, 0, 'COMMA') + '%'}"></span>
 													</th:block>
 												</p>
 											</a>

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

@@ -1059,7 +1059,7 @@
 					let message = info.goodsNm + " 의 최소 구매수량은 " + info.minOrdQty + "개입니다.\n최소 구매 수량으로 주문하시겠습니까?";
 					fnUpdateConfirmChangeQty(message, info.cartSq, info.minOrdQty, list, listIndex, cartSqArr, allYn);
 				} else if (info.goodsQty > info.maxOrdQty) {
-					let message = info.goodsNm + " 의 최대 구매 사능 수량은 " + info.maxOrdQty + "개입니다. 최대 구매 가능한 수량으로 주문하시겠습니까?";
+					let message = info.goodsNm + " 의 최대 구매 가능 수량은 " + info.maxOrdQty + "개입니다. 최대 구매 가능한 수량으로 주문하시겠습니까?";
 					fnUpdateConfirmChangeQty(message, info.cartSq, info.maxOrdQty, list, listIndex, cartSqArr, allYn);
 				} else if (listIndex < list.length) {
 					fnOrderValidation(list, listIndex, cartSqArr, allYn);

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

@@ -30,7 +30,7 @@
 												<span th:text="${#numbers.formatInteger(goods.currPrice, 1, 'COMMA')}"></span>
 												<th:block th:if="${goods.listPrice != goods.currPrice}">
 													<span class="itemPrice_original" th:text="${#numbers.formatInteger(goods.listPrice, 1, 'COMMA')}"></span>
-													<span class="itemPercent" th:text="${goods.dcRate + '%'}"></span>
+													<span class="itemPercent" th:text="${#numbers.formatInteger(goods.dcRate, 0, 'COMMA') + '%'}"></span>
 												</th:block>
 											</p>
 										</a>

src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -47,7 +47,9 @@
 												<img  th:src="${@environment.getProperty('domain.image') + '/' + item.imgPath1}" alt="서브메인 썸네일"/>
 											</div>
 											<div class="txt">
-												<p class="subject" th:text="${item.strTitle1}"></p>
+												<p class="subject bText">
+													<input type="hidden" name="bannerTitle" th:value="${item.strTitle1}">
+												</p>
 												<span th:text="${item.subText1}"></span>
 											</div>
 										</a>
@@ -237,6 +239,16 @@
 			}
 		});
 	}
+
+	// 배너 슬라이더 <br> 처리
+	$('.bText').each(function (){
+		let tag = '';
+		if(!gagajf.isNull($(this).find("input[name=bannerTitle]").val())){
+			var brText = $(this).find("input[name=bannerTitle]").val();
+			tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+			$(this).append(tag);
+		}
+	});
 /*]]>*/
 </script>
 

src/main/webapp/biz/goods.js

@@ -137,7 +137,11 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += ' likeit';
 		}
 		tag += ' "';
-		tag += ' onClick="cfnPutWishList(this);" selfGoodsYn=\''+item.selfGoodsYn+'\' goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+		if(appGb == 'Mob'){
+			tag += ' onClick="cfnMoPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+		}else{
+			tag += ' onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+		}
 		tag += '<a href="javascript:void(0);" class="itemLink" onclick="fnClickGoodsCd(\''+item.goodsCd+'\',\''+item.mainColorCd+'\');">';
 		tag += '			<div class="itemPic">';
 		if(!gagajf.isNull(item.videos)){