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

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

@@ -1,7 +1,11 @@
 package com.style24.front.biz.web;
 
 import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collection;
+import java.util.Date;
+import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -1365,11 +1369,11 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 배송지 수정 처리
 			commonService.updateDeliverAddr(order);
-			commonService.updateDeliverAddrDelvMemo(order);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 배송지 수정 처리
+			coreWmsService.updateWmsDeliveryChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -1400,7 +1404,11 @@ public class TsfMypageController extends TsfBaseController {
 		}
 
 		try {
+			// 배송메모 수정 처리
 			commonService.updateDeliverAddrDelvMemo(order);
+
+			// WMS 배송메모 수정 처리
+			coreWmsService.updateWmsDeliveryMemo(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -1426,10 +1434,20 @@ public class TsfMypageController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(TsfSession.getInfo().getCustNo());
+
+			// 회수지 정보 수정 처리
 			coreOrderChangeService.updateChgerAddr(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 회수지 정보 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerZipcode(orderChange.getChgerZipcode());
+			order.setChgerBaseAddr(orderChange.getChgerBaseAddr());
+			order.setChgerDtlAddr(orderChange.getChgerDtlAddr());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+
+			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -1455,10 +1473,16 @@ public class TsfMypageController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(TsfSession.getInfo().getCustNo());
+
+			// 반품메모 수정 처리
 			coreOrderChangeService.updateChgerRtnMemo(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS IF 반품메모 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+			coreWmsService.updateWmsRecallChangeMemo(order);
 		} catch (Exception e) {
 			throw new IllegalStateException(message.getMessage("FAIL_0002"));
 		}

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

@@ -389,11 +389,12 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		try {
 			order.setCustNo(0);
+
+			// 배송지 수정 처리
 			commonService.updateDeliverAddr(order);
-			commonService.updateDeliverAddrDelvMemo(order);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 배송지 수정 처리
+			coreWmsService.updateWmsDeliveryChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -420,7 +421,11 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setCustNo(0);
 
 		try {
+			// 배송메모 수정 처리
 			commonService.updateDeliverAddrDelvMemo(order);
+
+			// WMS 배송메모 수정 처리
+			coreWmsService.updateWmsDeliveryMemo(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -446,10 +451,20 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(0);
+
+			// 회수지 정보 수정 처리
 			coreOrderChangeService.updateChgerAddr(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS 회수지 정보 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerZipcode(orderChange.getChgerZipcode());
+			order.setChgerBaseAddr(orderChange.getChgerBaseAddr());
+			order.setChgerDtlAddr(orderChange.getChgerDtlAddr());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+
+			coreWmsService.updateWmsRecallChangeAddr(order);
 		} catch (Exception e) {
 			result.set("status", GagaResponseStatus.FAIL.getCode());
 			result.set("message", message.getMessage("FAIL_0002"));
@@ -475,10 +490,16 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		try {
 			orderChange.setUpdNo(0);
+
+			// 반품메모 수정 처리
 			coreOrderChangeService.updateChgerRtnMemo(orderChange);
 
-			// TODO
-			// WMS IF TABLE 내 정보 업데이트 처리 필요
+			// WMS IF 반품메모 수정 처리
+			Order order = new Order();
+			order.setOrdNo(orderChange.getOrdNo());
+			order.setChgerRtnMemo(orderChange.getChgerRtnMemo());
+			order.setOrdChgSq(orderChange.getOrdChgSq());
+			coreWmsService.updateWmsRecallChangeMemo(order);
 		} catch (Exception e) {
 			throw new IllegalStateException(message.getMessage("FAIL_0002"));
 		}

src/main/java/com/style24/front/support/security/TsfAuthenticationProvider.java

@@ -112,10 +112,11 @@ public class TsfAuthenticationProvider implements AuthenticationProvider {
 			throw new TsfSecedeAccountException(message.getMessage("LOGN_0007"));
 		}
 		// 활동회원 중 본인인증이 필요한 회원
-		if (TscConstants.CustStat.ACTIVE.value().equals(loginInfo.getCustStat()) && StringUtils.isBlank(loginInfo.getCi())) {
-			TsfSession.setAttribute("custNo", String.valueOf(loginInfo.getCustNo()));
-			throw new TsfNonCertificationAccountException(message.getMessage("LOGN_0009"));
-		}
+//		2021.10.26 김유중 : ci 없는 회원이 본인 인증 시 실패가 많아서 로그인 처리로 변경(정지혜과장,전석훈차장 협의)
+//		if (TscConstants.CustStat.ACTIVE.value().equals(loginInfo.getCustStat()) && StringUtils.isBlank(loginInfo.getCi())) {
+//			TsfSession.setAttribute("custNo", String.valueOf(loginInfo.getCustNo()));
+//			throw new TsfNonCertificationAccountException(message.getMessage("LOGN_0009"));
+//		}
 
 		// 권한 설정
 		List<SimpleGrantedAuthority> authorities = new ArrayList<>();

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

@@ -464,6 +464,7 @@
 	<select id="getOrderDeliveryAddrInfo" parameterType="Order" resultType="Order">
 		/* TsfOrder.getOrderDeliveryAddrInfo */
 		SELECT DA.DELV_ADDR_SQ
+		     , OD.ORD_NO
 		     , DA.RECIP_NM
 		     , DA.RECIP_PHNNO
 		     , DA.RECIP_TELNO

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

@@ -379,6 +379,7 @@
 	// 배송지 및 회수지 정보 설정
 	var delvAddrSet = function(delvObj) {
 		let url = '';
+		let ordNo			= oneData.ordNo;
 		let ordChgSq 		= oneData.ordChgSq;
 		let delvAddrSq 		= oneData.delvAddrSq;
 		let recipNm 		= delvObj.recipNm;
@@ -393,6 +394,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/mypage/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq 		= ordChgSq;
 			data.chgerNm 		= recipNm;
 			data.chgerPhnno 	= recipPhnno;
@@ -402,6 +404,7 @@
 			data.chgerRtnMemo 	= delvMemo;
 		} else {
 			url = '/mypage/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq 	= delvAddrSq;
 			data.recipNm 		= recipNm;
 			data.recipPhnno 	= recipPhnno;

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

@@ -302,6 +302,7 @@ $(document).ready(function() {
 // 회수지 정보 설정
 var delvAddrSet = function(delvObj) {
 	let ordChgSq 		= oneData.ordChgSq;
+	let ordNo			= oneData.ordNo;
 	let chgerNm 		= delvObj.recipNm;
 	let chgerPhnno 		= delvObj.recipPhnno;
 	let chgerZipcode 	= delvObj.recipZipcode;
@@ -311,6 +312,7 @@ var delvAddrSet = function(delvObj) {
 	let chgerAddr 		= chgerBaseAddr + ' ' + chgerDtlAddr;
 
 	let data = {};
+	data.ordNo			= ordNo;
 	data.ordChgSq 		= ordChgSq;
 	data.chgerNm 		= chgerNm;
 	data.chgerPhnno 	= chgerPhnno;

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

@@ -999,6 +999,7 @@
 		
 		let url = '/mypage/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq 	= delvAddrSq;
 		data.recipNm 		= recipNm;
 		data.recipPhnno 	= recipPhnno;

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

@@ -374,6 +374,7 @@
 	// 배송지 및 회수지 정보 설정
 	var delvAddrSet = function(delvObj) {
 		let url = '';
+		let ordNo			= oneData.ordNo;
 		let ordChgSq 		= oneData.ordChgSq;
 		let delvAddrSq 		= oneData.delvAddrSq;
 		let recipNm 		= delvObj.recipNm;
@@ -388,6 +389,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/noMember/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq 		= ordChgSq;
 			data.chgerNm 		= recipNm;
 			data.chgerPhnno 	= recipPhnno;
@@ -397,6 +399,7 @@
 			data.chgerRtnMemo 	= delvMemo;
 		} else {
 			url = '/noMember/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq 	= delvAddrSq;
 			data.recipNm 		= recipNm;
 			data.recipPhnno 	= recipPhnno;

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

@@ -291,6 +291,7 @@ $(document).ready(function() {
 // 회수지 정보 설정
 var delvAddrSet = function(delvObj) {
 	let ordChgSq 		= oneData.ordChgSq;
+	let ordNo			= oneData.ordNo;
 	let chgerNm 		= delvObj.recipNm;
 	let chgerPhnno 		= delvObj.recipPhnno;
 	let chgerZipcode 	= delvObj.recipZipcode;
@@ -300,6 +301,7 @@ var delvAddrSet = function(delvObj) {
 	let chgerAddr 		= chgerBaseAddr + ' ' + chgerDtlAddr;
 
 	let data = {};
+	data.ordNo			= ordNo;
 	data.ordChgSq 		= ordChgSq;
 	data.chgerNm 		= chgerNm;
 	data.chgerPhnno 	= chgerPhnno;

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

@@ -779,6 +779,7 @@
 		
 		let url = '/noMember/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq 	= delvAddrSq;
 		data.recipNm 		= recipNm;
 		data.recipPhnno 	= recipPhnno;

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

@@ -471,24 +471,29 @@ var delvAddrSet = function(delvObj) {
 	$("#recipAddr").text(delvObj.recipBaseAddr + '    ' + delvObj.recipDtlAddr);
 	$("#delvMemo").text(delvObj.delvMemo);
 	
+	// 2021.05.16 비회원구분처리
+	let url = '';
 	// 변수값 설정
-	var jsonObj = {
-		"delvAddrSq" 		: delvAddrSq
-		, "recipNm"			: delvObj.recipNm
-		, "recipPhnno"		: delvObj.recipPhnno
-		, "recipZipcode"	: delvObj.recipZipcode
-		, "recipBaseAddr"	: delvObj.recipBaseAddr
-		, "recipDtlAddr"	: delvObj.recipDtlAddr
-		, "delvMemo"		: delvObj.delvMemo
+	if (isLogin == true) {
+		url = '/mypage/change/delvery/addr';
+	} else {
+		url = '/noMember/change/delvery/addr';
 	}
 	
-	gagajf.ajaxJsonSubmit(
-		"/common/updateDeliverAddr"
-		, JSON.stringify(jsonObj)
-		, function (result) {
-			mcxDialog.alert("수정되었습니다.");
-		}
-	)
+	let data = {};
+	data.ordNo				= ordNo;
+	data.delvAddrSq 		= delvAddrSq;
+	data.recipNm 			= delvObj.recipNm;
+	data.recipPhnno 		= delvObj.recipPhnno;
+	data.recipZipcode 		= delvObj.recipZipcode;
+	data.recipBaseAddr 		= delvObj.recipBaseAddr;
+	data.recipDtlAddr 		= delvObj.recipDtlAddr;
+	data.delvMemo 			= delvObj.delvMemo;
+	
+	let jsonData = JSON.stringify(data);
+	
+	gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+	})
 }
 
 // 1.19 배송메모설정

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -18,6 +18,136 @@
  -->
 <body>
 <th:block layout:fragment="content">
+
+<!-- 이벤트를 위한 임시 script 및 style 추가 시작 (21.10.22 by junghwan)  -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/bxslider/4.2.12/jquery.bxslider.css" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43"></script>
+<script src="https://cdn.jsdelivr.net/bxslider/4.2.12/jquery.bxslider.min.js" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43"></script>
+
+<!-- 스타일데이 -->
+<<<<<<< HEAD
+<script src="https://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+=======
+<script src="http://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+>>>>>>> branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.front
+<script th:if="${planInfo.planSq}==38">
+	$(function(){
+		$('.gift_slider').bxSlider({
+			wrapperClass: 'sliderwrap2',
+			auto: true,
+			controls: false,
+			speed: 300,
+		});
+		
+        $('img[usemap]').rwdImageMaps();
+        $("#img").width("100%");
+	});
+	
+	$(document).ready(function() {
+    	$("#modal-gift").click(function() {
+	        $("#giftPop").css('display','block');
+	        $("body").addClass('ohidden');
+	    });
+	    $("#close-modal").click(function() {
+	   		$("#giftPop").css('display','none');
+	        $("body").removeClass('ohidden');
+	        location.reload();
+	  	});
+	});
+</script>
+<style type="text/css" th:if="${planInfo.planSq}==38">
+    .gift_box .gift_section{max-width:960px; width:auto; background-color:#fff; padding:4rem 3rem; margin:0 auto 4rem; overflow: hidden;}
+    .gift_box .gift_section h3{text-align: center; }
+    .gift_box .gift_section h3 img{max-width:280px; margin-bottom:30px;}
+    .gift_box p{font-size:16px; text-align:left; float:left; margin-top:20px;}
+
+    .sliderwrap2{position:relative; max-width:850px; margin-bottom:10rem; text-align: center;}
+    .sliderwrap2 .bx-pager{position:absolute; left:50%; bottom:-3rem; transform:translateX(-50%);}
+    .sliderwrap2 .bx-pager div{display:inline-block;padding:0 3px;}
+    .sliderwrap2 .bx-pager div a{display:block; width:13px; height:13px; border:2px solid #222; background:#fff; border-radius:100%; color:transparent; font-size:0px;}
+    .sliderwrap2 .bx-pager div .active{background:#222; width:22px; border-radius:12px;}
+    .btn_giftPopup{float:right; max-width:20rem; margin-top:-6rem;}
+    .btn_giftPopup{display: block; height:100%;}
+    
+
+    .tomato_section{background-color:#d3410e; text-align:center; padding:6rem 2rem;}
+    .blue1_section{background-color:#202a7a; text-align:center; padding:6rem 2rem;}
+    .blue2_section{background-color:#0a1252; text-align:center; padding:6rem 2rem;}
+    .img_max_960{max-width:960px; width:100%;}
+    .img_max_900{max-width:900px; width:100%;}
+    .img_max_800{max-width:800px; width:100%;}
+    .img_max_470px{max-width:470px; width:100%;}
+    .img_max_480px{max-width:480px; width:100%;}
+    .marginb5{margin-bottom:5rem;}
+    .marginb4{margin-bottom:4rem;}
+    .marginb3{margin-bottom:3rem;}
+    .marginb2{margin-bottom:2rem;}
+    .w55p{width:50%;}
+    .border_grey{border:1px solid #919191;}
+
+    .brandSection_Link{max-width:960px; overflow:hidden; margin:0 auto;}
+    .linkBox_left{float:left; max-width:48%; margin:0 4% 25px 0;}
+    .linkBox_right{float:right; max-width:48%; margin-bottom:25px;}
+    #giftPop {position: fixed; top: 0; right: 0;bottom: 0;left: 0;width: 100%;height: 100%;overflow: auto;z-index: 999;padding: 0;box-sizing: border-box;
+	background-color: #fff;text-align: center;}
+    .ohidden{overflow:hidden;}
+    .gift-modal-info{position:absolute; top:60px;}
+    @media (max-width:450px){
+        .btn_giftPopup{float:none; width:100%; margin:-6rem auto 0;}
+    }
+</style>
+<!-- 핸드크림 -->
+<script th:if="${planInfo.planSq}==43">
+	$(function(){
+	    $('.gift_slider2').bxSlider({
+	    wrapperClass: 'sliderwrap3',
+	    auto: true,
+	    speed: 300,
+	    controls: false,
+	    });
+	});
+	$(document).ready(function() {
+	  	$("#modal-gift2").click(function() {
+	     	$("#giftPop2").css('display','block');
+	     	$("body").addClass('ohidden');
+		});
+	 	$("#close-modal").click(function() {
+			$("#giftPop2").css('display','none');
+        	$("body").removeClass('ohidden');
+        	location.reload();
+		});
+	});	
+</script>
+<style type="text/css" th:if="${planInfo.planSq}==43">
+	.gift_promotion2{padding:6rem 0; background:url('http://image.istyle24.com/Statics/design/event/2021/1022Gift/1025_bg_gift.jpg') center no-repeat; background-size: cover; text-align:center;}
+    .gift_promotion2 img{max-width:1080px; width:100%;}
+    .gift_box2{margin:5rem auto; max-width:1080px;}
+    .gift_box2 .gift_section{width:100%; width:auto; padding:0 2.2rem;}
+    .gift_box2 p{font-size:18px;}
+    .gift_box2 .gift_section{position:relative;}
+    .gift_box2 .gift_section #modal-gift2{position:absolute; bottom:2rem; left:50%; transform: translateX(-50%); max-width:18rem;;}
+    .gift_box2 .gift_section #modal-gift2 img{width:100%;}
+    .sliderwrap3{position:relative; width:100%; margin-bottom:80px; text-align: center;}
+    .sliderwrap3 .bx-pager{position:absolute; left:50%; bottom:-2rem; transform:translateX(-50%);}
+    .sliderwrap3 .bx-pager div{display:inline-block;padding:0 3px;}
+    .sliderwrap3 .bx-pager div a{display:block; width:6px; height:6px; background:#fff; border-radius:100%; color:transparent; font-size:0px;}
+    .sliderwrap3 .bx-pager div .active{background:#fd4802;}
+    .gift_slider2 li{text-align:right;}
+
+    #giftPop2 {position: fixed; top: 0; right: 0;bottom: 0;left: 0;width: 100%;height: 100%;overflow: auto;z-index: 999;padding: 0;box-sizing: border-box;
+	background-color: #fff;text-align: center;}
+    .ohidden{overflow:hidden;}
+    .green_section{background-color:#638b57; text-align:center; padding:6rem 2rem;}
+
+    .brandSection_Link2{max-width:960px; overflow:hidden; margin:0 auto; border-bottom:1px solid #000;}
+    .linkBox_left2{float:left; width:50%; text-align:center; border-top:1px solid #000; border-left:1px solid #000; border-right:1px solid #000; box-sizing: border-box;}
+    .linkBox_left2 img{max-width:300px; width:100%;}
+    .linkBox_right2{float:right; width:50%; text-align:center;border-top:1px solid #000; border-right:1px solid #000; box-sizing: border-box;}
+    .linkBox_right2 img{max-width:300px; width:100%;}
+    .gift-modal-info{position:absolute; top:60px;}
+</style>
+<!-- 이벤트를 위한 임시 script 및 style 추가 종료 (21.10.22 by junghwan)  -->
+
 <main role="" id="" class="container dp">
 			<section class="content">
 				<div class="inner">

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

@@ -345,6 +345,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/mypage/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerNm = recipNm;
 			data.chgerPhnno = recipPhnno;
@@ -354,6 +355,7 @@
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/mypage/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.recipNm = recipNm;
 			data.recipPhnno = recipPhnno;
@@ -393,10 +395,12 @@
 
 		if (memoGb == 'chger') {
 			url = '/mypage/change/chger/rtn/memo';
+			data.ordNo = ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/mypage/change/delvery/memo';
+			data.ordNo = ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.delvMemo = delvMemo;
 		}

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

@@ -299,6 +299,7 @@
 		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr;
 
 		let data = {};
+		data.ordNo = ordNo;
 		data.ordChgSq = ordChgSq;
 		data.chgerNm = chgerNm;
 		data.chgerPhnno = chgerPhnno;

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

@@ -641,6 +641,7 @@
 		
 		let url = '/mypage/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq = delvAddrSq;
 		data.recipNm = recipNm;
 		data.recipPhnno = recipPhnno;
@@ -662,6 +663,7 @@
 
 		let data = {};
 		data.delvMemo = delvMemo;
+		data.ordNo = ordNo;
 		data.delvAddrSq = oneData.delvAddrSq;
 
 		let jsonData = JSON.stringify(data);

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

@@ -342,6 +342,7 @@
 
 		if (addrGb == 'chger') {
 			url = '/noMember/change/chger/addr';
+			data.ordNo			= ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerNm = recipNm;
 			data.chgerPhnno = recipPhnno;
@@ -351,6 +352,7 @@
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/noMember/change/delvery/addr';
+			data.ordNo			= ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.recipNm = recipNm;
 			data.recipPhnno = recipPhnno;
@@ -390,10 +392,12 @@
 
 		if (memoGb == 'chger') {
 			url = '/noMember/change/chger/rtn/memo';
+			data.ordNo = ordNo;
 			data.ordChgSq = ordChgSq;
 			data.chgerRtnMemo = delvMemo;
 		} else {
 			url = '/noMember/change/delvery/memo';
+			data.ordNo = ordNo;
 			data.delvAddrSq = delvAddrSq;
 			data.delvMemo = delvMemo;
 		}

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

@@ -296,6 +296,7 @@
 		let chgerAddr = chgerBaseAddr + ' ' + chgerDtlAddr;
 
 		let data = {};
+		data.ordNo = ordNo;
 		data.ordChgSq = ordChgSq;
 		data.chgerNm = chgerNm;
 		data.chgerPhnno = chgerPhnno;

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

@@ -486,6 +486,7 @@
 		
 		let url = '/noMember/change/delvery/addr';
 		let data = {};
+		data.ordNo			= ordNo;
 		data.delvAddrSq = delvAddrSq;
 		data.recipNm = recipNm;
 		data.recipPhnno = recipPhnno;
@@ -507,6 +508,7 @@
 
 		let data = {};
 		data.delvMemo = delvMemo;
+		data.ordNo = ordNo;
 		data.delvAddrSq = oneData.delvAddrSq;
 
 		let jsonData = JSON.stringify(data);

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

@@ -379,6 +379,7 @@ var delvAddrSet = function(delvObj) {
 	}
 	
 	let data = {};
+	data.ordNo				= ordNo;
 	data.delvAddrSq 		= delvAddrSq;
 	data.recipNm 			= delvObj.recipNm;
 	data.recipPhnno 		= delvObj.recipPhnno;
@@ -403,6 +404,7 @@ var delvMemoSet = function(delvMemoObj) {
 	// 변수값 설정
 	let data = {};
 	data.delvAddrSq = delvAddrSq;
+	data.ordNo = ordNo;
 	data.delvMemo = delvMemo;
 	
 	let jsonData = JSON.stringify(data);

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -18,6 +18,93 @@
 <body>
 <th:block layout:fragment="content">
 <script src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
+<!-- 이벤트를 위한 임시 script 및 style 추가 시작 (21.10.22 by junghwan)  -->
+<link rel="stylesheet" href="https://cdn.jsdelivr.net/bxslider/4.2.12/jquery.bxslider.css" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43">
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43"></script>
+<script src="https://cdn.jsdelivr.net/bxslider/4.2.12/jquery.bxslider.min.js" th:if="${planInfo.planSq}==38 or ${planInfo.planSq}==43"></script>
+
+<!-- 스타일데이 -->
+<<<<<<< HEAD
+<script src="https://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+=======
+<script src="http://mattstow.com/experiment/responsive-image-maps/jquery.rwdImageMaps.min.js" th:if="${planInfo.planSq}==38"></script>
+>>>>>>> branch 'stage_tsit' of https://style24@dev.azure.com/style24/style24/_git/style24.front
+<script th:if="${planInfo.planSq}==38">
+	openWindow = function() {
+	  	var popupX = (document.body.offsetWidth / 2) - (800 / 2);
+	  	var popupY= (window.screen.height / 2) - (700 / 2);
+	  	window.open('http://image.istyle24.com/Statics/design/event/2021/1022Gift/gift_popup.html', '', 'status=no, height=700, width=800, left='+ popupX + ', top='+ popupY + ', screenX='+ popupX + ', screenY= '+ popupY);
+	  	return;
+	}
+	$(function(){
+		$('.gift_slider').bxSlider({
+			wrapperClass: 'sliderwrap',
+			auto: true,
+			controls: false,
+			speed: 300,
+		});
+		
+        $('img[usemap]').rwdImageMaps();
+        $("#img").width("100%");
+	});
+</script>
+<style type="text/css" th:if="${planInfo.planSq}==38">
+    .coner_item01 img {max-width:100%;}
+    .gift_box{background-color:#0a1252;}
+    .gift_box .gift_section{max-width:1080px; width:auto; background-color:#fff; padding:70px 90px; margin:0 auto;}
+    .gift_box .gift_section h3{text-align: center;}
+    .gift_box .gift_section h3 img{max-width:349px;}
+    .gift_box p{font-size:18px;}
+
+    .sliderwrap{position:relative; max-width:850px; margin-bottom:140px; text-align: center;}
+    .sliderwrap .bx-pager{position:absolute; left:50%; bottom:-60px; transform:translateX(-50%);}
+    .sliderwrap .bx-pager div{display:inline-block;padding:0 3px;}
+    .sliderwrap .bx-pager div a{display:block; width:13px; height:13px; border:2px solid #222; background:#fff; border-radius:100%; color:transparent; font-size:0px;}
+    .sliderwrap .bx-pager div .active{background:#222; width:22px; border-radius:12px;}
+    .gift_slider li{text-align:right;}
+    .btn_giftPopup{float:right; margin-top:-115px;}
+    .btn_giftPopup img{max-width:270px;}
+</style>
+<!-- 핸드크림 -->
+<script th:if="${planInfo.planSq}==43">
+	openWindow2 = function() {
+	    var popupX = (document.body.offsetWidth / 2) - (800 / 2);
+	    var popupY= (window.screen.height / 2) - (700 / 2);
+	    window.open('http://image.istyle24.com/Statics/design/event/2021/1022STday/gift_popup.html', '', 'status=no, height=700, width=800, left='+ popupX + ', top='+ popupY + ', screenX='+ popupX + ', screenY= '+ popupY);
+	    return;
+    }
+	$(function(){
+        $('.gift_slider').bxSlider({
+        wrapperClass: 'sliderwrap3',
+        auto: true,
+        speed: 300,
+        nextText : '<i class="fas fa-chevron-right"></i>',
+        prevText : '<i class="fas fa-chevron-left"></i>',
+        });
+    });
+</script>
+<style type="text/css" th:if="${planInfo.planSq}==43">
+	.coner_item01 img {max-width:100%;}
+	.pm_gift{padding:80px 0; background:url('http://image.istyle24.com/Statics/design/event/2021/1022Gift/1025_bg_gift.jpg') center no-repeat; background-size: cover; text-align:center;}
+	.pm_gift img{max-width:1080px;}
+	.gift_box{margin:30px 0;}
+	.gift_box .gift_section{position:relative; max-width:860px; width:auto; margin:0 auto;}
+	.gift_box .gift_section #g-view{position:absolute; bottom:2rem; left:50%; transform: translateX(-50%);}
+	.gift_box p{font-size:18px;}
+	
+	.sliderwrap3{position:relative; max-width:860px; width:100%; margin-bottom:80px; text-align: center;}
+	.sliderwrap3 .bx-pager{position:absolute; left:50%; bottom:-40px; transform:translateX(-50%);}
+	.sliderwrap3 .bx-pager div{display:inline-block;padding:0 3px;}
+	.sliderwrap3 .bx-pager div a{display:block; width:6px; height:6px; background:#fff; border-radius:100%; color:transparent; font-size:0px;}
+	.sliderwrap3 .bx-pager div .active{background:#fd4802;}
+	.gift_slider li{text-align:right;}
+	.gift_slider li span{position:absolute; left:50%; bottom:30px; transform:translateX(-50%);}
+	.controls .bx-prev, .controls .bx-next{position:absolute;top:50%;transform:translateY(-50%);font-size:3em;color:#7d7e7d;}
+	.controls .bx-prev{right:calc(100% + 40px);}
+	.controls .bx-next{left:calc(100% + 40px);}
+</style>
+<!-- 이벤트를 위한 임시 script 및 style 추가 종료 (21.10.22 by junghwan)  -->
+
 <div id="container" class="container dp" th:with="frontUrl=${@environment.getProperty('domain.front')}, goodsView=${@environment.getProperty('upload.goods.view')}, planView=${@environment.getProperty('upload.image.view')}">
 		<div class="breadcrumb"> 
 			<ul>