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

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

@@ -460,6 +460,8 @@ public class TsfCartService {
 			if ("N".equals(goods.getSoldoutYn()) && "Y".equals(goods.getOrdCanYn()) && goods.getGoodsQty() >= goods.getMinOrdQty() && goods.getGoodsQty() <= goods.getMaxOrdQty()) {
 				cartSqs.add(goods.getCartSq());
 			}
+
+			goods.setOrgSavePntAmt((int) (goods.getCurrPrice() * goods.getPntRate() / 100.0));
 		}
 
 		order.setCartSqArr(cartSqs.stream().mapToInt(Integer::intValue).toArray());

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

@@ -548,12 +548,15 @@
 		             , CASE WHEN GQDS.GOODS_CD IS NULL AND G.SELF_GOODS_YN = 'Y' THEN 'SHOT'
 		                    WHEN G.SELF_GOODS_YN = 'Y' THEN 'WMS'
 		                    ELSE DFP.DELV_FEE_CD END AS CART_DELV_FEE_CD
-		             , CASE WHEN STOCK.ORD_CAN_YN = 'Y' AND (SELECT  CASE WHEN Z.CNT1 = 0 THEN 'Y' ELSE CASE WHEN CNT2 > 0 THEN 'Y'
-		                                                                                                     ELSE 'N' END END
+		             , CASE WHEN STOCK.ORD_CAN_YN = 'Y' AND (SELECT  CASE WHEN MAX(Z.CNT1) IS NULL THEN 'Y' ELSE CASE WHEN CNT2 > 0 THEN 'Y'
+		                                                                                                              ELSE 'N' END END
 		                                                     FROM    (SELECT COUNT(1) AS CNT1
 		                                                                   , CASE WHEN GOG.CUST_GRADE = CT.CUST_GRADE THEN 1
 		                                                                          ELSE 0 END AS CNT2
 		                                                              FROM   TB_GOODS_ORDER_GRADE GOG
+		                                                              GROUP  BY GOODS_CD, CUST_GRADE
+		                                                              UNION  ALL
+		                                                              SELECT NULL, NULL
 		                                                              WHERE  GOG.GOODS_CD = C.GOODS_CD) Z ) = 'Y' AND NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT THEN 'Y'
 		                    ELSE 'N' END AS ORD_CAN_YN
 		             , CASE WHEN C.CUST_NO > 0 AND (SELECT IFNULL(SUM(OD.ORD_QTY), 0)

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

@@ -106,6 +106,7 @@
 						<input type="hidden" name="ordCanYn"  th:value="${cart.ordCanYn}" />
 						<input type="hidden" name="goodsCd"   th:value="${cart.goodsCd}" />
 						<input type="hidden" name="cartSq"    th:value="${cart.cartSq}" />
+						<input type="hidden" name="orgSavePntAmt" th:value="${cart.orgSavePntAmt}" />
 
 						<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq}, 'cart')|"><span><em class="sr-only">상품삭제</em></span></button>
 						<div class="goods_detail">
@@ -142,7 +143,7 @@
 									</th:block>
 								</div>
 								<div class="od_point">
-									<p class="point"><span th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
+									<p class="point"><span th:class="|point${cart.cartSq}|" th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
 								</div>
 								<div class="od_exinfo">
 									<span th:style="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y') ? 'display:inline-block' : 'display:none'}" class="applyTmtb btn_moresale order_badge order_bullet_badge">다다익선 할인 적용</span>
@@ -208,6 +209,7 @@
 						<input type="hidden" name="ordCanYn"  th:value="${cart.ordCanYn}" />
 						<input type="hidden" name="goodsCd"   th:value="${cart.goodsCd}" />
 						<input type="hidden" name="cartSq"    th:value="${cart.cartSq}" />
+						<input type="hidden" name="orgSavePntAmt" th:value="${cart.orgSavePntAmt}" />
 
 						<button type="button" class="btn_delete" th:onclick="|deleteCart(${cart.cartSq}, 'cart')|"><span><em class="sr-only">상품삭제</em></span></button>
 						<div class="goods_detail">
@@ -244,7 +246,7 @@
 									</th:block>
 								</div>
 								<div class="od_point">
-									<p class="point"><span th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
+									<p class="point"><span th:class="|point${cart.cartSq}|" th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
 								</div>
 								<div class="od_exinfo">
 									<span th:style="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y') ? 'display:inline-block' : 'display:none'}" class="applyTmtb btn_moresale order_badge order_bullet_badge">다다익선 할인 적용</span>
@@ -330,6 +332,7 @@
 						<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
 						<input type="hidden" name="goodsCd"   th:value="${cart.goodsCd}" />
 						<input type="hidden" name="cartSq"    th:value="${cart.cartSq}" />
+						<input type="hidden" name="orgSavePntAmt" th:value="${cart.orgSavePntAmt}" />
 
 						<button type="button" class="btn_delete"><span><em class="sr-only">상품삭제</em></span></button>
 						<div class="goods_detail">
@@ -366,7 +369,7 @@
 									</th:block>
 								</div>
 								<div class="od_point">
-									<p class="point"><span th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
+									<p class="point"><span th:class="|point${cart.cartSq}|" th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></span>P 적립예정</p>
 								</div>
 								<div class="od_exinfo">
 									<span th:style="${(cart.qtyTmtbSq > 0 and cart.applyQtySectionYn == 'Y') or (cart.amtTmtbSq > 0 and cart.applyAmtSectionYn == 'Y') ? 'display:inline-block' : 'display:none'}" class="applyTmtb btn_moresale order_badge order_bullet_badge">다다익선 할인 적용</span>
@@ -877,6 +880,8 @@
 						$(this).parent().find(".od_calc .selling_price>em").text($(this).parent().find(".od_calc .sale_price>del>em").text());
 						$(this).parent().find(".od_calc .sale_price").hide();
 					}
+
+					$(this).parent().find(".info_box .point" + $(this).val()).text(Number($(this).parent().find("input[name=orgSavePntAmt]").val()).toLocaleString());
 				});
 
 				for(let i = 0 ; i < shotList.length ; i++) {
@@ -886,6 +891,7 @@
 							let shot = shotList[i];
 							$(this).parent().find("input[name=applyQtySectionYn]").val(shot.applyQtySectionYn);
 							$(this).parent().find("input[name=applyAmtSectionYn]").val(shot.applyQtySectionYn);
+							$(this).parent().find(".info_box .point>span").text(Number(shot.savePntAmt).toLocaleString());
 
 							// 다다익선 적용 정보 생성성
 							if((shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "Y") || (shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "Y")) {
@@ -915,6 +921,7 @@
 							let wms = wmsList[i];
 							$(this).parent().find("input[name=applyQtySectionYn]").val(wms.applyQtySectionYn);
 							$(this).parent().find("input[name=applyAmtSectionYn]").val(wms.applyQtySectionYn);
+							$(this).parent().find(".info_box .point>span").text(Number(wms.savePntAmt).toLocaleString());
 
 							// 다다익선 적용 정보 생성성
 							if((wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "Y") || (wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "Y")) {
@@ -954,6 +961,7 @@
 							let delv = delvList[i];
 							$(this).parent().find("input[name=applyQtySectionYn]").val(delv.applyQtySectionYn);
 							$(this).parent().find("input[name=applyAmtSectionYn]").val(delv.applyQtySectionYn);
+							$(this).parent().find(".info_box .point>span").text(Number(delv.savePntAmt).toLocaleString());
 
 							// 다다익선 적용 정보 생성성
 							if((delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "Y") || (delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "Y")) {

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

@@ -95,6 +95,7 @@
 										<input type="hidden" name="ordCanYn" th:value="${cart.ordCanYn}" />
 										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
 										<input type="hidden" name="goodsCd" th:value="${cart.goodsCd}" />
+										<input type="hidden" name="orgSavePntAmt" th:value="${cart.orgSavePntAmt}" />
 
 										<div class="order_desc">
 											<div class="form_box">
@@ -160,7 +161,7 @@
 												</th:block>
 												<p>
 													<span class="point">
-														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+														<em th:class="|point${cart.cartSq}|" th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
 													</span>
 												</p>
 											</div>
@@ -211,6 +212,7 @@
 										<input type="hidden" name="ordCanYn" th:value="${cart.ordCanYn}" />
 										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
 										<input type="hidden" name="goodsCd" th:value="${cart.goodsCd}" />
+										<input type="hidden" name="orgSavePntAmt" th:value="${cart.orgSavePntAmt}" />
 
 										<div class="order_desc">
 											<div class="form_box">
@@ -270,7 +272,7 @@
 												</th:block>
 												<p>
 													<span class="point">
-														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+														<em th:class="|point${cart.cartSq}|" th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
 													</span>
 												</p>
 											</div>
@@ -331,6 +333,7 @@
 										<input type="hidden" name="tmtbDcAmt" th:value="${cart.tmtbDcAmt}" />
 										<input type="hidden" name="cartSq" th:value="${cart.cartSq}" />
 										<input type="hidden" name="goodsCd" th:value="${cart.goodsCd}" />
+										<input type="hidden" name="orgSavePntAmt" th:value="${cart.orgSavePntAmt}" />
 
 										<div class="order_desc">
 											<div class="form_box">
@@ -388,7 +391,7 @@
 												</th:block>
 												<p>
 													<span class="point">
-														<em th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
+														<em th:class="|point${cart.cartSq}|" th:text="${#numbers.formatInteger(cart.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정
 													</span>
 												</p>
 											</div>
@@ -868,6 +871,8 @@
 					$(this).parent().find(".calc_box .price_sale").text($(this).parent().find(".calc_box .price_org").text());
 					$(this).parent().find(".calc_box .price_org").remove();
 				}
+
+				$(this).parent().find(".calc_box .point" + $(this).val()).text(Number($(this).parent().find("input[name=orgSavePntAmt]").val()).toLocaleString());
 			});
 
 			// $("#cartListForm").find(".delvFeeArea").html("<div class='info_dlvr'><span class='dlvr_fee'>배송비 무료</span></div>");
@@ -877,6 +882,7 @@
 						let shot = shotList[i];
 						$(this).parent().find("input[name=applyQtySectionYn]").val(shot.applyQtySectionYn);
 						$(this).parent().find("input[name=applyAmtSectionYn]").val(shot.applyQtySectionYn);
+						$(this).parent().find(".calc_box .point>em").text(Number(shot.savePntAmt).toLocaleString());
 
 						// 다다익선 적용 정보 생성성
 						if((shot.qtyTmtbSq > 0 && shot.applyQtySectionYn == "Y") || shot.amtTmtbSq > 0 && shot.applyAmtSectionYn == "Y") {
@@ -912,6 +918,7 @@
 						let wms = wmsList[i];
 						$(this).parent().find("input[name=applyQtySectionYn]").val(wms.applyQtySectionYn);
 						$(this).parent().find("input[name=applyAmtSectionYn]").val(wms.applyQtySectionYn);
+						$(this).parent().find(".calc_box .point>em").text(Number(wms.savePntAmt).toLocaleString());
 
 						// 다다익선 적용 정보 생성성
 						if((wms.qtyTmtbSq > 0 && wms.applyQtySectionYn == "Y") || (wms.amtTmtbSq > 0 && wms.applyAmtSectionYn == "Y")) {
@@ -937,6 +944,7 @@
 						let delv = delvList[i];
 						$(this).parent().find("input[name=applyQtySectionYn]").val(delv.applyQtySectionYn);
 						$(this).parent().find("input[name=applyAmtSectionYn]").val(delv.applyQtySectionYn);
+						$(this).parent().find(".calc_box .point>em").text(Number(delv.savePntAmt).toLocaleString());
 
 						// 다다익선 적용 정보 생성성
 						if((delv.qtyTmtbSq > 0 && delv.applyQtySectionYn == "Y") || (delv.amtTmtbSq > 0 && delv.applyAmtSectionYn == "Y")) {

src/main/webapp/ux/mo/css/layout_m.css

@@ -913,6 +913,10 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 /* 210503 */
 .br .br_lookbook .inner .lb_text .text_cont{display:none; height: 3.4rem; overflow: hidden; margin: 0 0 2.4rem; font-size: 1.2rem; font-weight: 300; line-height: 1.8rem;}
 .br .br_lookbook .inner .lb_text .text_cont.active{display:block;}
+.br .br_inlookbook .ioTit{display:none}
+.br .br_inlookbook .ioTit.active{display:block}
+.br .br_inlookbook .ioBtn{display:none}
+.br .br_inlookbook .ioBtn.active{display:block}
 .br .br_inlookbook .itemsOut{display:none}
 .br .br_inlookbook .itemsOut.active{display:block}
 

src/main/webapp/ux/mo/css/style24_m.css

@@ -2543,7 +2543,7 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 .popup_main_notice .popup_content .popup_body .swiper-container {height: 100%;}
 .popup_main_notice .popup_content .popup_body .swiper-slide {position: relative;}
 .popup_main_notice .popup_content .popup_body .swiper-slide img {width: 100%; position: absolute; top: 50%; left: 50%; transform:translate(-50%, -50%); height: auto;}
-.popup_main_notice .popup_content .popup_footer {position: relative; background:#222; height: 6rem; padding: 2.2rem;}
+.popup_main_notice .popup_content .popup_footer {position: fixed; left:0; bottom:0; width: 100%; background:#222; height: 6rem; padding: 2.2rem;}
 .popup_main_notice .popup_content .popup_footer::after {content:''; clear:both; display:block;}
 .popup_main_notice .popup_content .popup_footer a.btn_underline {display:inline-block; float:left; color:#888; font-size:1.3rem; font-weight:200; border-color:#888}
 .popup_main_notice .popup_content .popup_footer a.btn_popup_close {position: absolute; top: 0; right: 0; width: 6rem; height: 6rem; background: url(/images/mo/btn_main_pop_arrow.png) no-repeat center; background-size:1.6rem;}
@@ -2574,5 +2574,14 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 /* popup_마이페이지 회수조회 팝업 */
 .modal.reclaim_pop {}
 .modal.reclaim_pop .modal-body {margin-top: 8rem;}
-.modal.reclaim_pop .modal-body .pop_cont {color:#222;}
-.modal.reclaim_pop .modal-body .pop_cont .tbl_wrap .tbl {border-bottom: 1px solid #ddd; padding-bottom: 1.5rem;}
+.modal.reclaim_pop .modal-body .pop_cont {color:#222; font-weight: 300;}
+.modal.reclaim_pop .modal-body .pop_cont .tbl_wrap .tbl {border-bottom: 1px solid #ddd; padding-bottom: 1.5rem;}
+.modal.reclaim_pop .modal-body .pop_cont .tbl_wrap .tbl {border-bottom: 1px solid #ddd; padding:2rem 0;}
+.modal.reclaim_pop .modal-body .pop_cont .inner {margin-bottom: 1.2rem;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tbltitWrap {margin-top: 0;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap {margin: 0;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl th {background: #f5f5f5;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table {table-layout: fixed;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table tr th {font-size: 1.3rem;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table tr td {font-size: 1.2rem;}
+.modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table tr th, .modal.reclaim_pop .modal-body .pop_cont .goods_tbl .tblWrap table tr td {border-left: 0; word-break: break-all;}