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

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>
@@ -283,6 +283,13 @@
 			<scope>system</scope>
 			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xalan.jar</systemPath>
 		</dependency>
+		
+		<!-- 이미지 회전 관련  -->
+		<dependency>
+			<groupId>com.drewnoakes</groupId>
+			<artifactId>metadata-extractor</artifactId>
+			<version>2.12.0</version>
+		</dependency>
 	</dependencies>
 	
 	<build>

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/service/TsfSocialService.java

@@ -65,6 +65,11 @@ public class TsfSocialService {
 	public Social getSocialForGoods(Social social){
 		Social socialInfo = socialDao.getSocialInfo(social);
 
+		if (TsfSession.isLogin()) {
+			Login login = TsfSession.getInfo();
+			social.setCustNo(login.getCustNo());
+		}
+
 		if(socialInfo != null){
 			social.setSocialSq(socialInfo.getSocialSq());
 			socialInfo.setSocialGoodsList(socialDao.getSocialGoodsList(social));

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,20 +176,20 @@ 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);
+//		log.info("///[getFilterList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = SearchService.getFilterList(paramMap);
-			log.info("///[getFilterList] jsonObj: {}", jsonObj.toJSONString());
+//			log.info("///[getFilterList] jsonObj: {}", jsonObj.toJSONString());
 
 			Gson gson = new Gson();
 			FilterResponse response = gson.fromJson(jsonObj.toJSONString(), FilterResponse.class);
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				result = response.getResponse();
-				log.info("///[getFilterList] result: {}", result);
+//				log.info("///[getFilterList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -209,20 +209,20 @@ 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()));
-		log.info("///[getGoodsList] paramMap: {}", paramMap);
+//		log.info("///[getGoodsList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = SearchService.getGoodsList(paramMap);
-			log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
+//			log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				Gson gson = new Gson();
 				result = gson.fromJson(jsonObj.toJSONString(), GoodsListResponse.class);
-				log.info("///[getGoodsList] result: {}", result);
+//				log.info("///[getGoodsList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -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/TsfCommonController.java

@@ -1,5 +1,8 @@
 package com.style24.front.biz.web;
 
+import java.awt.Image;
+import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.util.Collection;
 import java.util.List;
@@ -22,6 +25,12 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.ModelAndView;
 
+import com.drew.imaging.ImageMetadataReader;
+import com.drew.imaging.ImageProcessingException;
+import com.drew.metadata.Directory;
+import com.drew.metadata.Metadata;
+import com.drew.metadata.MetadataException;
+import com.drew.metadata.exif.ExifIFD0Directory;
 import com.gagaframework.web.util.GagaFileUploadUtil;
 import com.gagaframework.web.util.GagaFileUtil;
 import com.gagaframework.web.util.GagaUploadedFileInfo;
@@ -94,15 +103,25 @@ public class TsfCommonController extends TsfBaseController {
 	 * @return 업로드한 파일의 정보
 	 * @throws IOException
 	 * @author gagamel
+	 * @throws ImageProcessingException 
+	 * @throws MetadataException 
 	 * @since 2019. 12. 6
 	 */
 	@PostMapping("/file/upload")
 	@ResponseBody
-	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException {
+	public GagaUploadedFileInfo uploadFile(@RequestParam(value = "subDir") String subDir, @RequestParam(value = "policy", required = false) String policy, MultipartFile file) throws IOException, ImageProcessingException, MetadataException {
 		if (StringUtils.isEmpty(policy)) {
 			policy = "default";
 		}
-
+		int orientation = 1;
+		Metadata metadata = ImageMetadataReader.readMetadata(convert(file));
+		
+		Directory directory = metadata.getFirstDirectoryOfType(ExifIFD0Directory.class);
+		if(directory != null) {
+			orientation = directory.getInt(ExifIFD0Directory.TAG_ORIENTATION);
+		}
+		
+		log.info("orientation: {}", orientation);
 		String targetPath = GagaFileUtil.getConcatenationPath(env.getProperty("upload." + policy + ".target.path"), subDir);
 
 		GagaFileUploadUtil fuUtil = new GagaFileUploadUtil(targetPath, Long.parseLong(env.getProperty("upload." + policy + ".max.size")), env.getProperty("upload." + policy + ".allow.extension"), env.getProperty("upload." + policy + ".view"));
@@ -121,6 +140,17 @@ public class TsfCommonController extends TsfBaseController {
 //		}
 		return ufInfo;
 	}
+	
+	public File convert(MultipartFile multipartFile) throws IOException {
+		File file = new File(multipartFile.getOriginalFilename());
+		file.createNewFile();
+		FileOutputStream fos = new FileOutputStream(file);
+		fos.write(multipartFile.getBytes());
+		fos.close();
+		return file;
+	}
+
+	
 
 	/**
 	 * Delete a file

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

@@ -162,6 +162,9 @@ public class TsfDisplayController extends TsfBaseController {
 			if (contentsLoc.equals("SGNB001") || contentsLoc.equals("SGNB002") || contentsLoc.equals("STAB001") || contentsLoc.equals("SMM003") || contentsLoc.equals("SMM004") || contentsLoc.equals("SMM006")) {
 				contents.setMaxRow(1);
 			}
+			if(contentsLoc.equals("SMM011")){
+				contents.setMaxRow(5);
+			}
 
 			Cate4Srch cate4Srch = new Cate4Srch();
 			cate4Srch.setContentsLoc(contentsLoc);
@@ -204,6 +207,9 @@ public class TsfDisplayController extends TsfBaseController {
 			}
 
 			if (contentsLoc.equals("SMM009") || contentsLoc.equals("SMM012")) {
+				if(contentsLoc.equals("SMM009")){
+					contents.setMaxRow(5);
+				}
 				mainLayout.setMdPickList(displayService.getContentsForGoods(contents));
 			}
 
@@ -640,8 +646,8 @@ public class TsfDisplayController extends TsfBaseController {
 		Collection<Filter> filterList = new ArrayList<Filter>();
 
 		// 검색엔진 연동 여부
-		String syncYn = commonService.getSearchEngineSyncYn();
-		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
+//		String syncYn = commonService.getSearchEngineSyncYn();
+//		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
 			mav.setViewName(super.getDeviceViewName("display/CategoryGoodsListForm"));
 			// 카테고리 목록
 			mav.addObject("allCateList", displayService.getAllCategoryList("G032_101"));
@@ -650,20 +656,18 @@ 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.setCateGb("G032_101");
 			cate1.setCate1No(params.getCate1No());
 			mav.addObject("cateList", diquest.getCategoryList(cate1));
 
 			// 상품리스트 카테고리별 필터 목록
-			params.setKeyword("TBJ");
 			filterList = diquest.getFilterList(params);
-		}else{
-			// 카테고리 목록
-			mav.addObject("cateList", displayService.getAllCategoryList(params.getCateGb()));
-			mav.setViewName(super.getDeviceViewName("display/CategoryGoodsListForm2"));
-			filterList = displayService.getGoodsListCategoryFilterList(params);
-		}
+//		}else{
+//			// 카테고리 목록
+//			mav.addObject("cateList", displayService.getAllCategoryList(params.getCateGb()));
+//			mav.setViewName(super.getDeviceViewName("display/CategoryGoodsListForm2"));
+//			filterList = displayService.getGoodsListCategoryFilterList(params);
+//		}
 
 		// 필터 설정
 		mav.addObject("filterBrandList", displayService.getCategoryFilterList(filterList, "BRAND"));
@@ -680,68 +684,6 @@ public class TsfDisplayController extends TsfBaseController {
 
 		return mav;
 	}
-	@GetMapping("/category/goods/list/form2")
-	public ModelAndView categoryGoodsListForm2(SearchEngine params) {
-		ModelAndView mav = new ModelAndView(super.getDeviceViewName("display/CategoryGoodsListForm"));
-
-//		if (TsfSession.isLogin()) {
-//			cate4Srch.setCustNo(TsfSession.getInfo().getCustNo());
-//		}
-//		cate4Srch.setSiteCd(TscConstants.Site.STYLE24.value());
-//		if (StringUtils.isBlank(cate4Srch.getFormalGb())) {
-//			cate4Srch.setFormalGb("G009_10");
-//		}
-//		cate4Srch.setFrontGb(TsfSession.getFrontGb());
-//		cate4Srch.setCustGb(TsfSession.getCustGb());
-//		if (cate4Srch.getBrandGroupNo() == null) {
-//			cate4Srch.setBrandGroupNo(0);
-//		}
-//		if (cate4Srch.getCate4No() != null) {
-//			cate4Srch.setCateNo(cate4Srch.getCate4No());
-//		} else if (cate4Srch.getCate3No() != null) {
-//			cate4Srch.setCateNo(cate4Srch.getCate3No());
-//		} else if (cate4Srch.getCate2No() != null) {
-//			cate4Srch.setCateNo(cate4Srch.getCate2No());
-//		} else if (cate4Srch.getCate1No() != null) {
-//			cate4Srch.setCateNo(cate4Srch.getCate1No());
-//		}
-//
-//		log.info("categoryGoodsListForm cate4Srch::::{}", cate4Srch);
-//		mav.addObject("filterBrandList", displayService.getCategoryFilter(cate4Srch, "BRAND"));
-//		mav.addObject("filterSizeList", displayService.getCategoryFilter(cate4Srch, "SIZE"));
-//		mav.addObject("filterPriceList", displayService.getCategoryFilter(cate4Srch, "PRICE"));
-//		mav.addObject("filterAgeList", displayService.getCategoryFilter(cate4Srch, "AGE"));
-//		mav.addObject("filterSeasonList", displayService.getCategoryFilter(cate4Srch, "SEASON"));
-//		mav.addObject("filterColorList", displayService.getCategoryFilter(cate4Srch, "COLOR"));
-//		mav.addObject("filterBenefitList", displayService.getCategoryFilterBenefit(cate4Srch));
-//		mav.addObject("sortGb", "new");
-
-		// 브랜드그룹 정보 : 브랜드메인 링크에 설정된 기획전으로 들어올때 GNB 변경때문에 사용
-		if (params.getBrandGroupNo() != null && params.getBrandGroupNo() > 0) {
-			mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(params.getBrandGroupNo()));
-//		} else {
-//			mav.addObject("brandGroupInfo", null);
-		}
-
-		mav.addObject("cateInfo", params);
-
-		// 카테고리 목록
-		mav.addObject("cateList", displayService.getAllCategoryList(params.getCateGb()));
-
-		// 상품리스트 카테고리별 필터 목록
-		Collection<Filter> filterList = displayService.getGoodsListCategoryFilterList(params);
-
-		// 필터 설정
-		mav.addObject("filterBrandList", displayService.getCategoryFilterList(filterList, "BRAND"));
-		mav.addObject("filterSizeList", displayService.getCategoryFilterList(filterList, "SIZE"));
-		mav.addObject("filterPriceList", displayService.getCategoryFilterList(filterList, "PRICE"));
-		mav.addObject("filterAgeList", displayService.getCategoryFilterList(filterList, "AGE"));
-		mav.addObject("filterSeasonList", displayService.getCategoryFilterList(filterList, "SEASON"));
-		mav.addObject("filterColorList", displayService.getCategoryFilterList(filterList, "COLOR"));
-		mav.addObject("filterBenefitList", displayService.getCategoryFilterList(filterList, "BENEFIT"));
-
-		return mav;
-	}
 
 	/**
 	 * 카테고리 상품 리스트 조회
@@ -771,44 +713,11 @@ public class TsfDisplayController extends TsfBaseController {
 
 		Collection<SearchEngine> dataList = new ArrayList<SearchEngine>();
 
-		String syncYn = commonService.getSearchEngineSyncYn();
-		if (syncYn.equals("Y")) { // 검색엔진을 통한 상품리스트 조회
-			params.setKeyword("TBJ");
-			GoodsListResponse response = diquest.getGoodsList(params);
-			pageable.setTotalCount(response.getTotalCount());
-			dataList = response.getResponse();
-			result.set("paging", pageable);
-			result.set("dataList", dataList);
-		}else{
-			StringBuilder sql = new StringBuilder();
-			if (params.getPriceArr() != null && params.getPriceArr().length > 0) {
-				for (int i = 0; i < params.getPriceArr().length; i++) {
-					String[] price = params.getPriceArr()[i].split(",");
-					if (i > 0) {
-						sql.append(" OR ");
-					}
-					sql.append(" ( G.CURR_PRICE >= ").append(price[0]).append(" AND G.CURR_PRICE  <= ").append(price[1]).append(" )");
-				}
-				params.setPriceSql(sql.toString());
-			}
-
-			StringBuilder sql2 = new StringBuilder();
-			if (params.getDcRateArr() != null && params.getDcRateArr().length > 0) {
-				for (int i = 0; i < params.getDcRateArr().length; i++) {
-					String[] dcRate = params.getDcRateArr()[i].split(",");
-					if (i > 0) {
-						sql2.append(" OR ");
-					}
-					sql2.append(" ( ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) >= ").append(dcRate[0]).append(" AND ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <= ").append(dcRate[1]).append(" )");
-				}
-				params.setDcRateSql(sql2.toString());
-			}
-
-			pageable.setTotalCount(goodsService.getCategoryGoodsCount(params));
-			params.setPageable(pageable);
-			result.set("paging", pageable);
-			result.set("dataList", goodsService.getCategoryGoodsList(params));
-		}
+		GoodsListResponse response = diquest.getGoodsList(params);
+		pageable.setTotalCount(response.getTotalCount());
+		dataList = response.getResponse();
+		result.set("paging", pageable);
+		result.set("dataList", dataList);
 
 		log.info("pageable>>>>{}",pageable);
 		log.info("dataList>>>>{}",dataList);
@@ -816,69 +725,6 @@ public class TsfDisplayController extends TsfBaseController {
 		return result;
 	}
 
-	@PostMapping("/category/goods/list2")
-	@ResponseBody
-	public GagaMap getGoodsList2(@RequestBody SearchEngine params) {
-		GagaMap result = new GagaMap();
-		log.info("getGoodsList's parameter::: {}", params);
-		TscPageRequest pageable = new TscPageRequest((params.getPageNo() > 0 ? params.getPageNo() - 1 : 0), params.getPageSize(), params.getPageUnit());
-
-		if (TsfSession.isLogin()) {
-			params.setCustNo(TsfSession.getInfo().getCustNo());
-		}
-
-		params.setSiteCd(TscConstants.Site.STYLE24.value());
-		params.setFrontGb(TsfSession.getFrontGb());
-		params.setCustGb(TsfSession.getCustGb());
-
-		if (params.getBrandGroupNo() == null) {
-			params.setBrandGroupNo(0);
-		}
-
-//		if (params.getCate4No() != null && params.getCate4No() > 0) {
-//			params.setCateNo(params.getCate4No());
-//		} else if (params.getCate3No() != null && params.getCate3No() > 0) {
-//			params.setCateNo(params.getCate3No());
-//		} else if (params.getCate2No() != null && params.getCate2No() > 0) {
-//			params.setCateNo(params.getCate2No());
-//		} else if (params.getCate1No() != null && params.getCate1No() > 0) {
-//			params.setCateNo(params.getCate1No());
-//		}
-
-		StringBuilder sql = new StringBuilder();
-		if (params.getPriceArr() != null && params.getPriceArr().length > 0) {
-			for (int i = 0; i < params.getPriceArr().length; i++) {
-				String[] price = params.getPriceArr()[i].split(",");
-				if (i > 0) {
-					sql.append(" OR ");
-				}
-				sql.append(" ( G.CURR_PRICE >= ").append(price[0]).append(" AND G.CURR_PRICE  <= ").append(price[1]).append(" )");
-			}
-			params.setPriceSql(sql.toString());
-		}
-
-		StringBuilder sql2 = new StringBuilder();
-		if (params.getDcRateArr() != null && params.getDcRateArr().length > 0) {
-			for (int i = 0; i < params.getDcRateArr().length; i++) {
-				String[] dcRate = params.getDcRateArr()[i].split(",");
-				if (i > 0) {
-					sql2.append(" OR ");
-				}
-				sql2.append(" ( ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) >= ").append(dcRate[0]).append(" AND ((IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) - G.CURR_PRICE) / IF(G.LIST_PRICE = 0,0,G.LIST_PRICE) * 100) <= ").append(dcRate[1]).append(" )");
-			}
-			params.setDcRateSql(sql2.toString());
-		}
-
-		pageable.setTotalCount(goodsService.getCategoryGoodsCount(params));
-		params.setPageable(pageable);
-		result.set("paging", pageable);
-//		result.set("totalCnt", pageable.getTotalCount());
-//		result.set("endRow", pageable.getEndRow());
-		result.set("dataList", goodsService.getCategoryGoodsList(params));
-
-		return result;
-	}
-
 	/**
 	 * 전체 브랜드
 	 * @param

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" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
 	</form>
 
 
@@ -396,13 +398,13 @@
 				var priceHtml = '';
 				var minPrice;
 				var maxPrice;
-				for(let i=0; i<filterPriceList.length; i++){
-					if(i<1){
-						minPrice = 0;
-						maxPrice = filterPriceList[i].filterNm;
+				for(let i=0; i<filterPriceList.length-1; i++){
+					if(i==filterPriceList.length-2){
+						minPrice = filterPriceList[i].filterNm;
+						maxPrice = filterPriceList[i+1].filterNm;
 					}else{
-						minPrice = filterPriceList[i-1].filterNm;
-						maxPrice = filterPriceList[i].filterNm;
+						minPrice = filterPriceList[i].filterNm;
+						maxPrice = filterPriceList[i+1].filterNm;
 					}
 					priceHtml += '<li>\n';
 					priceHtml += '	<a href="javascript:void(0)">\n';
@@ -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/goods/GoodsDetailFormMob.html

@@ -2390,11 +2390,36 @@
 		params.ithrCd = "IN15_05";
 		fnGoodsLikeSearch(params);
 	
+		// selecter
+		$(function(){
+			var opt_select = new sCombo('.pd .op1 .opt_select .select_custom');
+		});
+		
 		var opt_selecter01_1 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_1');
+		$('.pd .pop_option_select .select_custom.item_opt1.item_opt1_1 .combo .list > li').click(function(e) {
+			$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
+			return false;
+		});
 		var opt_selecter01_2 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_2');
+		$('.pd .pop_option_select .select_custom.item_opt1.item_opt1_2 .combo .list > li').click(function(e) {
+			$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
+			return false;
+		});
 		var opt_selecter01_3 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_3');
+		$('.pd .pop_option_select .select_custom.item_opt1.item_opt1_3 .combo .list > li').click(function(e) {
+			$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
+			return false;
+		});
 		var opt_selecter01_4 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_4');
+		$('.pd .pop_option_select .select_custom.item_opt1.item_opt1_4 .combo .list > li').click(function(e) {
+			$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
+			return false;
+		});
 		var opt_selecter01_5 = new sCombo('.pop_option_select .select_custom.item_opt1.item_opt1_5');
+		$('.pd .pop_option_select .select_custom.item_opt1.item_opt1_5 .combo .list > li').click(function(e) {
+			$(this).parents('.form_field').next('.form_field').find('.select_custom').attr('disabled', false);
+			return false;
+		});
 
 		if (!gagajf.isNull([[${goodsInfo.socialSq}]])){
 			$('.timer_box').css('display', 'block');

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/MypageReviewCreateFormMob.html

@@ -641,6 +641,18 @@ var fnChooseFile = function(obj) {
 				});                                                                       
 				return false;                                                             
 			}       
+			
+			/* var limg = loadImage(file, function (img, data) {
+	            img.toBlob(function (blob) {
+	                var rotateFile = new File([blob], file.name, { type: fileType });
+	                var reader = new FileReader();
+	                reader.onload = function (e) { $(".pics").find("img").last().attr("src", e.target.result); }
+
+	                reader.readAsDataURL(rotateFile);
+					console.log(orientation);
+	            }, fileType)
+	        }, { orientation: 1}); */
+			
 			 gagajf.ajaxFileUpload('/common/file/upload?subDir=/review'
 						, file
 						, function(result) {
@@ -648,16 +660,6 @@ var fnChooseFile = function(obj) {
 							$(".pics").children().last().append("<input type='hidden' name='orgFileNmArr' id='orgFileNm"+(picLength+1)+"' value='"+result.oldFileName+"'>");
 							$(".pics").children().last().append("<input type='hidden' name='sysFileNmArr' id='sysFileNm"+(picLength+1)+"' value='"+result.newFileName+"'>");
 							
-							var limg = loadImage(file, function (img, data) {
-					            img.toBlob(function (blob) {
-					                var rotateFile = new File([blob], file.name, { type: fileType });
-					                var reader = new FileReader();
-					                reader.onload = function (e) { $(".pics").find("img").last().attr("src", e.target.result); }
-
-					                reader.readAsDataURL(rotateFile);
-
-					            }, fileType)
-					        }, { orientation: 6});
 						}
 				); 
 		}

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" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
 	</form>
 
 	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
@@ -321,6 +323,7 @@
 			}
 			//가격 슬라이드
 			//var custom_values = ['9,000원', '230,000원', '487,000원', '700,000원', '1,360,000원', '1,799,000원'];
+
 			let priceLen;
 			if(!gagajf.isNull(filterPriceList)){
 				priceLen = filterPriceList.length-1;
@@ -340,12 +343,19 @@
 					my_to = 1;
 				}
 
-				if(gagajf.isNull($("#filterForm input:hidden[name=priceFrom]").val())){
-					my_from = $("#filterForm input:hidden[name=priceFrom]").val();
+				// if(gagajf.isNull($("#filterForm input:hidden[name=priceFrom]").val())){
+				// 	my_from = $("#filterForm input:hidden[name=priceFrom]").val();
+				// }
+				// if(gagajf.isNull($("#filterForm input:hidden[name=priceTo]").val())){
+				// 	my_to = $("#filterForm input:hidden[name=priceTo]").val();
+				// }
+				if(!gagajf.isNull($("#filterForm").find("input:hidden[name=hPriceFrom]").val())){
+					my_from = $("#filterForm").find("input:hidden[name=hPriceFrom]").val().replaceAll(',','');
 				}
-				if(gagajf.isNull($("#filterForm input:hidden[name=priceTo]").val())){
-					my_to = $("#filterForm input:hidden[name=priceTo]").val();
+				if(!gagajf.isNull($("#filterForm").find("input:hidden[name=hPriceTo]").val())){
+					my_to = $("#filterForm").find("input:hidden[name=hPriceTo]").val().replaceAll(',','');
 				}
+
 				let minValue;
 				let maxValue;
 				if(filterPriceList.length > 1){
@@ -413,6 +423,35 @@
 			if ($('#sizeLi3').find('label').length == 0) $('#sizeLi3').hide();
 		});
 
+		// 가격필터 셋팅
+		var fnSetPriceFilter = function (){
+			if(!gagajf.isNull(filterPriceList)){
+				let min = 0;
+				let max = 5;
+				let priceFrom = '';
+				let priceTo = '';
+				if(!gagajf.isNull($("#filterForm").find("input:hidden[name=hPriceFrom]").val())){
+					priceFrom = $("#filterForm").find("input:hidden[name=hPriceFrom]").val().replace(',','');
+				}
+				if(!gagajf.isNull($("#filterForm").find("input:hidden[name=hPriceTo]").val())){
+					priceTo = $("#filterForm").find("input:hidden[name=hPriceTo]").val().replace(',','');
+				}
+				// console.log('priceFrom>>'+priceFrom);
+				// console.log('priceTo>>'+priceTo);
+				$.each(filterPriceList, function (priceIdx, priceItem){
+					custom_values[priceIdx] = priceItem.filterNm;
+					// console.log('custom_values[priceIdx]>>'+custom_values[priceIdx])
+					if(custom_values[priceIdx] == priceFrom){
+						min = priceIdx;
+					}
+					if(custom_values[priceIdx] == priceTo){
+						max = priceIdx;
+					}
+				});
+				fnFilterSliderMove(min,max);
+			}
+		}
+
 		// 검색엔진에서 가져온 카테고리 셋팅
 		var fnGetSearchEngineCategoryList = function (){
 			let allCateList = [[${allCateList}]];
@@ -620,11 +659,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();
@@ -634,8 +679,9 @@ console.log(allCateList);
 		// 필터 가격 확인
 		var fnCheckPrice = function (data,priceLen){
 			$("#priceSpan").remove();
-			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
+			// $("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+			// $("#searchGoodsForm input:hidden[name=priceTo]").remove();
+			$("#searchGoodsForm input:hidden[name=priceArr]").remove();
 			let min = data.from;
 			let max = data.to;
 			$("#price_input_from").val(custom_values[0]);
@@ -647,8 +693,9 @@ console.log(allCateList);
 		// 필터 할인율 확인
 		var fnCheckDcRate = function (data){
 			$("#dcrateSpan").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+			// $("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+			// $("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+			$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
 			let min = data.from;
 			let max = data.to;
 			$("#price_input_from").val(0);
@@ -662,10 +709,12 @@ console.log(allCateList);
 			//document.location.href = currUrl;
 			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
 			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
-			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
+			// $("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+			// $("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+			// $("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+			// $("#searchGoodsForm input:hidden[name=priceTo]").remove();
+			$("#searchGoodsForm input:hidden[name=priceArr]").remove();
+			$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
 			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
 			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
 			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
@@ -697,10 +746,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 +775,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/LookbookDetailFormWeb.html

@@ -209,12 +209,12 @@
 		tag += '		</div>\n';
 		tag += '		<div class="modal-body">\n';
 		tag += '			<div class="itemsGrp">\n';
-		tag += '				<div class="item_prod ';
+		tag += '				<div class="item_prod">\n';
+		tag += '					<div class="item_state';
 		if(obj9 == 'Y'){
-			tag += ' sold_out';
+			tag += ' soldout';
 		}
-		tag +='">\n';
-		tag += '					<div class="item_state">\n';
+		tag += '">\n';
 		tag += '						<div class="itemLink">\n';
 		tag += '							<div class="itemPic">\n';
 		tag += '								<img alt="BLACK-a" class=" vLHTC pd_img" src="'+goodsImgUrl+'/'+obj1+'?RS=260" onerror="this.src=\'/images/pc/thumb/bg_item_none.png\'">\n';

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');
 			}
@@ -751,10 +750,10 @@
 				let priceFrom = '';
 				let priceTo = '';
 				if(!gagajf.isNull($("#filterForm").find("input:hidden[name=hPriceFrom]").val())){
-					priceFrom = $("#filterForm").find("input:hidden[name=hPriceFrom]").val().replace(',','');
+					priceFrom = $("#filterForm").find("input:hidden[name=hPriceFrom]").val().replaceAll(',','');
 				}
 				if(!gagajf.isNull($("#filterForm").find("input:hidden[name=hPriceTo]").val())){
-					priceTo = $("#filterForm").find("input:hidden[name=hPriceTo]").val().replace(',','');
+					priceTo = $("#filterForm").find("input:hidden[name=hPriceTo]").val().replaceAll(',','');
 				}
 				// console.log('priceFrom>>'+priceFrom);
 				// console.log('priceTo>>'+priceTo);

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'){
@@ -546,18 +552,27 @@ var fnSetFilterHtml = function (gubun, staus, mobGb){
 	$('#filterForm input[name=dcRate]:checked').each(function(){
 		filterHtml += '<input type="hidden" name="dcRateArr" value="'+$(this).val()+'"/>\n';
 	});
+	let priceVal = '';
 	if(!gagajf.isNull($("#filterForm input[name=hPriceFrom]").val())){
-		filterHtml += '<input type="hidden" name="priceFrom" value="'+$("#filterForm input[name=hPriceFrom]").val()+'"/>\n';
+		// filterHtml += '<input type="hidden" name="priceFrom" value="'+$("#filterForm input[name=hPriceFrom]").val()+'"/>\n';
+		priceVal += $("#filterForm input[name=hPriceFrom]").val().removeComma();
 	}
 	if(!gagajf.isNull($("#filterForm input[name=hPriceTo]").val())){
-		filterHtml += '<input type="hidden" name="priceTo" value="'+$("#filterForm input[name=hPriceTo]").val()+'"/>\n';
+		// filterHtml += '<input type="hidden" name="priceTo" value="'+$("#filterForm input[name=hPriceTo]").val()+'"/>\n';
+		priceVal += ',' + $("#filterForm input[name=hPriceTo]").val().removeComma();
 	}
+	filterHtml += '<input type="hidden" name="priceArr" value="'+priceVal+'"/>\n';
+
+	let dcRateVal = '';
 	if(!gagajf.isNull($("#filterForm input[name=hDcRateFrom]").val())){
-		filterHtml += '<input type="hidden" name="dcRateFrom" value="'+$("#filterForm input[name=hDcRateFrom]").val()+'"/>\n';
+		// filterHtml += '<input type="hidden" name="dcRateFrom" value="'+$("#filterForm input[name=hDcRateFrom]").val()+'"/>\n';
+		dcRateVal += $("#filterForm input[name=hDcRateFrom]").val();
 	}
 	if(!gagajf.isNull($("#filterForm input[name=hDcRateTo]").val())){
-		filterHtml += '<input type="hidden" name="dcRateTo" value="'+$("#filterForm input[name=hDcRateTo]").val()+'"/>\n';
+		// filterHtml += '<input type="hidden" name="dcRateTo" value="'+$("#filterForm input[name=hDcRateTo]").val()+'"/>\n';
+		dcRateVal += ',' + $("#filterForm input[name=hDcRateTo]").val();
 	}
+	filterHtml += '<input type="hidden" name="dcRateArr" value="'+dcRateVal+'"/>\n';
 
 	// console.log('filterHtml>>'+filterHtml);
 	gagaInfiniteScroll.pageStatus.filterHtml = filterHtml;
@@ -636,10 +651,12 @@ var fnFilterSlider = function (gubun, min, max){
 	filterHtml = '';
 	filterStatHtml = '';
 	filterStatHtml = $("#filterData").html();
-	$("#searchGoodsForm").find('input[name=priceFrom]').remove();
-	$("#searchGoodsForm").find('input[name=priceTo]').remove();
-	$("#searchGoodsForm").find('input[name=dcRateFrom]').remove();
-	$("#searchGoodsForm").find('input[name=dcRateTo]').remove();
+	// $("#searchGoodsForm").find('input[name=priceFrom]').remove();
+	// $("#searchGoodsForm").find('input[name=priceTo]').remove();
+	// $("#searchGoodsForm").find('input[name=dcRateFrom]').remove();
+	// $("#searchGoodsForm").find('input[name=dcRateTo]').remove();
+	$("#searchGoodsForm").find('input[name=priceArr]').remove();
+	$("#searchGoodsForm").find('input[name=dcRateArr]').remove();
 	if(gubun=='price'){
 		oriMin = $("#price_input_from").val();
 		oriMax = $("#price_input_to").val();
@@ -673,14 +690,16 @@ var fnFilterSlider = function (gubun, min, max){
 
 	var tag2 = '';
 	if(gubun=='price'){
-		tag2 += '<input type="hidden" name="priceFrom" value="'+min.replace(",", "")+'"/>\n';
-		tag2 += '<input type="hidden" name="priceTo" value="'+max.replace(",", "")+'"/>\n';
+		// tag2 += '<input type="hidden" name="priceFrom" value="'+min.replace(",", "")+'"/>\n';
+		// tag2 += '<input type="hidden" name="priceTo" value="'+max.replace(",", "")+'"/>\n';
+		tag2 += '<input type="hidden" name="priceArr" value="'+min.replaceAll(",", "")+','+max.replaceAll(",", "")+'"/>\n';
 		$("#searchGoodsForm").append(tag2);
 		// filterHtml += tag2;
 		// fnCategoryGoodsInfiniteScrollInit();
 	}else{
-		tag2 += '<input type="hidden" name="dcRateFrom" value="'+min+'"/>\n';
-		tag2 += '<input type="hidden" name="dcRateTo" value="'+max+'"/>\n';
+		// tag2 += '<input type="hidden" name="dcRateFrom" value="'+min+'"/>\n';
+		// tag2 += '<input type="hidden" name="dcRateTo" value="'+max+'"/>\n';
+		tag2 += '<input type="hidden" name="dcRateArr" value="'+min+','+max+'"/>\n';
 		$("#searchGoodsForm").append(tag2);
 		// fnCategoryGoodsInfiniteScrollInit();
 		// filterHtml += tag2;
@@ -694,8 +713,9 @@ var fnDeleteFilterSlider = function (obj, gubun, minVal, maxVal){
 	filterStatHtml = '';
 	filterStatHtml = $("#filterData").html();
 	if(gubun=='price'){
-		$("#searchGoodsForm").find("input:hidden[name=priceFrom]").remove();
-		$("#searchGoodsForm").find("input:hidden[name=priceTo]").remove();
+		// $("#searchGoodsForm").find("input:hidden[name=priceFrom]").remove();
+		// $("#searchGoodsForm").find("input:hidden[name=priceTo]").remove();
+		$("#searchGoodsForm").find("input:hidden[name=priceArr]").remove();
 		var $range = $(".dp .js-range-slider01, .sch_result .js-range-slider01");
 		var $inputFrom = $("#price_input_from");
 		var $inputTo = $("#price_input_to");
@@ -711,11 +731,13 @@ var fnDeleteFilterSlider = function (obj, gubun, minVal, maxVal){
 			to: 5
 		});
 		$inputTo.prop("value",maxVal);
-		$("#filterForm input:hidden[name=priceFrom]").remove();
-		$("#filterForm input:hidden[name=priceTo]").remove();
+		$("#filterForm input:hidden[name=priceArr]").remove();
+		// $("#filterForm input:hidden[name=priceFrom]").remove();
+		// $("#filterForm input:hidden[name=priceTo]").remove();
 	}else{
-		$("#searchGoodsForm").find("input:hidden[name=dcRateFrom]").remove();
-		$("#searchGoodsForm").find("input:hidden[name=dcRateTo]").remove();
+		// $("#searchGoodsForm").find("input:hidden[name=dcRateFrom]").remove();
+		// $("#searchGoodsForm").find("input:hidden[name=dcRateTo]").remove();
+		$("#searchGoodsForm").find("input:hidden[name=dcRateArr]").remove();
 		var $range = $(".dp .js-range-slider02, .sch_result .js-range-slider02");
 		var $inputFrom = $("#dcrate_input_from");
 		var $inputTo = $("#dcrate_input_to");
@@ -731,8 +753,9 @@ var fnDeleteFilterSlider = function (obj, gubun, minVal, maxVal){
 			to: 10
 		});
 		$inputTo.prop("value",maxVal);
-		$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-		$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+		$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
+		// $("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+		// $("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
 	}
 	$(obj).closest("span").remove();
 	fnSetFilterHtml();

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'){