Merge branch 'develop' into bin2107

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

@@ -460,8 +460,9 @@ public class TsfOrderService {
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
-				// TODO
-				// 배송비 pay_sq update 처리
+				// TB_DELIVERY_FEE PAY_SQ 등록
+				result.setUpdNo(payment.getUpdNo());
+				coreOrderDao.updateDeliveryFeePaySq(result);
 			}
 		} catch(Exception e) {
 			e.printStackTrace();
@@ -501,8 +502,9 @@ public class TsfOrderService {
 
 				throw new IllegalArgumentException("결제 정보 저장 실패. 새로고침 후 다시 시작해주세요.");
 			} else {
-				// TODO
-				// 배송비 pay_sq update 처리
+				// TB_DELIVERY_FEE PAY_SQ 등록
+				result.setUpdNo(payment.getUpdNo());
+				coreOrderDao.updateDeliveryFeePaySq(result);
 			}
 		} catch(Exception e) {
 			e.printStackTrace();

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

@@ -169,6 +169,7 @@ public class TsfReviewService {
 	 * @author sowon
 	 * @since 2021. 3. 25
 	 */
+	@Transactional("shopTxnManager")
 	public void saveMypageReview(Review review) {
 		review.setDispYn("Y");
 		review.setDelYn("N");
@@ -306,6 +307,7 @@ public class TsfReviewService {
 	 * @author sowon
 	 * @since 2021. 3. 25
 	 */
+	@Transactional("shopTxnManager")
 	public void updateMypageReview(Review review) {
 		review.setRegNo(TsfSession.getInfo().getCustNo());
 		review.setUpdNo(TsfSession.getInfo().getCustNo());		

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

@@ -165,20 +165,20 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 1.3. 선물하기주문 체크 후 비로그인 상태면 장바구니로 강제 이동
 		if (coreOrderService.getGiftOrderCheck(order) > 0) {
-			// 비 로그인 상태면 장바구니로 강제 이동
+			// 비 로그인 상태면 장바구니 강제 이동
 			if (TsfSession.isLogin() == false) {
 				mav.setViewName("redirect:/cart/list/form");					// 장바구니화면이동
 				return mav;
 			}
 			
-			// 선물받기여부
-			giftPackYn = "Y";
-			
-			// 선물하기일때 PC 로 접근하면 
+			// 선물하기일때 PC 로 접근하면 장바구니 강제 이동
 			if ("P".equals(TsfSession.getFrontGb())) {
 				mav.setViewName("redirect:/cart/list/form");					// 장바구니화면이동
 				return mav;
 			}
+			
+			// 선물받기여부
+			giftPackYn = "Y";
 		}
 
 		// 1.4 로그인체크 후 custNo 설정
@@ -195,8 +195,8 @@ public class TsfOrderController extends TsfBaseController {
 			order.setCellPhnno("");
 			order.setEmail("");
 			
-			order.setDelvAddrNm("없음");
-			order.setRecipNm("배송지명없음");
+			order.setDelvAddrNm("배송지명없음");
+			order.setRecipNm("없음");
 			order.setRecipZipcode("00000");
 			order.setRecipBaseAddr("기본주소없음");
 			order.setRecipDtlAddr("상제주소없음");
@@ -208,7 +208,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 2.1 총알배송여부가 null 이면 Y로 설정
 		if (order.getShotDelvUseYn() == null || "".equals(order.getShotDelvUseYn())) {
 			order.setShotDelvUseYn("Y");
-		} 
+		}
 		
 		// 2.2 선물받기 Y 이면 총알배송 불가
 		if ("Y".equals(giftPackYn)) {
@@ -231,7 +231,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 3.3 배송정보조회(장바구니상품목록)
 		GagaMap delvOrderMap = coreOrderService.getCartDelvGoodsCntList(tmtbGoodsApplyList, order);
 		
-		// 3.4 할인정보조회(상품금액, 선포인트, 다다익선할인금액)
+		// 3.4 할인,금액 정보조회(상품금액, 선포인트, 다다익선할인금액)
 		GagaMap goodsDcAmtMap = coreOrderService.getGoodsDcAmt(tmtbGoodsApplyList);
 
 		// 4. 화면설정
@@ -467,7 +467,7 @@ public class TsfOrderController extends TsfBaseController {
 	}
 	
 	/**
-	 * 선물받기여부정보로드
+	 * 선물받는사람정보화면
 	 *
 	 * @param
 	 * @return
@@ -517,6 +517,8 @@ public class TsfOrderController extends TsfBaseController {
 		GagaMap goodsDcAmtMap = coreOrderService.getGoodsDcAmt(tmtbGoodsApplyList);
 				
 		ModelAndView mav = new ModelAndView();
+		
+		// 4.1 상품정보, 배송정보
 		mav.addObject("goodsTotCnt" 		, delvOrderMap.get("goodsTotCnt"));			// 총상품건수
 		mav.addObject("delvAllCartList" 	, delvOrderMap.get("delvAllCartList"));		// 전체배송목록
 		mav.addObject("delvFeeCdCnt" 		, delvOrderMap.get("delvFeeCdCnt"));		// 자사총알배송상품건수
@@ -761,7 +763,8 @@ public class TsfOrderController extends TsfBaseController {
 
 		// 4. 2021.05.10 장바구니정보 주문번호 업데이트
 		orderService.insertCartHstOrdNo(order);
-
+		
+		// 5. PG 결제정보설정
 		Payment payment = orderService.setPgDataInfo(order);
 
 		// 2021.05.20 카카오페이, 네이버페이 결제 필요 정보 세션 등록
@@ -794,8 +797,7 @@ public class TsfOrderController extends TsfBaseController {
 	@RequestMapping(value = "/pay/result/response")
 	public ModelAndView payResultResponse(Payment param, HttpServletRequest request, HttpServletResponse response) {
 		
-		// 2021.06.02 태팔요청삭제
-		log.info("tno ::: {}", request.getParameter("tran_cd"));
+		// 2021.06.02 태팔요청
 		if(StringUtils.isBlank(param.getPgTid()) && StringUtils.isBlank(request.getParameter("tran_cd"))) {
 			ModelAndView mav = new ModelAndView();
 			mav.setViewName("redirect:/order/payment/fail");
@@ -842,7 +844,7 @@ public class TsfOrderController extends TsfBaseController {
 			orderService.deleteCartOrdNo(order);
 		}
 		
-		// TODO 5. 2021.05.10 보증보험 API 연동
+		// 5. 2021.05.10 보증보험 API 연동
 		orderService.updateInsurance(order);
 		
 		// 2021.03.16 주문완료화면이동처리
@@ -864,9 +866,9 @@ public class TsfOrderController extends TsfBaseController {
 	public ModelAndView kakaoPayResultResponse(Payment payment) {
 		ModelAndView mav = new ModelAndView();
 
-		Integer custNo = TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0;
-		String ordNo = TsfSession.getAttribute("ordNo");
-		String tid = TsfSession.getAttribute("tid");
+		Integer custNo 	= TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0;
+		String ordNo 	= TsfSession.getAttribute("ordNo");
+		String tid 		= TsfSession.getAttribute("tid");
 
 		if (StringUtils.isBlank(ordNo) || StringUtils.isBlank(tid)) {
 			throw new IllegalArgumentException("결제가 실패하였습니다.");
@@ -881,7 +883,6 @@ public class TsfOrderController extends TsfBaseController {
 
 		// 2. 결재정보등록(TB_PAYMENT)
 		Payment result = orderService.kakaoPayResult(payment);
-		// Payment result = coreKakaoPayService.approveKakaoPayment(payment);
 
 		// 3. 주문정보 업데이트
 		Order order = new Order();
@@ -944,7 +945,6 @@ public class TsfOrderController extends TsfBaseController {
 
 		// 2. 결재정보등록(TB_PAYMENT)
 		Payment result = orderService.naverPayResult(param);
-		// Payment result = coreNaverPayService.approveNaverPayment(param);
 
 		// 3. 주문정보 업데이트
 		Order order = new Order();
@@ -1111,8 +1111,8 @@ public class TsfOrderController extends TsfBaseController {
 		
 		ModelAndView mav = new ModelAndView();
 		
-		// 0. 주문번호 체크
-		if (order.getOrdNo() == null) {
+		// 1. 주문번호 체크
+		if (order.getOrdNo() == null || order.getOrdNo() < 1) {
 			mav.setViewName("redirect:/");
 			return mav;
 		}
@@ -1120,7 +1120,15 @@ public class TsfOrderController extends TsfBaseController {
 		// 2. 결제완료정보조회
 		GagaMap resultMap = coreOrderService.getOrderGiftCompleteInfo(order);
 		
-		// 4. 화면전송변수설정
+		int orderListCnt = (int) resultMap.get("orderListCnt");
+		
+		// 2021.06.04 선물하기 상품이 없을때 홈으로 이동
+		if (orderListCnt < 1) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+		
+		// 3. 화면전송변수설정
 		mav.addObject("orderInfo"			, resultMap.get("orderInfo"));			// 주문기본정보
 		mav.addObject("orderList"			, resultMap.get("orderList"));			// 주문목록정보
 		mav.addObject("orderListCnt"		, resultMap.get("orderListCnt"));		// 주문목록갯수
@@ -1428,22 +1436,8 @@ public class TsfOrderController extends TsfBaseController {
 		order.setPayAmt(order.getAddPayCost());
 		order.setOrdNm(order.getChgerNm());
 		order.setOrdPhnno(order.getChgerPhnno());
-
-		// 필수 데이터
-		// pgGb = 결제타입, payMeans = 결제수단, ordNo = 주문번호, goodsNm = 상품명, payAmt = 실결제금액, ordNm = 주문자명, ordPhnno = 휴대폰번호, custNo = 고객번호
-		// 선택 데이터
-		// ordEmail = 주문자메일, ordTelno = 전화번호
-		
-		/* 
-		=== 카카오페이 & 네이버페이 파라메터 ===
-		ordNo = 주문번호
-		custNo = 고객번호
-		goodsNm = 상품명
-		ordGoodsQty = 주문상품수량
-		payAmt = 결제금액
-		======================
-		*/
-
+		
+		// 2. 결제정보설정
 		Payment payment = orderService.setPgDataInfo(order);
 		payment.setOrdChgSq(order.getOrdChgSq());
 		

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

@@ -1300,7 +1300,7 @@
 		          ,  0 AS ITEM_QTY
 		</otherwise>
 		</choose>
-		          , GROUP_CONCAT(CONCAT(FG.GOODS_NM,':',FG.ITEM_QTY)) AS FREE_GOODS
+		          , GROUP_CONCAT(CONCAT(FG.GOODS_NM,'@:',FG.ITEM_QTY)) AS FREE_GOODS
 		          -- , RANK() OVER (PARTITION BY F.FREEGIFT_SQ , F.FREEGIFT_SECTION_SQ ORDER BY  FG.FREEGIFT_VAL_SQ ) AS RNUM
 		    FROM TAB_FREEGOODS FG
 		     WHERE FG.ROWNUM = 1
@@ -1885,9 +1885,9 @@
 		            ELSE (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') END AS SYS_IMG_NM
 		FROM   TB_GOODS G
 		INNER  JOIN (SELECT G.GOODS_CD
-		                  , MIN(VS.OPT_CD) AS OPT_CD
-		                  , MIN(CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END) AS BRAND_NM
-		             FROM   TB_GOODS G USE INDEX(IX_GOODS_11)
+		                  , (SELECT OPT_CD FROM vw_stock X WHERE X.GOODS_CD = G.GOODS_CD AND X.SOLDOUT_YN = 'N' AND X.CURR_STOCK_QTY > 0 ORDER BY OPT_CD LIMIT 1) AS OPT_CD
+		                  , CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END AS BRAND_NM
+		             FROM   TB_GOODS G
 		             INNER  JOIN TB_BRAND BR
 		             ON     G.BRAND_CD = BR.BRAND_CD
 		             INNER  JOIN TB_BRAND_GROUP D
@@ -1895,16 +1895,12 @@
 		             AND    D.USE_YN = 'Y'
 		             INNER  JOIN TB_SUPPLY_COMPANY CM
 		             ON     G.SUPPLY_COMP_CD = CM.SUPPLY_COMP_CD
-		             INNER  JOIN VW_STOCK VS
-		             ON     G.GOODS_CD = VS.GOODS_CD
 		             WHERE  1=1
 		             AND    G.GOODS_STAT = 'G008_90'
 		             AND    NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT
 		             AND    G.GOODS_TYPE = 'G056_N'
 		             AND    G.SELF_MALL_YN = 'Y'
 		             AND    G.MIN_ORD_QTY = 1
-		             AND    VS.SOLDOUT_YN = 'N'
-		             AND    VS.CURR_STOCK_QTY > 0
 		             AND    BR.USE_YN = 'Y'
 		             AND    CM.USE_YN = 'Y'
 		             <if test="goodsCd != null and goodsCd != ''">
@@ -1919,7 +1915,6 @@
 		             <if test="selfGoodsYn != null and selfGoodsYn != ''">
 		             AND    G.SELF_GOODS_YN = #{selfGoodsYn}
 		             </if>
-		             GROUP  BY G.GOODS_CD
 		             LIMIT  20 ) A
 		ON     G.GOODS_CD = A.GOODS_CD
 	</select>

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

@@ -19,7 +19,7 @@
 		  AND A.USE_YN = 'Y'			     		/*사용여부*/
 		  AND A.APPLY_GB = 'A'						 /*적용구분(P:대기,A:적용,F:종료)*/
 		  AND A.FRONT_GB IN ('A',#{frontGb}) 		 /*프론트 구분*/
-		<!-- ORDER BY A.REG_DT DESC LIMIT 1 -->
+		ORDER BY A.REG_DT DESC LIMIT 1
 	</select>
 	
 	<!-- 소셜상품(=핫딜) 목록 -->

src/main/webapp/WEB-INF/views/mob/goods/GoodsIncludeFormMob.html

@@ -24,7 +24,7 @@
 			<button type="button" id="kakao-link-btn" class="kk" th:attr="onclick=|cfnSendToKakaoMob('${stylelUrl+'/goods/detail/form?goodsCd='+goodsInfo.goodsCd}', '${goodsInfo.goodsFullNm}', '${imgGoodsUrl+ '/'+goodsInfo.sysImgNm+'?RS=80'}');|"><span>카카오톡</span></button>
 			<button type="button" class="fb" th:attr="onclick=|sendSns('facebook', '${stylelUrl+'/goods/detail/form?goodsCd='+goodsInfo.goodsCd}', '${goodsInfo.goodsFullNm}', '', '');|"><span>페이스북</span></button>
 			<button type="button" class="tw" th:attr="onclick=|sendSns('twitter', '${stylelUrl+'/goods/detail/form?goodsCd='+goodsInfo.goodsCd}', '${goodsInfo.goodsFullNm+ '#style24몰'}', '', '');|"><span>트위터</span></button>
-			<button type="button" class="url btn_copy"><span>URL</span></button>
+			<button type="button" class="url btn_copy" onclick="copyToClipboard();"><span>URL</span></button>
 		</span>
 	</div>
 </div>

src/main/webapp/WEB-INF/views/mob/goods/GoodsShopBenefitFormMob.html

@@ -77,7 +77,7 @@
 								<tr th:each="freeGoods, status : ${freeGoodsList}">
 									<th>
 										<th:block th:text="${#numbers.formatInteger(freeGoods.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(freeGoods.sectionGb == 'G810_10')? '개':'원'}"></th:block> 이상 구매 시
-										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,':')}">
+										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,'@:')}">
 										<p><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${#numbers.formatInteger(goodsArray[1], 0,'COMMA')}"></th:block>개 증정 <th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></p>
 										</th:block>
 									</th>

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

@@ -11,9 +11,12 @@
 						<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}">
 						<li>
 							<div class="option_name">
-								<span>
+								<span th:if="${oneData.goodsType == 'G056_S'}">
 									<em th:text="${oneData.itemNm}"></em> / <em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
 								</span>
+								<span th:unless="${oneData.goodsType == 'G056_S'}">
+									<em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
+								</span>
 							</div>
 							<div class="option_box">
 								<th:block th:if="${oneData.optCd2Arr.length > 0}" th:each="option, idx : ${oneData.optCd2Arr}">
@@ -29,9 +32,12 @@
 					<th:block th:unless="${oneData.selfGoodsYn == 'Y'}">
 						<li>
 							<div class="option_name">
-								<span>
+								<span th:if="${oneData.goodsType == 'G056_S'}">
 									<em th:text="${oneData.itemNm}"></em> / <em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
 								</span>
+								<span th:unless="${oneData.goodsType == 'G056_S'}">
+									<em th:text="${oneData.colorNm}"></em> / <em th:text="${oneData.optCd2}"></em>
+								</span>
 							</div>
 							<div class="option_select">
 								<div class="select_custom select_option">
@@ -71,7 +77,7 @@
 					</th:block>
 				</th:block>
 			</div>
-			<input type="hidden" name="chgOptCd2" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}" />
+			<input type="hidden" name="chgOptCd2" th:unless="${oneData.selfGoodsYn == 'Y'}" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, itemNm=${oneData.itemNm}, colorNm=${oneData.colorNm}, orgOptCd2=${oneData.optCd2}, goodsType=${oneData.goodsType}" th:value="${oneData.optCd2}" />
 		</div>
 	</div>
 </div>

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

@@ -232,7 +232,7 @@
 			<div class="inner">
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
-						<h3>교환 회수지 주소</h3>
+						<h3>반품 회수지 주소</h3>
 						<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
 							<button type="button" id="btn_adrsChange_pop" class="btn_popup"  onclick="fnChangeAddr('chger');">
 								<span>회수지 변경</span>

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

@@ -44,8 +44,8 @@
 							<div class="goods_status">
 								<!-- 선물주문 -->
 								<th:block th:if="${order.giftPackYn == 'Y'}">
-									<p class="dlvr_staus" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-									<p class="dlvr_staus" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 								</th:block>
 								<!-- //선물주문 -->
@@ -298,7 +298,7 @@
 							<!-- 선물주문 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
 								<!-- 배송지등록전 -->
-								<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
 									<div><button type="button" class="btn btn_primary btn_sms_send" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></div>
 								</th:block>
 								<!-- //배송지등록전 -->
@@ -311,7 +311,7 @@
 								
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
 										<div><button type="button" class="btn btn_default btn_cart_save" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></div>
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null and ${ordDtl.ordDtlStat} == 'G013_70'">
@@ -417,28 +417,32 @@
 							
 							<!-- 선물배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-								<div class="goods_txt">
-									<!-- 배송지등록전 -->
-									<th:block th:if="${ordDtl.recipBaseAddr == ''} and ${ordDtl.giftLimitDay} >= 0">
+								<!-- 배송지등록전 -->
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
 										<p class="period">입력기한 <span th:text="${ordDtl.giftLimitDt}"></span></p>
-									</th:block>
-									<!-- //배송지등록전 -->
-									
-									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-										<th:block th:if="${ordDtl.recipBaseAddr != ''} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									</div>
+								</th:block>
+								<!-- //배송지등록전 -->
+								
+								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+										<div class="goods_txt">
 											<p class="cf_txt cf_desc"><span th:text="|‘${ordDtl.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
-										</th:block>
+										</div>
 									</th:block>
-									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									
-									<!-- 선물 취소 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+								</th:block>
+								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								
+								<!-- 선물 취소 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc">주소 입력 기한이 경과되어 선물이 취소 되었습니다.</p>
-									</th:block>
-									<!-- //선물 취소 -->
-								</div>
+									</div>
+								</th:block>
+								<!-- //선물 취소 -->
 							</th:block>
 							<!-- //선물배송일때 -->
 							<!-- //주문상태별 문구정보 정의 -->

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

@@ -51,8 +51,8 @@
 							<div class="goods_status">
 								<!-- 선물주문 -->
 								<th:block th:if="${order.giftPackYn == 'Y'}">
-									<p class="dlvr_staus" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-									<p class="dlvr_staus" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+									<p class="dlvr_staus" th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 								</th:block>
 								<!-- //선물주문 -->
@@ -440,28 +440,32 @@
 							
 							<!-- 선물배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'Y'">
-								<div class="goods_txt">
-									<!-- 배송지등록전 -->
-									<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+								<!-- 배송지등록전 -->
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'N'} and ${ordDtl.giftLimitDay} >= 0">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc"><span th:text="|‘${deliveryAddrInfo.recipNm}’|"></span>님 주소를 입력하기 전입니다.</p>
 										<p class="period">입력기한 <span th:text="${ordDtl.giftLimitDt}"></span></p>
-									</th:block>
-									<!-- //배송지등록전 -->
-									
-									<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-										<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									</div>
+								</th:block>
+								<!-- //배송지등록전 -->
+								
+								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
+									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+										<div class="goods_txt">
 											<p class="cf_txt cf_desc"><span th:text="|‘${deliveryAddrInfo.recipNm}’|"></span>님께 선물이 발송되었습니다.</p>
-										</th:block>
+										</div>
 									</th:block>
-									<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-									
-									<!-- 선물 취소 -->
-									<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+								</th:block>
+								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
+								
+								<!-- 선물 취소 -->
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_98' and ${ordDtl.ordDtlStat} == 'G013_99'">
+									<div class="goods_txt">
 										<p class="cf_txt cf_desc">주소 입력 기한이 경과되어 선물이 취소 되었습니다.</p>
-									</th:block>
-									<!-- //선물 취소 -->
-								</div>
+									</div>
+								</th:block>
+								<!-- //선물 취소 -->
 							</th:block>
 							<!-- //선물배송일때 -->
 							<!-- //주문상태별 문구정보 정의 -->

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

@@ -30,10 +30,8 @@
 								<!-- //배송지등록전 -->
 								
 								<!-- 배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60' or ${ordDtl.ordDtlStat} == 'G013_70'">
-									<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
-										<p class="dlvr_staus">선물 완료</p>
-									</th:block>
+								<th:block th:if="${ordDtl.giftAddrInpYn == 'Y'} and ${ordDtl.ordDtlStat} != 'G013_98' and ${ordDtl.ordDtlStat} != 'G013_99'">
+									<p class="dlvr_staus">선물 완료</p>
 								</th:block>
 								<!-- //배송지등록완료, 결제전취소, 결제후취소 아닐경우 -->
 								

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

@@ -600,19 +600,19 @@ var fnReturn = function() {
 
 	let jsonData = JSON.stringify(data);
 
-	//gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-	//	if (addPayCost > 0) {
-	//		let ordChgSq = result.ordChgSq;
-	//		let ordNo = result.ordNo;
-	//
-	//		$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
-	//		$('#addPaymentForm input[name=ordNo]').val(ordNo);
-	//
-	//		document.addPaymentForm.submit();
-	//	} else {
-	//		cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
-	//	}
-	//}, true);
+	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		if (addPayCost > 0) {
+			let ordChgSq = result.ordChgSq;
+			let ordNo = result.ordNo;
+
+			$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
+			$('#addPaymentForm input[name=ordNo]').val(ordNo);
+
+			document.addPaymentForm.submit();
+		} else {
+			cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
+		}
+	}, true);
 }
 
 // 반품 수량 변경 이벤트 처리

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

@@ -217,7 +217,7 @@
 			<div class="inner">
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
-						<h3>교환 회수지 주소</h3>
+						<h3>반품 회수지 주소</h3>
 						<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
 							<button type="button" class="btn_popup"  onclick="fnChangeAddr('chger');">
 								<span>회수지 변경</span>

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

@@ -1049,7 +1049,7 @@ var paymentInfoSet = function() {
 						$("#orderAmtForm .recipNm").text($("#orderForm #orderGiftInfo input[name=recipNm]").val());
 						$("#orderAmtForm .recipPhnno").text($("#orderForm #orderGiftInfo input[name=recipPhnno]").val());
 						
-						if (gagajf.isNull($("#orderForm #orderGiftInfo input[name=recipPhnno]").val())) {
+						if (gagajf.isNull($("textarea#giftMsg").val())) {
 							giftMsg = "감사합니다.";
 						} else {
 							giftMsg = $("textarea#giftMsg").val();

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -20,16 +20,17 @@
 <th:block layout:fragment="content">
 <main role="" id="" class="container dp">
 			<section class="content dp_hotdeal">
-				<div class="nodata" style="display: none;">
-					<div class="txt_box">
-						<p>진행하는 핫딜이 없습니다.</p>
-					</div>
-					<div class="btn_box">
-						<button class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);">
-							<span>홈으로 가기</span>
-						</button>
+				<div class="inner" id="topInner" style="display:none;">
+					<div class="list_content"> <!-- 데이터 없을시 클래스 nodata 추가 -->
+						 <div class="list_defult" style="display: none;" id="noData">
+	                         <div>
+	                             <p>진행하는 핫딜이 없습니다.</p>
+	                         </div>
+	                        <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+	                    </div>
 					</div>
 				</div>
+			<div id="socialDiv">
 			<th:block th:if="${socialInfo != null}">
 				<div class="inner wide">
                     <div class="hotdeal">
@@ -53,6 +54,7 @@
                     </div>
 				</div>
 			</th:block>
+			</div>
 			</section>
 		</main>
 <form id="socialForm" name="socialForm" action="#" th:action="@{'/social/list'}">
@@ -199,7 +201,9 @@ var fnDrawInfiniteScrollData = function (result){
 	gagaInfiniteScroll.pageStatus.totalCount = result.totalCnt;
 	
 	if (result.dataList != null && result.dataList.length > 0) {
-		$(".nodata").hide();		
+		$("#noData").hide();		
+		$("#socialDiv").show();	
+		$("#topInner").hide();
 		let lastPage = result.paging.pageable.pageNo;
 		let endRow = result.endRow - result.paging.pageable.pageSize;
 		
@@ -207,7 +211,9 @@ var fnDrawInfiniteScrollData = function (result){
 		gagaInfiniteScroll.draw(htm);
 	}else{
 		if($("#socialForm input[name=pageNo]").val()==1){
-			$(".nodata").show();		
+			$("#noData").show();	
+			$("#socialDiv").hide();	
+			$("#topInner").show();
 		}
 		$("#divLastPage").show();
 		gagaInfiniteScroll.draw('not');

src/main/webapp/WEB-INF/views/web/goods/GoodsShopBenefitFormWeb.html

@@ -77,7 +77,7 @@
 								<tr th:each="freeGoods, status : ${freeGoodsList}">
 									<td>
 										<div class="th"><th:block th:text="${#numbers.formatInteger(freeGoods.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(freeGoods.sectionGb == 'G810_10')? '개':'원'}"></th:block> 이상 구매 시</div>
-										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,':')}">
+										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,'@:')}">
 										<div class="td"><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${#numbers.formatInteger(goodsArray[1], 0,'COMMA')}"></th:block>개 증정 
 										<th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></div>
 										</th:block>

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

@@ -8,7 +8,8 @@
 			<div class="modify_option_area" id="modifyOptionArea">
 				<th:block th:if="${exchangeOptionInfo}" th:each="oneData, status : ${exchangeOptionInfo}">
 					<div class="modify_box" th:attr="ordDtlItemSq=${oneData.ordDtlItemSq}, num=${num}">
-						<div class="name_blk" th:text="|${oneData.itemNm} / ${oneData.colorNm}|"></div>
+						<div class="name_blk" th:if="${oneData.goodsType == 'G056_S'}" th:text="|${oneData.itemNm} / ${oneData.colorNm} / ${oneData.optCd2}|"></div>
+						<div class="name_blk" th:unless="${oneData.goodsType == 'G056_S'}" th:text="|${oneData.colorNm} / ${oneData.optCd2}|"></div>
 						<div class="select_blk">
 							<!-- 옵션교환 라디오 형태 -->
 							<div class="sel_radio" th:if="${oneData.selfGoodsYn == 'Y'}">

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

@@ -179,7 +179,7 @@
 						</table>
 					</div>
 					<th:block th:if="${oneData.wdGb == 'W'}">
-						<h4 class="subH3">교환 회수지 주소</h4>
+						<h4 class="subH3">반품 회수지 주소</h4>
 						<div class="tbl type1">
 							<table>
 								<colgroup>

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

@@ -92,8 +92,8 @@
 											<div class="status_box">
 												<!-- 선물 -->
 												<th:block th:if="${order.giftPackYn == 'Y'}">
-													<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-													<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+													<p th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+													<p th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 													<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 												</th:block>
 												<!-- 주문 -->
@@ -106,7 +106,7 @@
 												<!-- 선물 -->
 												<th:block th:if="${order.giftPackYn == 'Y'}">
 													<!-- SMS 재발송 버튼 -->
-													<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+													<th:block th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
 													</th:block>
 
@@ -116,12 +116,12 @@
 													</th:block>
 
 													<!-- 리뷰 쓰기 버튼 -->
-													<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+													<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 													</th:block>
 
 													<!-- 쇼핑백담기 버튼(구매확정) -->
-													<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+													<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
 														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
 													</th:block>
 												</th:block>
@@ -188,12 +188,12 @@
 										<!-- 선물 -->
 										<th:block th:if="${order.giftPackYn == 'Y'}">
 											<!-- 주소 입력 대기중 -->
-											<div class="order_text" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+											<div class="order_text" th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">
 												<p th:text="|${ordDtl.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${ordDtl.giftLimitDt})|"></p>
 											</div>
 
 											<!-- 선물 완료 -->
-											<div class="order_text" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+											<div class="order_text" th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
 												<p th:text="|${ordDtl.recipNm}님께 선물이 발송되었습니다.|"></p>
 											</div>
 

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

@@ -172,7 +172,7 @@
 							</table>
 						</div>
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
-							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
+							<h4 class="subH3">반품 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
 								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
 								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">

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

@@ -98,8 +98,8 @@
 												<div class="status_box">
 													<!-- 선물 -->
 													<th:block th:if="${order.giftPackYn == 'Y'}">
-														<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
-														<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+														<p th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+														<p th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
 														<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
 													</th:block>
 													<!-- 주문 -->
@@ -112,7 +112,7 @@
 													<!-- 선물 -->
 													<th:block th:if="${order.giftPackYn == 'Y'}">
 														<!-- SMS 재발송 버튼 -->
-														<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+														<th:block th:if="${ordDtl.giftAddrInpYn == 'N' and ordDtl.giftLimitDay >= 0}">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
 														</th:block>
 
@@ -122,12 +122,12 @@
 														</th:block>
 														
 														<!-- 리뷰 쓰기 버튼 -->
-														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+														<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 														</th:block>
 
 														<!-- 쇼핑백담기 버튼(구매확정) -->
-														<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+														<th:block th:if="${ordDtl.giftAddrInpYn == 'Y' and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
 															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
 														</th:block>
 													</th:block>

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

@@ -465,9 +465,9 @@
 					tag += '										<div class="status_box">\n';
 					// 상태값 처리
 					if (ordDtl.giftPackYn == 'Y') {
-						if (gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.giftLimitDay >= 0) {
+						if (ordDtl.giftAddrInpYn == 'N' && ordDtl.giftLimitDay >= 0) {
 							tag += '											<p>주소 입력 대기중</p>\n';
-						} else if (!gagajf.isNull(ordDtl.recipBaseAddr)) {
+						} else if (ordDtl.giftAddrInpYn == 'Y' && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99') {
 							tag += '											<p>선물 완료</p>\n';
 						} else if (ordDtl.ordDtlStat == 'G013_98' || ordDtl.ordDtlStat == 'G013_99' || ordDtl.giftLimitDay < 0) {
 							tag += '											<p>선물 취소</p>\n';

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

@@ -485,7 +485,7 @@ var reviewCreate = function () {
         cancelBtnText: "취소",
         sureBtnText: "확인",
         sureBtnClick: function(){
-        	gagajf.ajaxFormSubmit($('#reviewForm').prop('action'), '#reviewForm', fnSaveCallback);
+        	gagajf.ajaxFormSubmit($('#reviewForm').prop('action'), '#reviewForm', fnSaveCallback, true);
         }
     });
 	

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

@@ -176,7 +176,7 @@
 						</table>
 					</div>
 					<th:block th:if="${oneData.wdGb == 'W'}">
-						<h4 class="subH3">교환 회수지 주소</h4>
+						<h4 class="subH3">반품 회수지 주소</h4>
 						<div class="tbl type1">
 							<table>
 								<colgroup>

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

@@ -171,7 +171,7 @@
 							</table>
 						</div>
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
-							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
+							<h4 class="subH3">반품 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
 								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
 								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">

src/main/webapp/WEB-INF/views/web/pg/KakaoPaymentRequestWeb.html

@@ -15,7 +15,7 @@
  -->
 <head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
+<!--<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>-->
 <body>
 
 <script th:inline="javascript">

src/main/webapp/WEB-INF/views/web/pg/NaverPaymentRequestWeb.html

@@ -15,7 +15,7 @@
  -->
 <head th:replace="~{web/common/fragments/HeadWeb :: head}"></head>
 <th:block th:replace="~{web/common/fragments/VariablesWeb :: variables}"></th:block>
-<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>
+<!--<th:block th:replace="~{web/common/fragments/ScriptsWeb :: scripts}"></th:block>-->
 <body>
 
 <script th:inline="javascript">

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

@@ -514,18 +514,19 @@ if(image.length>0){
 	}
 }
 
-if(goods1.length>0){
+if(template.length>0){
 	var array = [];
-
 	for (var j = 0; j < template.length; j++) {
 		if(template[j].tmplType == 'G082_50'){
 			array.push(template[j].planContSq);
 		}
 	}	
-	
 	for (var i = 0; i < template.length; i++) {
 		var html = '';
 		if(template[i].tmplType == 'G082_50' && array[0] == template[i].planContSq && typeof array[0] != 'undefined') {
+			if(template[i].title != null && template[i].title != ''){
+				$("#G082_50" +template[i].planContSq).show();
+			}
 			html += '<div class="cont_head">\n';
 			html += '	<div>\n';
 			html += '        <h4>\n';
@@ -547,11 +548,7 @@ if(goods1.length>0){
 			html += '        <ul>\n';
 		$.each(goods1, function(idx, item)  {
 			if (item.planContSq == template[i].planContSq) {
-				if (item.goodsCd == null && item.goodsCd == '') {
-					$("#G082_50" +array[0]).hide();
-				}else{
-					$("#G082_50" +array[0]).show();
-				}
+				$("#G082_50" + item.planContSq).show();
 				html += '            <li>\n';
 				html += '                <div class="dp_listItems">\n';
 				html += '                    <div class="dp_listItems_img">\n';
@@ -589,7 +586,7 @@ if(goods1.length>0){
 	}
 }
 
-if(goods2.length>0){
+if(template.length>0){
 	var array = [];
 
 	for (var j = 0; j < template.length; j++) {
@@ -601,6 +598,9 @@ if(goods2.length>0){
 		var html = '';
 		
 		if(template[i].tmplType == 'G082_51' && array[0] == template[i].planContSq && typeof array[0] != 'undefined'){
+			if(template[i].title != null && template[i].title != ''){
+				$("#G082_51" +template[i].planContSq).show();
+			}
 			html += '<div class="cont_head">\n';
 			html += '	<div>\n';
 			html += '        <h4>\n';
@@ -622,11 +622,7 @@ if(goods2.length>0){
 			html += '            <div class="swiper-wrapper">\n';
 			$.each(goods2, function(idx, item) {
 				if (item.planContSq == template[i].planContSq) {
-					if (item.goodsCd == null && item.goodsCd == '') {
-						$("#G082_51" +array[0]).hide();
-					}else{
-						$("#G082_51" +array[0]).show();
-					}
+					$("#G082_51" + item.planContSq).show();
 					html += '                <div class="swiper-slide">\n';
 					html += '                    <div class="item_prod">\n';
 					html += '                        <div class="item_state">\n';
@@ -667,7 +663,7 @@ if(goods2.length>0){
 	}
 }
 
-if(goods4.length>0){
+if(template.length>0){
 	var array = [];
 
 	for (var j = 0; j < template.length; j++) {
@@ -678,6 +674,9 @@ if(goods4.length>0){
 	for (var i = 0; i < template.length; i++) {
 		var html = '';
 		if(template[i].tmplType == 'G082_52' && array[0] == template[i].planContSq && typeof array[0] != 'undefined'){
+			if(template[i].title != null && template[i].title != ''){
+				$("#G082_52" +template[i].planContSq).show();
+			}
 			html += '<div class="cont_head">\n';
 			html += '<div>\n';
 			html += '        <h4>\n';
@@ -699,11 +698,7 @@ if(goods4.length>0){
 			html += '            <div class="swiper-wrapper">\n';
 			$.each(goods4, function(idx, item) {
 				if (item.planContSq == template[i].planContSq) {
-					if (item.goodsCd == null && item.goodsCd == '') {
-						$("#G082_52" +array[0]).hide();
-					}else{
-						$("#G082_52" +array[0]).show();
-					}
+					$("#G082_52" + item.planContSq).show();
 					html += '                <div class="swiper-slide">\n';
 					html += '                    <div class="item_prod">\n';
 					html += '                        <div class="item_state">\n';

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -38,31 +38,33 @@
 					</div>
 				</div>
 			<th:block th:if="${socialInfo != null}">
-			<div class="content wide dp_hotdeal"> <!-- 페이지특정 클래스 = dp_hotdeal -->
-				<div class="cont_body">
-                    <div class="hotdeal">
-                    <img src="/images/pc/thumb/hotdeal_bg2.jpg" alt="핫한 아이템을 핫한 가격에 LAST DAY DEAL">
-                        <div id="countdown">
-                            <span id="h-hours"></span>
-                            <span id="h-minutes"></span>
-                            <span id="h-seconds"></span>
-                        </div>
-                    </div>  
-                    <div class="list_content">
-                        <div class="itemsGrp rowtype"> <!-- itemsGrp rank hot deal --> <!-- rowtype 추가시 가로형태로 출력 -->
-									<section id="infiniteContainer">
-										<div id="listBoxOuter">
-											<ul id="listBox">
-											</ul>
-										</div>
-									</section>
-								</div>
-                         <div class="last_page" id="divLastPage" style="display: none;">
-						<span>마지막 페이지입니다.</span>
-					</div>
-                    </div>
-                   
-                </div>
+			<div id="socialDiv" style="display: none;">
+				<div class="content wide dp_hotdeal"> <!-- 페이지특정 클래스 = dp_hotdeal -->
+					<div class="cont_body">
+	                    <div class="hotdeal">
+	                    <img src="/images/pc/thumb/hotdeal_bg2.jpg" alt="핫한 아이템을 핫한 가격에 LAST DAY DEAL">
+	                        <div id="countdown">
+	                            <span id="h-hours"></span>
+	                            <span id="h-minutes"></span>
+	                            <span id="h-seconds"></span>
+	                        </div>
+	                    </div>  
+	                    <div class="list_content">
+	                        <div class="itemsGrp rowtype"> <!-- itemsGrp rank hot deal --> <!-- rowtype 추가시 가로형태로 출력 -->
+										<section id="infiniteContainer">
+											<div id="listBoxOuter">
+												<ul id="listBox">
+												</ul>
+											</div>
+										</section>
+									</div>
+	                         <div class="last_page" id="divLastPage" style="display: none;">
+							<span>마지막 페이지입니다.</span>
+						</div>
+	                    </div>
+	                   
+	                </div>
+			    </div>
 		    </div>
 		</th:block>
 
@@ -224,7 +226,8 @@ var fnDrawInfiniteScrollData = function (result){
 	gagaInfiniteScroll.pageStatus.totalCount = result.totalCnt;
 
 	if (result.dataList != null && result.dataList.length > 0) {
-		$(".nodata").hide();		
+		$(".nodata").hide();	
+		$("#socialDiv").show();	
 		let lastPage = result.paging.pageable.pageNo;
 		let endRow = result.endRow - result.paging.pageable.pageSize;
 		
@@ -232,7 +235,8 @@ var fnDrawInfiniteScrollData = function (result){
 		gagaInfiniteScroll.draw(htm);
 	}else{
 		if($("#socialForm input[name=pageNo]").val()==1){
-			$(".nodata").show();		
+			$(".nodata").show();	
+			$("#socialDiv").hide();	
 		}
 		$("#divLastPage").show();
 		gagaInfiniteScroll.draw('not');