이태영 - 20210528 수정사항 수정

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>
 
@@ -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/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/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>