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

pom.xml

@@ -178,9 +178,9 @@
 		<dependency>
 			<groupId>com.diquest</groupId>
 			<artifactId>istyle</artifactId>
-			<version>1.1</version>
+			<version>1.3</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle1.1.jar</systemPath>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.diquest.ir</groupId>

src/main/java/com/style24/front/biz/dao/TsfRecentlyGoodsDao.java

@@ -44,7 +44,7 @@ public interface TsfRecentlyGoodsDao {
 	 * @author gagamel
 	 * @since 2021. 5. 13
 	 */
-	public void updateRecentlyGoodsAfterLogin(RecentlyGoods recentlyGoods);
+	void updateRecentlyGoodsAfterLogin(RecentlyGoods recentlyGoods);
 
 	/**
 	 * 최근본상품 목록
@@ -54,5 +54,23 @@ public interface TsfRecentlyGoodsDao {
 	 * @date 2021. 5. 13
 	 */
 	Collection<RecentlyGoods> getRecentlyGoodsList(RecentlyGoods recentlyGoods);
+	
+	/**
+	 * 최근 본 상품 목록 등록 여부 
+	 * @param recentlyGoods - 최근본상품 정보
+	 * @return
+	 * @author sowon
+	 * @date 2021. 6. 23
+	 */
+	int getRecentlyGoodsOwnCount(RecentlyGoods recentlyGoods);
+
+	/**
+	 * 기존 최근 본 상품 update
+	 * @param recentlyGoods - 최근본상품 정보
+	 * @author sowon
+	 * @date 2021. 6. 23
+	 */
+	void updateRecentlyGoods(RecentlyGoods recentlyGoods);
+
 
 }

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

@@ -43,15 +43,20 @@ public class TsfRecentlyGoodsService {
 
 		// 최근본상품 건수
 		int totCnt = recentlyGoodsDao.getRecentlyGoodsTotalCount(recentlyGoods);
-		log.info("최근본상품 건수: {}", totCnt);
 
-		if (totCnt >= 50) {
+		if (totCnt > 50) {
 			// 맨 처음 등록된 상품 삭제
 			recentlyGoodsDao.deleteRecentlyFirstGoods(recentlyGoods);
 		}
-
-		// 최근본상품 생성
-		recentlyGoodsDao.createRecentlyGoods(recentlyGoods);
+		
+		// 등록 여부 
+		int ownCnt = recentlyGoodsDao.getRecentlyGoodsOwnCount(recentlyGoods);
+		if (ownCnt > 0) {
+			recentlyGoodsDao.updateRecentlyGoods(recentlyGoods);
+		}else {
+			// 최근본상품 생성
+			recentlyGoodsDao.createRecentlyGoods(recentlyGoods);
+		}
 	}
 
 	/**

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -74,7 +74,7 @@ public class SearchEngineDiquest {
 
 		// 인기검색어
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		log.info("///[getTrendKeywordList] paramMap: {}", paramMap);
 
@@ -103,7 +103,7 @@ public class SearchEngineDiquest {
 		AutoCompleteResponse result = new AutoCompleteResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		log.info("///[getAutoComplete] paramMap: {}", paramMap);
@@ -133,7 +133,7 @@ public class SearchEngineDiquest {
 		Collection<Cate1> result = new ArrayList<Cate1>();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 //		paramMap.put("cate1No", 1300);
 //		paramMap.put("brandGroupNo", 0);
@@ -176,7 +176,7 @@ public class SearchEngineDiquest {
 		Collection<Filter> result = new ArrayList<Filter>();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		log.info("///[getFilterList] paramMap: {}", paramMap);
 
@@ -209,7 +209,7 @@ public class SearchEngineDiquest {
 		GoodsListResponse result = new GoodsListResponse();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("pageNumber", String.valueOf(params.getPageNo()));
 		paramMap.put("rowsPerPage", String.valueOf(params.getPageSize()));
@@ -253,7 +253,7 @@ public class SearchEngineDiquest {
 		PlanningResponse result = new PlanningResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));
@@ -287,7 +287,7 @@ public class SearchEngineDiquest {
 		PlanningResponse result = new PlanningResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -650,13 +650,13 @@ public class TsfDisplayController extends TsfBaseController {
 			cate1.setBrandGroupNo(params.getBrandGroupNo() == null ? 0 : params.getBrandGroupNo());
 			cate1.setFrontGb(TsfSession.getFrontGb());
 			cate1.setSiteCd(TscConstants.Site.STYLE24.value());
-			cate1.setKeyword("TBJ");
+//			cate1.setKeyword("TBJ");
 			cate1.setCateGb("G032_101");
 			cate1.setCate1No(params.getCate1No());
 			mav.addObject("cateList", diquest.getCategoryList(cate1));
 
 			// 상품리스트 카테고리별 필터 목록
-			params.setKeyword("TBJ");
+//			params.setKeyword("TBJ");
 			filterList = diquest.getFilterList(params);
 		}else{
 			// 카테고리 목록
@@ -773,7 +773,7 @@ public class TsfDisplayController extends TsfBaseController {
 
 		String syncYn = commonService.getSearchEngineSyncYn();
 		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
-			params.setKeyword("TBJ");
+//			params.setKeyword("TBJ");
 			GoodsListResponse response = diquest.getGoodsList(params);
 			pageable.setTotalCount(response.getTotalCount());
 			dataList = response.getResponse();

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -206,6 +206,9 @@ public class TsfMypageController extends TsfBaseController {
 
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
+
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
 		
 		// 2021.04.21 모바일에서 사용하려고 추가
 		int totalCnt = orderService.getPagingOrdNoListCount(order);
@@ -889,6 +892,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 2021.05.03 은행목록추가
 		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		mav.setViewName(super.getDeviceViewName("/mypage/MypageCancelForm"));
 
 		return mav;
@@ -1016,6 +1022,9 @@ public class TsfMypageController extends TsfBaseController {
 		int totalCnt = orderChangeService.getPagingCreListCount(orderChange);
 		mav.addObject("totalCnt", totalCnt);
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// 주문상세상태코드 설정
 		mav.addObject("chgStatList", rendererService.getCommonCodeList("G685", "Y", new String[] {"G685_10", "G685_11", "G685_19"}));
 
@@ -1094,6 +1103,9 @@ public class TsfMypageController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// KCP 전표 경로 설정
 		mav.addObject("kcpReceiptUrl", env.getProperty("pg.kcp.receipt.url"));
 
@@ -1465,6 +1477,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문번호 설정
 		mav.addObject("ordNo", order.getOrdNo());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", TsfSession.isLogin());
+
 		// 주문목록 조회
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
 

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -150,6 +150,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
 
@@ -524,6 +527,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 취소 가능 리스트 조회
 		GagaMap map = orderChangeService.getCancelListForMypage(order);
 		Order oneData = (Order)map.get("oneData");
@@ -1085,6 +1091,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
 
@@ -1180,6 +1189,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", orderChange.getOrdNm());
 		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 취소상세 데이터 조회
 		GagaMap map = coreOrderChangeService.getCreCancelDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
@@ -1512,6 +1524,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
 
+		// 로그인여부 설정
+		mav.addObject("isLogin", false);
+
 		// 주문목록 조회
 		Collection<GagaMap> orderList = orderService.getOrderListForMypage(order);
 

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

@@ -29,8 +29,7 @@
 		                                   OR
 		                                   CUST_NO = #{custNo}
 		                                  )
-		                           ORDER  BY RGOODS_SQ
-		                           LIMIT 1
+		                           ORDER  BY REG_DT LIMIT 1
 		                           ) Z
 		                     )
 	</delete>
@@ -81,7 +80,7 @@
 		     , GI.SYS_IMG_NM
 		FROM   (
 		        SELECT GOODS_CD
-		             , RANK() OVER(ORDER BY REG_DT DESC, GOODS_CD) AS DISP_ORD
+		             , RANK() OVER(ORDER BY UPD_DT DESC) AS DISP_ORD
 		        FROM   TB_RECENTLY_GOODS
 		        WHERE  1 = 1
 		        <choose>
@@ -105,4 +104,26 @@
 		ORDER  BY A.DISP_ORD
 	</select>
 	
+	<!-- 최근 본 상품 목록 등록 여부 -->
+	<select id="getRecentlyGoodsOwnCount" parameterType="RecentlyGoods" resultType="int">
+		/* TsfRecentlyGoods.getRecentlyGoodsOwnCount */
+		SELECT COUNT(*)
+		    FROM   TB_RECENTLY_GOODS
+		    WHERE  1 = 1
+		    AND    (
+		            (GOODS_CD =  #{goodsCd} AND JSESSION_ID =   #{jsessionId})
+		            OR
+		            (GOODS_CD =  #{goodsCd} AND CUST_NO =  #{custNo})
+		           )
+	</select>
+	
+	<update id="updateRecentlyGoods"  parameterType="RecentlyGoods">
+		/* TsfRecentlyGoods.updateRecentlyGoods */
+		UPDATE TB_RECENTLY_GOODS
+		SET    UPD_DT = NOW()
+		WHERE  1=1
+		AND    GOODS_CD    = #{goodsCd}
+		AND    CUST_NO     = #{custNo}
+	</update>
+	
 </mapper>

src/main/webapp/WEB-INF/views/mob/app/SettingFormMob.html

@@ -107,18 +107,20 @@
 
 		// 앱으로 푸시 상태값 조회. 앱에서 settingsSwtichPush, settingsSwtichAdvertise 함수를 호출함.
 		if (_isApp === 'true') {
-			if (_osType === 'A') {
-				window.style24.isPushEnable(); // 정보성(푸시수신 API) settingsSwtichPush
-				window.style24.isAdEnable();   // 마케팅성(광고푸시 API) settingsSwtichAdvertise
-			} else if (_osType === 'I') {
-				// 아래와 같이 호출 시 settingsSwtichPush, settingsSwtichAdvertise 함수가 앱에서 호출됨
-				window.webkit.messageHandlers.isPushEnable.postMessage({"dummy":"dummy"});
-				window.webkit.messageHandlers.isAdEnable.postMessage({"dummy":"dummy"});
-			}
+			fnIsEnable();
 		}
 
 	});
 
+	var fnIsEnable = function () {
+		if (_osType === 'A') {
+			window.style24.isPushEnable(); // 정보성(푸시수신 API) settingsSwtichPush
+			window.style24.isAdEnable();   // 마케팅성(광고푸시 API) settingsSwtichAdvertise
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.isPushEnable.postMessage({'dummy':'dummy'}); // 정보성(푸시수신 API) settingsSwtichPush
+			window.webkit.messageHandlers.isAdEnable.postMessage({'dummy':'dummy'}); // 마케팅성(광고푸시 API) settingsSwtichAdvertise
+		}
+	}
 
 	// 앱에서 호출되는 함수(앱푸시)
 	var settingsSwtichPush = function(onOff) {
@@ -129,7 +131,8 @@
 		}
 
 		if (isLogin) {
-			// 데이터 상 앱푸시 여부(Y/N) 이랑 기기에 등록된 푸시수신 여부(ON/OFF)
+			// 데이터 상 앱푸시 여부(Y/N) 이랑
+			// 핑거푸시에 등록된 푸시수신 여부(ON/OFF)
 			if (appAgreeYn === 'Y' && onOff === 'OFF') {
 				fnAppPushAgreeUpdate('N');
 			} else if (appAgreeYn === 'N' && onOff === 'ON') {
@@ -147,7 +150,8 @@
 		}
 
 		if (isLogin) {
-			// 데이터 상 마케팅동의 여부(Y/N) 이랑 기기에 등록된 푸시수신 여부(ON/OFF)
+			// 데이터 상 마케팅동의 여부(Y/N) 이랑
+			// 핑거푸시에 등록된 푸시수신 여부(ON/OFF)
 			if (appMkAgreeYn === 'Y' && onOff === 'OFF') {
 				fnAppMkAgreeUpdate('N');
 			} else if (appMkAgreeYn === 'N' && onOff === 'ON') {
@@ -160,27 +164,21 @@
 		let appAgreeYn;
 		if (_isApp === 'true') {
 			if ($(this).is(":checked")) {
-				if (_osType === 'A') {
-					window.style24.pushEnable('ON');
-				} else if (_osType === 'I') {
-					window.webkit.messageHandlers.pushEnable.postMessage({"status":"ON"});
-				}
+				fnSetAppPush('ON');
 				appAgreeYn = 'Y';
 			} else {
-				if (_osType === 'A') {
-					window.style24.pushEnable('OFF');
-					window.style24.adEnable('OFF'); // 정보성 푸시가 상위 개념이라 마케팅도 같이 OFF가 되어여함
-				} else if(_osType === 'I') {
-					window.webkit.messageHandlers.pushEnable.postMessage({"status":"OFF"});
-				}
+				// 정보성 푸시가 상위 개념이라 마케팅도 같이 OFF가 되어여함
+				fnSetAppPush('OFF');
+				fnSetAdPush('OFF');
 				appAgreeYn = 'N';
 			}
 			if (isLogin) {
 				if (appAgreeYn === 'N') { // 마케팅도 N 처리
-					fnAppMkAgreeUpdate('N');
+					fnUpdatePush('N', 'N');
 					$('#btnMkSetting').prop('checked', false);
+				} else {
+					fnAppPushAgreeUpdate('Y');
 				}
-				fnAppPushAgreeUpdate(appAgreeYn);
 			}
 		}
 	});
@@ -189,18 +187,10 @@
 		let mkAgreeYn;
 		if (_isApp === 'true') {
 			if ($(this).is(":checked")) {
-				if (_osType === 'A') {
-					window.style24.adEnable('ON');
-				} else if (_osType === 'I') {
-					window.webkit.messageHandlers.adEnable.postMessage({"status":"ON"});
-				}
+				fnSetAdPush('ON');
 				mkAgreeYn = 'Y';
 			} else {
-				if (_osType === 'A') {
-					window.style24.adEnable('OFF');
-				} else if(_osType === 'I') {
-					window.webkit.messageHandlers.adEnable.postMessage({"status":"OFF"});
-				}
+				fnSetAdPush('OFF');
 				mkAgreeYn = 'N';
 			}
 			if (isLogin) {
@@ -209,6 +199,23 @@
 		}
 	});
 
+	// 정보성 푸시 On,Off 처리
+	var fnSetAppPush = function (appPushOnOff) {
+		if (_osType === 'A') {
+			window.style24.pushEnable(appPushOnOff);
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.pushEnable.postMessage({'status':appPushOnOff});
+		}
+	}
+
+	// 마케팅 푸시 On,Off 처리
+	var fnSetAdPush = function (mkPushOnOff) {
+		if (_osType === 'A') {
+			window.style24.adEnable(mkPushOnOff);
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.adEnable.postMessage({'status':mkPushOnOff});
+		}
+	}
 
 	// 앱푸시동의 데이터 처리
 	var fnAppPushAgreeUpdate = function (appAgreeYn) {
@@ -226,6 +233,14 @@
 		gagajf.ajaxJsonSubmit('/app/mkagree/update', jsonData);
 	}
 
+	var fnUpdatePush = function (appAgreeYn, mkAgreeYn) {
+		let params = {}
+		params.appAgreeYn = appAgreeYn;
+		params.mkAgreeYn = mkAgreeYn;
+		let jsonData = JSON.stringify(params);
+		gagajf.ajaxJsonSubmit('/app/push/update', jsonData);
+	}
+
 	// 안드로이드 앱
 	$('#chk-2').on('click', function () {
 		document.location.href='update://?link=https://play.google.com/store/apps/details?id=';

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -377,28 +377,25 @@
 
 	// 앱마케팅 푸시 수신동의
 	$(document).on('click','#btnMkPushAgree',function() {
-		if (_isApp === 'true') {
-			if ( _osType === 'A') {
-				window.style24.setPushSetting("ON", "ON");
-			} else if (_osType === 'I') {
-				window.webkit.messageHandlers.setPushSetting.postMessage({"pushStat":"ON", "advertisePushStat":"ON"});
-			}
-			$('#alramHide').hide();
-		}
+		$('#alramHide').hide();
+		fnSetPush('ON', 'ON');
 	});
 
 	// 앱마케팅푸시 수신거부
 	$(document).on('click','#btnMkPushClose',function() {
-		if (_isApp === 'true') {
-			if (_osType === 'A') {
-				window.style24.setPushSetting("ON", "OFF");
-			} else if (_osType === 'I') {
-				window.webkit.messageHandlers.setPushSetting.postMessage({"pushStat":"ON", "advertisePushStat":"OFF"});
-			}
-			$('#alramHide').hide();
-		}
+		$('#alramHide').hide();
+		fnSetPush('ON', 'OFF');
 	});
 
+	var fnSetPush = function(appPushOnOff, mkPushOnOff) {
+		if ( _osType === 'A') {
+			window.style24.pushEnable(appPushOnOff);
+			window.style24.adEnable(mkPushOnOff);
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.pushEnable.postMessage({'status': appPushOnOff});
+			window.webkit.messageHandlers.adEnable.postMessage({'status': mkPushOnOff});
+		}
+	}
 
 	if($(".popup_main_notice").hasClass("active")){
 		$("body").css({"overflow":"hidden"});

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

@@ -92,16 +92,10 @@
 	</main>
 <script th:inline="javascript">
 	const maskingCustId = [[${maskingCustId}]];
-	let appAgreeYn = 'Y';
 	$(document).ready(function(){
 		if (_isApp === 'true') {
 			if (gagajf.isNull(maskingCustId)) {
-				if (_osType === 'A') {
-					window.style24.setCustNo([[${custNo}]]);
-					//window.style24.isPushEnable();
-				} else if (_osType === 'I') {
-					//window.webkit.messageHandlers.isPushEnable.postMessage({"dummy":"dummy"});
-				}
+				fnIsPushEnable(); // APP, 마케팅 PUSH 여부에 따라 회원테이블 데이터 저장
 			}
 		}
 	});
@@ -109,29 +103,56 @@
 	// 앱에서 호출되는 함수(앱푸시)
 	var settingsSwtichPush = function(onOff) {
 		if (onOff === 'ON') {
-			appAgreeYn = 'Y';
-			window.style24.isAdEnable();
-			window.webkit.messageHandlers.isAdEnable.postMessage({"dummy":"dummy"});
-		} else if (onOff === 'OFF') {
-			appAgreeYn = 'N';
-			// window.style24.setCustNo([[${custNo}]],'OFF', 'OFF');
-			fnUpdatePush(appAgreeYn, 'N');
+			fnIsAdEnable();
+		} else if (onOff === 'OFF') { //정보성 PUSH가 OFF 이면 마케팅 PUSH도 OFF여야 한다.
+			fnSetPush('OFF', 'OFF');
+			fnUpdatePush('N', 'N');
 		}
 	}
 
 	// 앱에서 호출되는 함수(마케팅동의)
 	var settingsSwtichAdvertise = function (onOff) {
+		let appAgreeYn = 'Y';
 		let mkAgreeYn = 'N';
 		if (onOff === 'ON') {
 			mkAgreeYn = 'Y';
-		// window.style24.setCustNo([[${custNo}]],'ON', 'ON');
+			fnSetPush('ON', 'ON');
 		} else if (onOff === 'OFF'){
 			mkAgreeYn = 'N';
-		// window.style24.setCustNo([[${custNo}]],'ON', 'OFF');
+			fnSetPush('ON', 'OFF');
 		}
 		fnUpdatePush(appAgreeYn, mkAgreeYn);
 	}
-	
+
+	// 정보성 PUSH ON, OFF 여부 확인
+	// 호출시 앱에서 settingsSwtichPush 호출 해서 ON, OFF 값을 param 값으로 준다.
+	var fnIsPushEnable = function () {
+		if (_osType === 'A') {
+			window.style24.isPushEnable();
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.isPushEnable.postMessage({'dummy':'dummy'});
+		}
+	}
+
+	// 마케팅 PUSH ON, OFF 여부확인
+	// 호출시 앱에서 settingsSwtichAdvertise 호출 해서 ON, OFF 값을 param 값으로 준다.
+	var fnIsAdEnable = function () {
+		if (_osType === 'A') {
+			window.style24.isAdEnable();
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.isAdEnable.postMessage({'dummy':'dummy'});
+		}
+	}
+
+	// 핑거푸시 API 고객번호로 ON,OFF 여부 셋팅
+	var fnSetPush = function(appPushOnOff, mkPushOnOff) {
+		if (_osType === 'A') {
+			window.style24.setCustNo([[${custNo}]], appPushOnOff, mkPushOnOff);
+		} else if (_osType === 'I') {
+			window.webkit.messageHandlers.setCustNo.postMessage({'custNo':[[${custNo}]], 'pushStat':appPushOnOff, 'advertisePushStat':mkPushOnOff});
+		}
+	}
+
 	var fnUpdatePush = function (appAgreeYn, mkAgreeYn) {
 		let params = {}
 		params.appAgreeYn = appAgreeYn;

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

@@ -332,10 +332,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#bestGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/best/main/goods/list", document.bestGoodsForm,  gagaInfiniteScroll.jsonToHtml);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -351,10 +351,12 @@
 				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else{
-				if($("#bestGoodsForm input[name=pageNo]").val()==1){
-					$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+				if(totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+					if($("#bestGoodsForm input[name=pageNo]").val()==1){
+						$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+					}
+					$("#divLastPage").show();
 				}
-				$("#divLastPage").show();
 				gagaInfiniteScroll.draw('not');
 			}
 		}

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

@@ -70,10 +70,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -91,11 +91,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -312,7 +312,7 @@
 											<a href="javascript:void(0)">
 												<div class="form_field">
 													<div>
-														<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
+														<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}" th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
 													</div>
 												</div>
 											</a>
@@ -379,7 +379,9 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
+<!--		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />-->
+		<input type="hidden" name="keyword" value=""/>
+		<input type="hidden" name="benefitArr" value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
 	</form>
 
 
@@ -959,10 +961,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/category/goods/list", document.searchGoodsForm,  gagaInfiniteScroll.jsonToHtml , true);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -987,15 +989,18 @@
 				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else {
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('.list_content .list_defult').show();
-					//$('.list_content .count_wrap').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					//$('.list_content .count_wrap').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('.list_content .list_defult').show();
+						//$('.list_content .count_wrap').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						//$('.list_content .count_wrap').hide();
+					}
 				}
+
 				gagaInfiniteScroll.draw('not');
 			}
 		}
@@ -1016,11 +1021,16 @@
 			}else{
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-					tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
+						if($(this).val() == "40:신상"){
+							$(this).remove();
+						}
+					});
 				}
 			}
 			fnCategoryGoodsInfiniteScrollInit();

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

@@ -128,10 +128,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -148,11 +148,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -547,7 +547,7 @@
 										<a href="javascript:void(0)">
 											<div class="form_field">
 												<div>
-													<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
+													<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}"  th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
 												</div>
 											</div>
 										</a>
@@ -672,10 +672,10 @@
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function (pageNum) {
 		$("#searchGoodsForm input[name=pageNo]").val(pageNum + 1);
-		if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -700,15 +700,17 @@
 			gagaInfiniteScroll.draw(htm);
 			//fnImgOnoff();
 		}else{
-			if($("#searchGoodsForm input[name=pageNo]").val()==1){
-				// 필터 값으로 조회 데이터 없을때
-				$('#noDataFilter').show();
-				// $('.list_content .count_wrap').hide();
-				$('#endPage').hide();
-			}else{
-				// 마지막 페이지 일때
-				$('#endPage').show();
-				$('#noDataFilter').hide();
+			if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+				if($("#searchGoodsForm input[name=pageNo]").val()==1){
+					// 필터 값으로 조회 데이터 없을때
+					$('#noDataFilter').show();
+					// $('.list_content .count_wrap').hide();
+					$('#endPage').hide();
+				}else{
+					// 마지막 페이지 일때
+					$('#endPage').show();
+					$('#noDataFilter').hide();
+				}
 			}
 			gagaInfiniteScroll.draw('not');
 		}

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

@@ -322,6 +322,7 @@
 let cancelList 		= [[${cancelList}]];
 let oneData 		= [[${oneData}]];
 let paymentInfo 	= [[${paymentInfo}]];
+var isLogin = [[${isLogin}]];
 let addPayCost 		= 0;
 
 $(document).ready(function() {

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

@@ -110,6 +110,7 @@
 //AJAX 로드를 위한 변수 설정
 let custNo 		= [[${custNo}]];
 let totalCnt 	= [[${totalCnt}]];
+var isLogin = [[${isLogin}]];
 var jsonObj 	= {};
 var totalPage	= 0;
 var remainList	= 0;

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

@@ -557,6 +557,9 @@
 
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
+	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
+
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('배송조회');

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

@@ -178,6 +178,7 @@ var remainList		= 0;
 var jsonObj 		= {};
 var mypageMainYn	= [[${mypageMainYn}]];
 let customerInfo 	= [[${customerInfo}]];
+var isLogin			= [[${isLogin}]];
 var pageNo			= 0;
 
 // 초기설정

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

@@ -321,6 +321,7 @@
 let cancelList 		= [[${cancelList}]];
 let oneData 		= [[${oneData}]];
 let paymentInfo 	= [[${paymentInfo}]];
+var isLogin 		= [[${isLogin}]];
 let addPayCost 		= 0;
 
 $(document).ready(function() {

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

@@ -126,6 +126,7 @@ let ordNo			= [[${ordNo}]];
 let ordNm			= [[${ordNm}]];
 let ordPhnno		= [[${ordPhnno}]];
 var totalCnt		= [[${totalCnt}]];
+var isLogin			= [[${isLogin}]];
 var totalPage		= 0;
 var remainList		= 0;
 var pageNo			= 0;

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

@@ -356,6 +356,8 @@
 </main>
 
 <script th:inline="javascript">
+	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	$(document).ready(function() {
 		// 타이틀명
 		$('#htopTitle').text('배송조회');

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

@@ -114,6 +114,7 @@ let ordNo			= [[${ordNo}]];
 let ordNm			= [[${ordNm}]];
 let ordPhnno		= [[${ordPhnno}]];
 var totalCnt		= [[${totalCnt}]];
+var isLogin = [[${isLogin}]];
 var totalPage		= 0;
 var remainList		= 0;
 var jsonObj 		= {};

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -977,9 +977,9 @@
 						$('#quickMenuTodayGoods').html('');
 						
 						$('#quick01').find('span').html(result.length);
-						
+						let tag = '';
 						if (result.length > 0) {
-							let tag = '<div class="product_count"><span class="c_primary">' + result.length + '</span>개의 상품</div>\n';
+							tag += '<div class="product_count"><span class="c_primary">' + result.length + '</span>개의 상품</div>\n';
 							tag += '	<div class="itemsGrp">\n';
 							
 							$.each(result, function (idx, item) {
@@ -996,10 +996,14 @@
 							
 							tag += '	</div>\n';
 							
-							$('#quickMenuTodayGoods').html(tag);
 						} else {
-							$('#quickMenuTodayGoods').addClass('nodata');
+							tag += '<div class="no_item">';
+							tag += '	최근 본 상품이 없습니다.';
+							tag += '</div>';
+							
+							$('#quickMenuTodayGoods').attr('class','quick_body nodata');
 						}
+						$('#quickMenuTodayGoods').html(tag);
 					}
 			});
 // 	});

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

@@ -319,10 +319,10 @@
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#bestGoodsForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/best/main/goods/list", document.bestGoodsForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -338,10 +338,13 @@
 			var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#bestGoodsForm input[name=pageNo]").val()==1){
-				$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+			if(totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+				if($("#bestGoodsForm input[name=pageNo]").val()==1){
+					$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+				}
+				$("#divLastPage").show();
 			}
-			$("#divLastPage").show();
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -117,10 +117,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -137,11 +137,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -217,7 +217,7 @@
 										<th:block th:each="oneData, status : ${filterBenefitList}">
 											<li>
 												<label class="Benefits_btn">
-													<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
+													<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
 												</label>
 											</li>
 										</th:block>
@@ -294,7 +294,9 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
+<!--		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />-->
+		<input type="hidden" name="keyword" value=""/>
+		<input type="hidden" name="benefitArr" value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
 	</form>
 
 	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
@@ -620,11 +622,17 @@ console.log(allCateList);
 			}else{
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-					tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					// $("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
+						if($(this).val() == "40:신상"){
+							$(this).remove();
+						}
+					});
 				}
 			}
 			fnCategoryGoodsInfiniteScrollInit();
@@ -697,10 +705,10 @@ console.log(allCateList);
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/category/goods/list", document.searchGoodsForm,  gagaInfiniteScroll.jsonToHtml, true);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -726,17 +734,20 @@ console.log(allCateList);
 				gagaInfiniteScroll.draw(htm);
 				fnImgOnoff();
 			}else {
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('#noFilterData').show();
-					$('.list_content .count_wrap').hide();
-					$('#endPage').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					$('#noFilterData').hide();
-					//$('.list_content .count_wrap').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('#noFilterData').show();
+						$('.list_content .count_wrap').hide();
+						$('#endPage').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						$('#noFilterData').hide();
+						//$('.list_content .count_wrap').hide();
+					}
 				}
+
 				gagaInfiniteScroll.draw('not');
 			}
 		}

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

@@ -117,10 +117,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -137,11 +137,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -429,7 +429,7 @@
 												<th:block th:each="oneData, status : ${filterBenefitList}">
 													<li>
 														<label class="Benefits_btn">
-															<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
+															<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
 														</label>
 													</li>
 												</th:block>
@@ -592,13 +592,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum) {
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum + 1);
-			// gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, function(result) {
-			// 	console.log(result);
-			// }, true);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, gagaInfiniteScroll.jsonToHtml);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -624,15 +621,17 @@
 				gagaInfiniteScroll.draw(htm);
 				//fnImgOnoff();
 			}else{
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('#noFilterData').show();
-					$('.cont .count_wrap').hide();
-					$('#endPage').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					$('#noFilterData').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('#noFilterData').show();
+						$('.cont .count_wrap').hide();
+						$('#endPage').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						$('#noFilterData').hide();
+					}
 				}
 				gagaInfiniteScroll.draw('not');
 			}

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

@@ -214,6 +214,7 @@
 	let cancelList = [[${cancelList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
+	var isLogin = [[${isLogin}]];
 	let addPayCost = 0;
 
 	$(document).ready(function() {

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

@@ -204,6 +204,7 @@
 	let oneData = [[${oneData}]];
 	let kcpReceiptUrl = [[${kcpReceiptUrl}]];
 	let refundYn = [[${refundYn}]];
+	var isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

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

@@ -170,6 +170,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 

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

@@ -320,6 +320,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

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

@@ -192,6 +192,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 /*<![CDATA[*/

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

@@ -213,6 +213,7 @@
 	let cancelList = [[${cancelList}]];
 	let oneData = [[${oneData}]];
 	let paymentInfo = [[${paymentInfo}]];
+	var isLogin = [[${isLogin}]];
 	let addPayCost = 0;
 
 	$(document).ready(function() {

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

@@ -206,6 +206,7 @@
 	let oneData = [[${oneData}]];
 	let kcpReceiptUrl = [[${@environment.getProperty('pg.kcp.receipt.url')}]];
 	let refundYn = [[${refundYn}]];
+	var isLogin = [[${isLogin}]];
 
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정

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

@@ -173,6 +173,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 

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

@@ -237,6 +237,7 @@
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
+	var isLogin = [[${isLogin}]];
 	let ordNo = [[${ordNo}]];
 
 	$(document).ready(function() {

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

@@ -164,6 +164,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let ordNo = [[${ordNo}]];
+	var isLogin = [[${isLogin}]];
 	let totalCount = 0;
 	let pageSize = 0;
 /*<![CDATA[*/

src/main/webapp/biz/goods.js

@@ -483,6 +483,12 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 			$("#searchGoodsForm").append(tag);
 			// filterHtml += tag;
 		});
+		if(searchId=='benefit'){
+			if ($('#newGoods').is(":checked")) {
+				tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
+				$("#searchGoodsForm").append(tag);
+			}
+		}
 	}
 
 	if(appGb == 'Mob'){

src/main/webapp/biz/mypage.js

@@ -162,6 +162,10 @@ var fnCreateCart = function(param) {
 	let ordNo = $(param).attr('ordNo');
 	let ordDtlNo = $(param).attr('ordDtlNo');
 
+	if (isLogin == false) {
+		url = '/noMember/cart/add/info';
+	}
+
 	let data = {};
 	
 	data.ordNo = ordNo;

src/main/webapp/biz/search.js

@@ -205,11 +205,17 @@ var fnFilterOption = function (obj, stat){
 	}else{
 		if(stat=='on'){
 			$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-			tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+			// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+			tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 			$("#searchGoodsForm").append(tag);
 		}else{
 			$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			// $("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
+				if($(this).val() == "40:신상"){
+					$(this).remove();
+				}
+			});
 		}
 	}
 	fnCategoryGoodsInfiniteScrollInit();
@@ -292,6 +298,12 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 			tag = '<input type="hidden" name="'+searchId+'Arr" value="'+$(this).val()+'"/>\n';
 			$("#searchGoodsForm").append(tag);
 		});
+		if(searchId=='benefit'){
+			if ($('#newGoods').is(":checked")) {
+				tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
+				$("#searchGoodsForm").append(tag);
+			}
+		}
 	}
 
 	if(appGb == 'Mob'){