Merge branch 'develop' into style

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

@@ -18,7 +18,7 @@ public interface TsfKollusDao {
 	 * @author gagamel
 	 * @since 2021. 4. 19
 	 */
-	void updateGoodsVideo(KollusResult result);
+	int updateGoodsVideo(KollusResult result);
 
 	/**
 	 * 카테노이드 Kollus 리뷰동영상 업로드 결과 처리
@@ -26,7 +26,7 @@ public interface TsfKollusDao {
 	 * @author gagamel
 	 * @since 2021. 4. 19
 	 */
-	void updateReviewVideo(KollusResult result);
+	int updateReviewVideo(KollusResult result);
 
 	/**
 	 * 카테노이드 Kollus 전시동영상 업로드 결과 처리
@@ -34,7 +34,7 @@ public interface TsfKollusDao {
 	 * @author gagamel
 	 * @since 2021. 4. 19
 	 */
-	void updateDisplayVideoPreview(KollusResult result);
+	int updateDisplayVideoPreview(KollusResult result);
 
 	/**
 	 * 카테노이드 Kollus 전시동영상 업로드 결과 처리
@@ -42,7 +42,7 @@ public interface TsfKollusDao {
 	 * @author gagamel
 	 * @since 2021. 4. 19
 	 */
-	void updateDisplayVideo(KollusResult result);
+	int updateDisplayVideo(KollusResult result);
 	
 	/**
 	 * 카테노이드 Kollus 상품 상세 동영상 업로드 결과 처리
@@ -50,7 +50,7 @@ public interface TsfKollusDao {
 	 * @author eskim
 	 * @since 2021. 7. 15
 	 */
-	void updateGoodsDescVideo(KollusResult result);
+	int updateGoodsDescVideo(KollusResult result);
 
 
 }

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

@@ -29,8 +29,8 @@ public class TsfKollusService {
 	 * @since 2021. 4. 19
 	 */
 	@Transactional("shopTxnManager")
-	public void updateGoodsVideoResult(KollusResult result) {
-		kollusDao.updateGoodsVideo(result);
+	public int updateGoodsVideoResult(KollusResult result) {
+		return kollusDao.updateGoodsVideo(result);
 	}
 
 	/**
@@ -40,8 +40,8 @@ public class TsfKollusService {
 	 * @since 2021. 4. 19
 	 */
 	@Transactional("shopTxnManager")
-	public void updateReviewVideoResult(KollusResult result) {
-		kollusDao.updateReviewVideo(result);
+	public int updateReviewVideoResult(KollusResult result) {
+		return kollusDao.updateReviewVideo(result);
 	}
 
 	/**
@@ -51,9 +51,12 @@ public class TsfKollusService {
 	 * @since 2021. 4. 19
 	 */
 	@Transactional("shopTxnManager")
-	public void updateDisplayVideoResult(KollusResult result) {
-		kollusDao.updateDisplayVideoPreview(result);
-		kollusDao.updateDisplayVideo(result);
+	public int updateDisplayVideoResult(KollusResult result) {
+		int rst = 0;
+		rst += kollusDao.updateDisplayVideoPreview(result);
+		rst += kollusDao.updateDisplayVideo(result);
+		
+		return rst;
 	}
 
 	/**
@@ -63,8 +66,8 @@ public class TsfKollusService {
 	 * @since 2021. 7. 15
 	 */
 	@Transactional("shopTxnManager")
-	public void updateGoodsDescVideoResult(KollusResult result) {
-		kollusDao.updateGoodsDescVideo(result);
+	public int updateGoodsDescVideoResult(KollusResult result) {
+		return kollusDao.updateGoodsDescVideo(result);
 	}
 
 }

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

@@ -6,14 +6,14 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 
+import com.gagaframework.web.rest.server.GagaResponse;
+import com.style24.core.support.message.TscMessageByLocale;
 import com.style24.front.biz.service.TsfKollusService;
 import com.style24.front.support.controller.TsfBaseController;
 import com.style24.persistence.domain.KollusResult;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.rest.server.GagaResponse;
-
 /**
  * Kollus Upload Controller (카테노이드 동영상 업로드)
  *
@@ -28,6 +28,9 @@ public class TsfKollusUploadController extends TsfBaseController {
 	@Autowired
 	private TsfKollusService kollusService;
 
+	@Autowired
+	private TscMessageByLocale message;
+
 	/**
 	 * 상품 동영상 업로드 결과
 	 * @author gagamel
@@ -38,11 +41,16 @@ public class TsfKollusUploadController extends TsfBaseController {
 	public GagaResponse updateGoodsVideoResult(KollusResult result) {
 		log.info("{}", result);
 
+		int rst = 0;
 		if (StringUtils.isNotBlank(result.getMedia_content_key()) && StringUtils.isNotBlank(result.getUpload_file_key())) {
-			kollusService.updateGoodsVideoResult(result);
+			rst = kollusService.updateGoodsVideoResult(result);
 		}
 
-		return super.ok();
+		if (rst > 0) {
+			return super.ok();
+		} else {
+			return super.error(message.getMessage("FAIL_0004"));
+		}
 	}
 
 	/**
@@ -55,11 +63,16 @@ public class TsfKollusUploadController extends TsfBaseController {
 	public GagaResponse updateReviewVideoResult(KollusResult result) {
 		log.info("{}", result);
 
+		int rst = 0;
 		if (StringUtils.isNotBlank(result.getMedia_content_key()) && StringUtils.isNotBlank(result.getUpload_file_key())) {
-			kollusService.updateReviewVideoResult(result);
+			rst = kollusService.updateReviewVideoResult(result);
 		}
 
-		return super.ok();
+		if (rst > 0) {
+			return super.ok();
+		} else {
+			return super.error(message.getMessage("FAIL_0004"));
+		}
 	}
 
 	/**
@@ -72,11 +85,16 @@ public class TsfKollusUploadController extends TsfBaseController {
 	public GagaResponse updateDisplayVideoResult(KollusResult result) {
 		log.info("{}", result);
 
+		int rst = 0;
 		if (StringUtils.isNotBlank(result.getMedia_content_key()) && StringUtils.isNotBlank(result.getUpload_file_key())) {
-			kollusService.updateDisplayVideoResult(result);
+			rst = kollusService.updateDisplayVideoResult(result);
 		}
 
-		return super.ok();
+		if (rst > 0) {
+			return super.ok();
+		} else {
+			return super.error(message.getMessage("FAIL_0004"));
+		}
 	}
 
 	/**
@@ -89,10 +107,15 @@ public class TsfKollusUploadController extends TsfBaseController {
 	public GagaResponse updateGoodsDescVideoResult(KollusResult result) {
 		log.info("{}", result);
 
+		int rst = 0;
 		if (StringUtils.isNotBlank(result.getMedia_content_key()) && StringUtils.isNotBlank(result.getUpload_file_key())) {
-			kollusService.updateGoodsDescVideoResult(result);
+			rst = kollusService.updateGoodsDescVideoResult(result);
 		}
 
-		return super.ok();
+		if (rst > 0) {
+			return super.ok();
+		} else {
+			return super.error(message.getMessage("FAIL_0004"));
+		}
 	}
 }

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

@@ -42,7 +42,15 @@
 			, NOW()
 		) ON DUPLICATE KEY
 		  UPDATE
-		  REG_DT = NOW()
+		    REG_DT = NOW()
+		  , TIME_TRANS = #{time_trans}
+		  , TIME_SWEET = #{time_sweet}
+		  , DELV_WHERE = #{delvWhere}
+		  , TELNO_OFFICE = #{telno_office}
+		  , TELNO_MAN = #{telno_man}
+		  , DETAILS = #{details}
+		  , MAN = #{man}
+		  , ESTMATE = #{estmate}
 	</insert>
 
 	<!-- 주문상세번호 조회 -->	

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

@@ -16,7 +16,7 @@
  -->
 <th:block th:fragment="scripts">
 <script th:src="@{'/ux/mo/js/common_m.js'}" src="/ux/mo/js/common_m.js"></script>
-<script th:src="@{'/ux/style24_link.js'}" src="/ux/style24_link.js"></script>
+<script th:src="@{'/ux/style24_link.js?20220221'}" src="/ux/style24_link.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.common.js'}" src="/ux/plugins/gaga/gaga.common.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.validation.js?20211111'}" src="/ux/plugins/gaga/gaga.validation.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/vg-controller-client.latest.min.js'}" src="/ux/plugins/vg-controller-client.latest.min.js"></script>

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

@@ -109,7 +109,7 @@
 									<div class=" item_prod" th:each="item, status : ${bestGoodsList}">
 										<div class="item_state">
 											<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, goodsNm=${item.goodsFullNm}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
-											<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM002');">
+											<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM002','','mo_ctgr_m60');">
 												<div class="shape" th:classappend="${status.count==1}?'ranker'"><span th:text="${status.index+1}"></span></div>
 												<div class=" itemPic">
 													<th:block th:each="option,idx:${item.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">

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

@@ -450,7 +450,7 @@
 														<div class="item_prod">
 															<div class="item_state">
 																<button type="button" class="itemLike" th:classappend="${goodsData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsData.goodsCd}, goodsNm=${goodsData.goodsFullNm}, ithrCd='', contentsLoc='SMM009', planDtlSq=''">관심상품 추가</button>
-																<a href="javascript:void(0)" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${goodsData.goodsCd}]], '', '', 'SMM009');">
+																<a href="javascript:void(0)" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${goodsData.goodsCd}]], '', '', 'SMM009','','mo_main_m74');">
 																	<div class="itemPic">
 																		<th:block th:each="option,idx:${goodsData.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">
 																			<iframe th:if="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${'https://www.youtube.com/embed/'+videoArr[1]+'?autoplay=1&mute=1'}"></iframe>

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

@@ -874,6 +874,7 @@
 				success 	: function(result) {
 					$("#adrsChangePop .modal-dialog .modal-content").html(result);
 					$("#adrsChangePop").modal("show");
+					return false;
 				}
 			});
 		}

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

@@ -654,6 +654,7 @@
 	//			success 	: function(result) {
 	//				$("#adrsChangePop .modal-dialog .modal-content").html(result);
 	//				$("#adrsChangePop").modal("show");
+	//				return false;
 	//			}
 	//		});
 	//	}

src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -407,6 +407,8 @@ $('#btn_adrsChange_pop').on("click", function(){
 			success 	: function(result) {
 				$("#adrsChangePop .modal-dialog .modal-content").html(result);
 				$("#adrsChangePop").modal("show");
+				return false;
+				
 			}
 		});
 	}

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -844,6 +844,7 @@ var deliveryAddrInfoSet = function(delvObj, temp) {
 						success 	: function(result) {
 							$("#adrsChangePop .modal-dialog .modal-content").html(result);
 							$("#adrsChangePop").modal("show");
+							return false;
 						}
 					});
 				}

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

@@ -16,7 +16,7 @@
  -->
 <th:block th:fragment="scripts">
 <script th:src="@{'/ux/pc/js/common-ui.js'}" src="/ux/pc/js/common-ui.js"></script>
-<script th:src="@{'/ux/style24_link.js'}" src="/ux/style24_link.js"></script>
+<script th:src="@{'/ux/style24_link.js?20220221'}" src="/ux/style24_link.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.common.js'}" src="/ux/plugins/gaga/gaga.common.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.validation.js?20211111'}" src="/ux/plugins/gaga/gaga.validation.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/vg-controller-client.latest.min.js'}" src="/ux/plugins/vg-controller-client.latest.min.js"></script>

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

@@ -148,7 +148,7 @@
 								<div class="item_prod" th:each="item, status : ${bestGoodsList}">
 									<div class="item_state" >
 										<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, goodsNm=${item.goodsFullNm}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
-										<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM002');">
+										<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM002','','pc_ctgr_m60');">
 											<div class="rank" th:classappend="${status.count==1}?'ranker'"><span th:text="${status.index+1}">1</span></div>
 											<div class="itemPic">
 												<th:block th:each="option,idx:${item.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">

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

@@ -485,7 +485,7 @@
 															<div class="item_prod">
 																<div class="item_state">
 																	<button type="button" class="itemLike" tabindex="0" th:classappend="${goodsData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsData.goodsCd}, goodsNm=${goodsData.goodsFullNm}, ithrCd='', contentsLoc='SMM009', planDtlSq=''">관심상품 추가</button>
-																	<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${goodsData.goodsCd}]], '', '', 'SMM009');">
+																	<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${goodsData.goodsCd}]], '', '', 'SMM009','','pc_main_m74');">
 																		<div class="itemPic">
 																			<th:block th:each="option,idx:${goodsData.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">
 																				<iframe th:if="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${'https://www.youtube.com/embed/'+videoArr[1]+'?autoplay=1&mute=1'}"></iframe>

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -305,6 +305,7 @@ $('#btn_adrsChange_pop').on("click", function(){
 			success 	: function(result) {
 				$("#adrsChangePop .modal-dialog .modal-content").html(result);
 				$("#adrsChangePop").modal("show");
+				return false;
 			}
 		});
 	}

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -727,6 +727,7 @@ var deliveryAddrInfoSet = function(delvObj, temp) {
 						success 	: function(result) {
 							$("#adrsChangePop .modal-dialog .modal-content").html(result);
 							$("#adrsChangePop").modal("show");
+							return false;
 						}
 					});
 				}

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb_20210716.html

@@ -618,6 +618,7 @@ var deliveryAddrInfoSet = function(delvObj, temp) {
 						success 	: function(result) {
 							$("#adrsChangePop .modal-dialog .modal-content").html(result);
 							$("#adrsChangePop").modal("show");
+							return false;
 						}
 					});
 				}

src/main/webapp/biz/mypage.js

@@ -307,6 +307,7 @@ var fnChangeDeliveryAddr = function(param) {
 			success 	: function(result) {
 				$("#adrsChangePop .modal-dialog .modal-content").html(result);
 				$("#adrsChangePop").modal("show");
+				return false;
 			}
 		});
 	}

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

@@ -2629,7 +2629,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_detail .area_desc .desc_wrap .benefit_box dl div dd .btn_popup {position:absolute; right:0; top:0; z-index:2;}
 
 	/* pd_deal_상품옵션선택 영역 */
-	.pd .option_box {margin-top:30px;overflow-y: auto;height: calc(100% - 35%);} /* 0126 */
+	.pd .option_box {margin-top:30px;overflow-y: auto;} /* 0126 */
 	.option_box > [class^="opt_"] {padding-top:40px;}
 	.option_box > [class^="opt_"]:first-of-type {padding-top:0;}
 	.option_box > [class^="opt_"] .opt_header {position: relative; margin-bottom:20px;}
@@ -2940,7 +2940,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap {width:500px; padding-left:60px; padding-top:30px;}
 	/* 0126 */
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right: auto; left: 50%; margin-left: 380px; bottom:80px; width:500px;height: calc(100% - 11%);}
-	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop .option_box {overflow-y: auto; height: calc(100% - 25%);}
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop .option_box {overflow-y: auto;}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:absolute; top:auto; bottom:0px; right:70px;height: calc(100% - 21%);}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom {position: absolute;top: auto;bottom: 0;right: auto;left: 50%;margin-left: 380px;}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom .option_box {overflow-y: auto; }

src/main/webapp/ux/style24_link.js

@@ -474,8 +474,10 @@ var cfnLoginNaver = function (requestGb, chkRememberMe) {
 	let popupX = (window.screen.width / 2) - (popupWidth / 2);
 	let popupY = (window.screen.height / 3) - (popupHeight / 3);
 	var frontGb = cfnCheckMobileDevice();
-	if ('P' === frontGb) {
+	if ('P' == frontGb) {
 		window.open(actionUrl, 'naverLogin', 'top=' + popupY + ',left=' + popupX + ',height=' + popupHeight + ',width=' + popupWidth + ', fullscreen=no,menubar=no,status=no,toolbar=no,titlebar=yes,location=no,scrollbars=yes', '');
+	} else if ('A' == frontGb) {
+		document.location.href = 'public://?link=' + actionUrl + '&requestGb=' + requestGb;
 	} else {
 		document.location.href = actionUrl + '&requestGb=' + requestGb;
 	}
@@ -1894,14 +1896,12 @@ function noneImg(noneSrc) {
  */
 function cfnCheckMobileDevice() {
     var mobileKeyWords = new Array('Android', 'iPhone', 'iPod', 'BlackBerry', 'Windows CE', 'SAMSUNG', 'LG', 'MOT', 'SonyEricsson');
-    var device = "";
-    for (var info in mobileKeyWords) {
-        if (navigator.userAgent.match(mobileKeyWords[info]) != null) {
-        	device = "M";
-        	return device;
-        } else{
-        	device = "P";
-        	return device;
-        }
+    var device = "P"; 
+    for (var info in mobileKeyWords) {  
+        if (navigator.userAgent.match(mobileKeyWords[info])) {
+        	device = "M"; 
+			return device;
+        }  
     }
-}
+	return device; 
+}