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

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

@@ -33,6 +33,7 @@
 		    AND   DISP_STDT <![CDATA[<=]]> NOW()
 		    AND   DISP_EDDT <![CDATA[>=]]> NOW()
 		    GROUP BY STR_TITLE3
+		    ORDER BY STR_TITLE3
 		    LIMIT 1
 		)
 		SELECT B.STR_TITLE1     AS TITLE

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

@@ -203,6 +203,7 @@
 		     , Z.INVOICE_NO
 		     , Z.SUPPLY_COMP_CD
 		     , Z.DELV_FEE_CD
+		     , Z.DELV_FEE_CD_GRP
 		     , Z.SHOT_DELV_YN
 		     , Z.CHANGEABLE_YN
 		     , Z.RETURNABLE_YN
@@ -251,6 +252,9 @@
 		             , OD.INVOICE_NO
 		             , OD.SUPPLY_COMP_CD
 		             , OD.DELV_FEE_CD
+		             , CASE G.SELF_GOODS_YN WHEN 'Y' THEN 'WMS'
+		                                    ELSE OD.DELV_FEE_CD
+		                END                                                                   AS DELV_FEE_CD_GRP
 		             , OD.SHOT_DELV_YN
 		             , OD.CHANGEABLE_YN
 		             , OD.RETURNABLE_YN
@@ -337,7 +341,7 @@
 		 WHERE Z.ORD_CAN_CHG_QTY > 0
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.ORD_NM, Z.ORD_PHNNO, Z.GIFT_ADDR_INP_YN, Z.ORD_DTL_NO, Z.ORD_EXCH_GB, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM
 		        , Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT
-		        , Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD
+		        , Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.DELV_FEE_CD_GRP
 		        , Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.BANK_CD
 		        , Z.ACCOUNT_NO, Z.ACCOUNT_NM, Z.DELV_FEE, Z.RTN_DELV_FEE, Z.EXC_DELV_FEE
 		ORDER BY Z.ORD_DTL_NO

src/main/webapp/WEB-INF/views/mob/customer/IdFindFormMob.html

@@ -23,7 +23,7 @@
 		<section class="content mb_idInquiry_1">
 			<div class="inner">
 				<div class="close">
-					<a href="javascript:void(0);" class="btn_close" onclick="cfnGoToPage(_PAGE_LOGIN);"><span></span><span></span></a>
+					<a href="javascript:history.back(-1);" class="btn_close"><span></span><span></span></a>
 				</div>
 			</div>
 			<div class="inner">

src/main/webapp/WEB-INF/views/mob/customer/PasswordFindFormMob.html

@@ -23,7 +23,7 @@
         <section class="content mb_idInquiry_1">
             <div class="inner">
                 <div class="close">
-                    <a href="javascript:void(0);" class="btn_close" onclick="cfnGoToPage(_PAGE_LOGIN);"><span></span><span></span></a>
+                    <a href="javascript:history.back(-1);" class="btn_close"><span></span><span></span></a>
                 </div>
             </div>
             <div class="inner">

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

@@ -588,12 +588,13 @@
 			// }
 			fnReCheckFilterList();
 			if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-				$("#totCntId").text(historyData.totalCount);
+				$("#totCntId").text(historyData.totalCount.addComma());
 			}
 			if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
 				$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
 				fnSortingChange(this,historyData.sortingType,'back','Mob');
 			}else{
+				idx++;
 				fnSearchGoodsListSearch();
 			}
 		}else{

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

@@ -604,7 +604,7 @@
 		<input type="hidden" name="sortingType" value="NEW"/>
 	</form>
 
-	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
+	<script th:src="@{'/ux/plugins/gaga/gaga.infinite.scrollSession.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
 	<script src="/ux/plugins/jquery/jquery.history.min.js"></script>
 	<script th:src="@{'/biz/search.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/search.js"></script>
 
@@ -676,13 +676,20 @@
 			// }
 			fnReCheckFilterList();
 			if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-				$("#totCntId").text(historyData.totalCount);
+				$("#totCntId").text(historyData.totalCount.addComma());
+				$("#prodListCnt").text('('+historyData.totalCount.addComma()+')');
+			}else{
+				$("#totCntId").text('0');
+				$("#prodListCnt").text('(0)');
 			}
 			if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
 				$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
 				fnSortingChange(this,historyData.sortingType,'back','Mob');
 			}else{
+				idx++;
 				fnSearchGoodsListSearch();
+				fnGetSearchPlanningList();
+				fnGetSearchEventList();
 			}
 		}else{
 			fnCategoryGoodsInfiniteScrollInit();

src/main/webapp/WEB-INF/views/mob/mypage/MypageExchangeFormMob.html

@@ -648,7 +648,7 @@ var fnChangeExchangeReason = function(param) {
 // 추가 배송비 계산
 var fnAddCost = function() {
 	let addPayCost 		= 0;
-	let delvFee 		= oneData.delvFee;
+	let delvFee 		= oneData.rtnDelvFee;
 	let rtnDelvFee 		= oneData.rtnDelvFee;
 
 	// 교환 수량 체크

src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

@@ -598,6 +598,7 @@ var fnReturn = function() {
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+	data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 
 	let jsonData = JSON.stringify(data);
 
@@ -654,6 +655,7 @@ var fnChangeReturnQty = function(param) {
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+		data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 		
 		let jsonData = JSON.stringify(data);
 		

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberExchangeFormMob.html

@@ -650,7 +650,7 @@ var fnChangeExchangeReason = function(param) {
 // 추가 배송비 계산
 var fnAddCost = function() {
 	let addPayCost 		= 0;
-	let delvFee 		= oneData.delvFee;
+	let delvFee 		= oneData.rtnDelvFee;
 	let rtnDelvFee 		= oneData.rtnDelvFee;
 
 	// 교환 수량 체크

src/main/webapp/WEB-INF/views/mob/mypage/NoMemberReturnFormMob.html

@@ -603,6 +603,7 @@ var fnReturn = function() {
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+	data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 
 	let jsonData = JSON.stringify(data);
 
@@ -659,6 +660,7 @@ var fnChangeReturnQty = function(param) {
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+		data.delvFeeCdGrp 		= oneData.delvFeeCdGrp;
 		
 		let jsonData = JSON.stringify(data);
 		

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

@@ -681,6 +681,7 @@ $(document).ready( function() {
 			var br_bn_slide = new Swiper ($(this), {
 				loop: false,
 				watchOverflow : true, //210503_추가 : 슬라이드 1개일때 롤링 막는 기능 추가.
+				autoHeight : true,
 				slidesPerView: 1,
 				speed : 1000,
 				a11y: {
@@ -688,8 +689,6 @@ $(document).ready( function() {
 					notificationClass: 'swiper-notification',
 					prevSlideMessage: '이전 슬라이드',
 					nextSlideMessage: '다음 슬라이드',
-					firstSlideMessage: '첫번째 슬라이드 입니다',
-					lastSlideMessage: '마지막 슬라이드 입니다',
 					paginationBulletMessage: '슬라이드 {{index}}로 이동',
 				},
 				navigation: {
@@ -701,12 +700,20 @@ $(document).ready( function() {
 			/* SLIDE - WIDE BANNER */
 			var br_bn_slide = new Swiper ($(this), {
 				loop: true,
+				autoHeight : true,
 				slidesPerView: 1,
 				speed : 1000,
 				autoplay: {
 					delay: 4000,
 					disableOnInteraction: false,
 				},
+				a11y: {
+					enabled: true,
+					notificationClass: 'swiper-notification',
+					prevSlideMessage: '이전 슬라이드',
+					nextSlideMessage: '다음 슬라이드',
+					paginationBulletMessage: '슬라이드 {{index}}로 이동',
+				},
 				navigation: {
 					nextEl: '.main_1stage .swiper-button-next',
 					prevEl: '.main_1stage .swiper-button-prev',

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

@@ -681,7 +681,7 @@
 					filterStatHtml = historyData.filterStatHtml;
 				}
 				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-					$("#totCntId").text(historyData.totalCount);
+					$("#totCntId").text(historyData.totalCount.addComma());
 				}
 				if(!gagajf.isNull($("#searchGoodsForm").find('input[name=priceArr]').val())){
 					let tempPrice = $("#searchGoodsForm").find('input[name=priceArr]').val();
@@ -695,6 +695,7 @@
 					fnSortingChange(this,historyData.sortingType,'back');
 					$(".fillter").show();
 				}else{
+					idx++;
 					$(".fillter").show();
 					fnSearchGoodsListSearch();
 					fnSetPriceFilter();

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

@@ -581,7 +581,7 @@
 		<input type="hidden" name="sortingType" value="NEW"/>
 	</form>
 
-	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
+	<script th:src="@{'/ux/plugins/gaga/gaga.infinite.scrollSession.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
 	<script src="/ux/plugins/jquery/jquery.history.min.js"></script>
 	<script th:src="@{'/biz/search.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/search.js"></script>
 
@@ -727,7 +727,7 @@
 				$("#searchGoodsForm input:hidden[name=unisex]").remove();
 				$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 				var historyData = sessionStorage.getItem(document.location.href);
-				// console.log('historyData>>'+historyData);
+				console.log('historyData>>'+historyData);
 				if(historyData!=null){
 					historyData = JSON.parse(historyData);
 				}else{
@@ -747,7 +747,11 @@
 					filterStatHtml = historyData.filterStatHtml;
 				}
 				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-					$("#totCntId").text(historyData.totalCount);
+					$("#totCntId").text(historyData.totalCount.addComma());
+					$("#prodListCnt").text('('+historyData.totalCount.addComma()+')');
+				}else{
+					$("#totCntId").text('0');
+					$("#prodListCnt").text('(0)');
 				}
 				if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
 					$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
@@ -776,8 +780,11 @@
 					fnSortingChange(this,historyData.sortingType,'back');
 					$(".fillter").show();
 				}else{
+					idx++;
 					$(".fillter").show();
 					fnSearchGoodsListSearch();
+					fnGetSearchPlanningList();
+					fnGetSearchEventList();
 					fnSetPriceFilter();
 					fnImgOnoff();
 				}
@@ -827,6 +834,7 @@
 				$("#eventListCnt").text('(0)');
 			}else{
 				$("#eventListCnt").text('('+result.eventList.length.addComma()+')');
+				gagaInfiniteScroll.pageStatus.eventCount = result.eventList.length;
 			}
 
 			if(result.eventList != null && result.eventList.length>0){
@@ -868,6 +876,7 @@
 				$("#planListCnt").text('(0)');
 			}else{
 				$("#planListCnt").text('('+result.planList.length.addComma()+')');
+				gagaInfiniteScroll.pageStatus.planningCount = result.planList.length;
 			}
 			$("#planNodata").hide();
 			$("#planKeyword").text('');

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

@@ -565,7 +565,7 @@
 	// 추가 배송비 계산
 	var fnAddCost = function() {
 		let addPayCost = 0;
-		let delvFee = oneData.delvFee;
+		let delvFee = oneData.rtnDelvFee;
 		let rtnDelvFee = oneData.rtnDelvFee;
 
 		// 교환 수량 체크

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

@@ -452,6 +452,7 @@
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+		data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 
 		let jsonData = JSON.stringify(data);
 
@@ -500,6 +501,7 @@
 			data.chgGb = 'G680_30';
 			data.ordDtlNoArr = ordDtlNoArr;
 			data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+			data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 			
 			let jsonData = JSON.stringify(data);
 			

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

@@ -564,7 +564,7 @@
 	// 추가 배송비 계산
 	var fnAddCost = function() {
 		let addPayCost = 0;
-		let delvFee = oneData.delvFee;
+		let delvFee = oneData.rtnDelvFee;
 		let rtnDelvFee = oneData.rtnDelvFee;
 
 		// 교환 수량 체크

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

@@ -452,6 +452,7 @@
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+		data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 
 		let jsonData = JSON.stringify(data);
 
@@ -502,6 +503,7 @@
 			data.chgGb = 'G680_30';
 			data.ordDtlNoArr = ordDtlNoArr;
 			data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
+			data.delvFeeCdGrp = oneData.delvFeeCdGrp;
 			
 			let jsonData = JSON.stringify(data);
 			

src/main/webapp/biz/search.js

@@ -113,8 +113,8 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += '			<div class="itemName">'+item.goodsFullNm+'</div>';
 			if(appGb != 'Mob'){
 				tag += '			<p class="itemPrice">'+item.currPrice.addComma()
-				tag += '				<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
 				if(item.currPrice != item.listPrice){
+					tag += '				<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
 					if(item.listPrice != 0){
 						tag += '				<span class="itemPercent">'+ Math.round((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100) +'%</span>';
 					}

src/main/webapp/ux/pc/css/layout.css

@@ -82,7 +82,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .more_category a.btn_more_cate {position:relative; display:inline-block; padding-right:16px; color:#888; font-size:16px; font-weight:300; z-index:8;}
 .more_category a.btn_more_cate:after {display:block; position:absolute; top:2px; right:0; width:6px; height:6px; border:2px solid #888; border-width:2px 2px 0 0; transform:rotate(135deg); -webkit-transform:rotate(135deg); content:''}
 .more_category.on a.btn_more_cate:after {top:5px; transform:rotate(-45deg); -webkit-transform:rotate(-45deg); content:''}
-.more_category .cate_list {display:none; position:absolute; left:-30px; top:-22px; background:#222; min-width:180px; padding:60px 25px 25px; box-sizing:initial; border:1px solid #aaa; z-index:5;}
+.more_category .cate_list {display:none; position:absolute; left:-30px; top:-22px; background:#222; min-width:180px; padding:60px 25px 25px; box-sizing:initial; border:1px solid #aaa; z-index:151;}
 .more_category .cate_list ul li {margin-top:14px; display: none;}
 .more_category .cate_list ul li:first-child {margin-top:0}
 .more_category .cate_list ul li a {display:block; padding:5px; color:#fff; font-size:19px;}