Головна сторінка Огляд Довідка
Увійти
style24
/
style24.front
2
0
Відгалуження 0
Файли Проблеми 0 Запити на злиття 0 Wiki
Переглянути джерело

모바일주문서개발중

jsh77b 5 роки тому
батько
39ff201a3a
коміт
2d8bc3fd41
18 змінених файлів з 692 додано та 328 видалено
Розділений вигляд Показати статистику Diff
  1. 1 1
      src/main/java/com/style24/front/biz/web/TsfCommonController.java
  2. 54 7
      src/main/java/com/style24/front/biz/web/TsfOrderController.java
  3. 190 0
      src/main/webapp/WEB-INF/views/mob/order/OrderCouponApplyPopMob.html
  4. 85 75
      src/main/webapp/WEB-INF/views/mob/order/OrderDcAmtInfoMob.html
  5. 2 2
      src/main/webapp/WEB-INF/views/mob/order/OrderDeliveryAddrInfoMob.html
  6. 44 0
      src/main/webapp/WEB-INF/views/mob/order/OrderDelvCouponApplyPopMob.html
  7. 33 24
      src/main/webapp/WEB-INF/views/mob/order/OrderEntryInfoMob.html
  8. 127 113
      src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html
  9. 28 20
      src/main/webapp/WEB-INF/views/mob/order/OrderFreegiftInfoMob.html
  10. 26 9
      src/main/webapp/WEB-INF/views/mob/order/OrderMadeInfoMob.html
  11. 50 26
      src/main/webapp/WEB-INF/views/mob/order/OrderPaymentInfoMob.html
  12. 1 1
      src/main/webapp/WEB-INF/views/mob/popup/DelvAddrAddPopMob.html
  13. 1 1
      src/main/webapp/WEB-INF/views/mob/popup/DelvAddrChangePopMob.html
  14. 4 4
      src/main/webapp/WEB-INF/views/mob/popup/DelvAddrModifyPopMob.html
  15. 39 38
      src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html
  16. 2 2
      src/main/webapp/WEB-INF/views/web/popup/DelvAddrAddPopWeb.html
  17. 3 3
      src/main/webapp/WEB-INF/views/web/popup/DelvAddrModifyPopWeb.html
  18. 2 2
      src/main/webapp/WEB-INF/views/web/popup/DelvMemoChangePopWeb.html

+ 1 - 1
src/main/java/com/style24/front/biz/web/TsfCommonController.java
Переглянути файл 

@@ -384,7 +384,7 @@ public class TsfCommonController extends TsfBaseController {
 
 	}
 
 	
 	/**
 
-	 * 주문배송지정보수정
 
+	 * 주문배송메모수정
 
 	 *
 
 	 * @param
 
 	 * @return

+ 54 - 7
src/main/java/com/style24/front/biz/web/TsfOrderController.java
Переглянути файл 

@@ -365,7 +365,6 @@ public class TsfOrderController extends TsfBaseController {
 
 	@PostMapping("/entryInfo")
 
 	public ModelAndView entryInfo(@RequestBody Order order) {
 
 		ModelAndView mav = new ModelAndView();
 
-		
 		mav.addObject("order"				, order);									// 파라미터
 
 		mav.addObject("isLogin"				, TsfSession.isLogin());					// 로그인여부
 
 		mav.setViewName(super.getDeviceViewName("order/OrderEntryInfo"));
 
@@ -384,7 +383,6 @@ public class TsfOrderController extends TsfBaseController {
 
 	@ResponseBody
 
 	@PostMapping("/madeInfo")
 
 	public ModelAndView madeInfo(@RequestBody Order order) {
 
-
 
 		ModelAndView mav = new ModelAndView();
 
 		mav.addObject("order"				, order);									// 파라미터
 
 		mav.addObject("isLogin"				, TsfSession.isLogin());					// 로그인여부
 
@@ -779,7 +777,7 @@ public class TsfOrderController extends TsfBaseController {
 
 	}
 
 	
 	/**
 
-	 * 사은품안내팝업
 
+	 * 사은품안내팝업 (사용하는지확인)
 
 	 *
 
 	 * @param
 
 	 * @return
 
@@ -789,16 +787,13 @@ public class TsfOrderController extends TsfBaseController {
 
 	@ResponseBody
 
 	@RequestMapping(value = "/freegiftInfoPop")
 
 	public ModelAndView freegiftInfoPop(Order order) {
 
-		
 		ModelAndView mav = new ModelAndView();
 
-		
 		mav.setViewName(super.getDeviceViewName("order/OrderFreegiftInfoPop"));
 
-		
 		return mav;
 
 	}
 
 	
 	/**
 
-	 * 쿠폰변경팝업
 
+	 * 쿠폰변경팝업 (상품, 장바구니)
 
 	 *
 
 	 * @param
 
 	 * @return
 
@@ -858,6 +853,58 @@ public class TsfOrderController extends TsfBaseController {
 
 		
 		return mav;
 
 	}
 
+	
+	/**
 
+	 * 쿠폰변경팝업 (배송비)
 
+	 *
 
+	 * @param
 
+	 * @return
 
+	 * @author jsh77b
 
+	 * @since 2021. 02. 17
 
+	 */
 
+	@SuppressWarnings({ "unused", "unchecked" })
 
+	@ResponseBody
 
+	@PostMapping(value = "/delvCouponApplyPop")
 
+	public ModelAndView delvCouponApplyPop(@RequestBody Order order) {
 
+		
+		ModelAndView mav = new ModelAndView();
 
+		
+		GagaMap goodsDcAmtMap = new GagaMap();
 
+		
+		Collection<Order> delvCpnList 			= new ArrayList<Order>();
 
+		Collection<Order> delvFeeCdList 		= new ArrayList<Order>();
 
+		
+		// 1. 로그인체크 후 custNo 설정
 
+		if (TsfSession.isLogin()) {
 
+			order.setCustNo(TsfSession.getInfo().getCustNo()); // 고객번호등록
 
+		} else {
 
+			order.setJsessionId(TsfSession.getSessionId());
 
+		}
 
+		
+		// 2. 로그인체크 후 정보 설정 (할인구간정보조회)
 
+		if (TsfSession.isLogin()) {
 
+			
+			// 2.1 배송단위별 상품 목록 조회 (장바구니)
 
+			Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
 
+			
+			GagaMap delvOrderMap = coreOrderService.getCartDelvGoodsCntList(tmtbGoodsApplyList, order);
 
+			
+			// 2.7 배송비쿠폰목록 조회
 
+			delvCpnList = coreOrderService.getDelvCpnList(order);
 
+			
+			delvFeeCdList = (Collection<Order>) delvOrderMap.get("delvFeeCdList");
 
+			
+			// 2.8 배송비쿠폰(배송업체기준)
 
+			delvCpnList = coreOrderService.getDelvCpnApplyList(delvFeeCdList, delvCpnList);
 
+		} 
+
 
+		mav.addObject("delvCpnList"						, delvCpnList);								// 배송비쿠폰목록
 
+		mav.addObject("order"							, order);									// 파라미터
 
+
 
+		mav.setViewName(super.getDeviceViewName("order/OrderDelvCouponApplyPop"));
 
+		
+		return mav;
 
+	}
 
 
 	/**
 
 	 * 카카오페이 결제 요청 처리

+ 190 - 0
src/main/webapp/WEB-INF/views/mob/order/OrderCouponApplyPopMob.html
Переглянути файл 

@@ -0,0 +1,190 @@
 
+<!DOCTYPE html>

+<html lang="ko" xmlns:th="http://www.thymeleaf.org">

+

+<div class="modal-dialog" role="document">

+	<div class="modal-content">

+		<div class="modal-header">

+			<h5 class="modal-title" id="couponModifyLabel">할인쿠폰 변경</h5>

+		</div>

+		<div class="modal-body">

+			<div class="pop_cont">

+			

+				<!-- 상품쿠폰적용 -->

+				<th:block th:if="${goodsApplyCpnList.size() > 0}">

+					<h6>상품쿠폰</h6>

+					<div class="area_item_coupon">

+						<th:block th:each="goods, i : ${goodsApplyCpnList}">

+							<th:block th:if="${goods.goodsCpnList.size() > 0}">

+								<div th:id="|item${i.index}|" class="apply_item goodsCpn" th:value="${i.index}+1">

+									<div class="item_gd">

+										<figure>

+											<span class="thumb"><img src="/images/pc/thumb/tmp_odSide1.jpg" alt=""></span>

+											<figcaption>

+												<div class="brand" th:text="${goods.brandEnm}+' '+${goods.brandKnm}"></div>

+												<div class="name" th:text="${goods.goodsNm}"></div>

+												<div class="option" th:each="colorNm, index : ${goods.colorNmArr}" th:text="${colorNm}+'/'+${goods.optCd2Arr[index.index]}"></div>

+											</figcaption>

+										</figure>

+									</div>

+									

+									<div class="form_field">

+										<div class="select_custom coupon_list" th:value="${i.index}+1">

+											<div class="combo">

+												<div class="select">

+													<div class="item_coupon"><p class="empty">선택</p></div>

+												</div>

+											</div>

+										</div>

+									</div>

+									

+									<input type="hidden" name="cpnType" value="goodsCpn"/>

+									<input type="hidden" name="cpnCartSq" th:value="${goods.cartSq}"/>

+									<input type="hidden" name="custCpnSq" value="0"/>

+									<input type="hidden" name="cpnDcAmt" value="0"/>

+								</div>

+							</th:block>

+						</th:block>

+					</div>

+				</th:block>

+				<!-- //상품쿠폰적용 -->

+				

+				<!-- 장바구니쿠폰적용 -->

+				<th:block th:if="${cartCpnList.size() > 0}">

+					<h6>장바구니 쿠폰</h6>

+					<div class="area_cart_coupon">

+						<div class="form_field">

+							<th:block th:each="cartCpn, k : ${cartCpnList}">

+								<div class="cartCpn" th:value="${cartCpn.custCpnSq}">

+									<input type="hidden" name="dcWay" th:value="${cartCpn.dcWay}"/>

+									<input type="hidden" name="dcVal" th:value="${cartCpn.dcVal}"/>

+									

+									<!-- 장바구니쿠폰 적용 장바구니 시퀀스 -->

+									<th:block th:each="cartCpnCartSq, kokok : ${cartCpn.cartCpnCartSqArr}"> 

+										<input type="hidden" name="cartCpnCartSq" th:value="${cartCpnCartSq}" />

+									</th:block>

+									<!-- 장바구니쿠폰 결제가능수단목록조회 -->

+									<th:block th:each="payType, kokok : ${cartCpn.payTypeArr}"> 

+										<input type="hidden" name="payTypeArr" th:value="${payType}" />

+									</th:block>

+									

+									<input type="radio" name="rdi-cart-coupon" th:id="|rdi-cart-coupon${k.index}|">

+									<label th:for="|rdi-cart-coupon${k.index}|">

+										<div class="cart_coupon">

+											<p class="name" th:text="${cartCpn.cpnNm}"></p>

+											<p class="txt">

+												<th:block th:if="${cartCpn.buyLimitAmt} > 0">

+													<span th:text="${#numbers.formatInteger(cartCpn.buyLimitAmt, 1, 'COMMA')}"></span>원 이상 구매시 

+												</th:block>

+												<th:block th:if="${cartCpn.maxDcAmt} > 0">

+													최대 <span th:text="${#numbers.formatInteger(cartCpn.maxDcAmt, 1, 'COMMA')}"></span>원 할인

+												</th:block>

+											</p>

+											<p class="discount">

+												<th:block th:if="${cartCpn.dcWay} == 'G240_10'">

+													<span th:text="${#numbers.formatInteger(cartCpn.dcVal, 1, 'COMMA')}"></span>원 할인

+												</th:block>

+												<th:block th:if="${cartCpn.dcWay} == 'G240_11'">

+													<span th:text="${#numbers.formatInteger(cartCpn.dcVal, 1, 'COMMA')}"></span>% 할인

+												</th:block>

+											</p>

+										</div>

+									</label>

+								</div>

+							</th:block>

+							<div class="cartCpn" value="0">

+								<div class="cart_coupon">

+									<input type="radio" name="rdi-cart-coupon" id="rdi-cart-coupon0">

+									<label for="rdi-cart-coupon0">적용안함</label>

+								</div>

+							</div>

+						</div>

+					</div>

+				</th:block>

+				<input type="hidden" name="cpnType" value="cartCpn"/>

+				<input type="hidden" name="custCpnSq" value="0"/>

+				<input type="hidden" name="cpnDcAmt" value="0"/>

+				<!-- //장바구니쿠폰적용 -->

+			</div>

+		</div>

+		<div class="modal-footer">

+			<button type="button" id="" class="btn btn_primary"><span>총 <em>0</em>원 쿠폰 적용</span></button>

+		</div>

+		

+		<!-- 상품쿠폰팝업적용 -->

+		<th:block th:if="${goodsApplyCpnList.size() > 0}">

+			<th:block th:each="goods, i : ${goodsApplyCpnList}">

+				<th:block th:if="${goods.goodsCpnList.size() > 0}">

+					<!-- 할인쿠폰 변경_쿠폰선택_팝업 -->

+					<div class="popup_box couponSelectPop">

+						<div class="lap">

+							<div class="popup_close">카테고리닫기</div>

+							<div class="popup_head">

+								<h2>옵션변경</h2>

+							</div>

+							<div class="popup_con">

+								<ul class="list" style="display: block;">

+									<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">

+										<li th:value="${goodsCpn.custCpnSq}" th:data="${goodsCpn.cpnDcAmt}">

+											<button type="button" class="dlvr_coupon">

+												<p class="name" th:text="${goodsCpn.cpnNm}"></p>

+												<p class="txt">

+													<th:block th:if="${goodsCpn.buyLimitAmt} > 0">

+														<span th:text="${#numbers.formatInteger(goodsCpn.buyLimitAmt, 1, 'COMMA')}"></span>원 이상 구매시

+													</th:block>

+													<th:block th:if="${goodsCpn.maxDcAmt} > 0"> 

+														최대 <span th:text="${#numbers.formatInteger(goodsCpn.maxDcAmt, 1, 'COMMA')}"></span>원 할인

+													</th:block>

+												</p>

+												<p class="discount">

+													<th:block th:if="${goodsCpn.dcWay} == 'G240_10'">

+														<span th:text="${#numbers.formatInteger(goodsCpn.dcVal, 1, 'COMMA')}"></span>원 할인

+													</th:block>

+													<th:block th:if="${goodsCpn.dcWay} == 'G240_11'">

+														<span th:text="${#numbers.formatInteger(goodsCpn.dcVal, 1, 'COMMA')}"></span>% 할인

+													</th:block>

+												</p>

+											</button>

+										</li> 

+									</th:block>

+									<li value="0" data="0">

+										<button class="dlvr_coupon">

+											<p class="empty">적용 안함</p>

+										</button>

+									</li>

+								</ul>

+							</div>

+						</div>

+					</div>

+					<!-- //쿠폰선택_팝업 -->

+				</th:block>

+			</th:block>

+		</th:block>

+		<!-- //상품쿠폰팝업적용 -->

+		

+	</div>

+</div>

+<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>

+

+<script th:inline="javascript">

+//컨텐츠 호출

+$(document).ready( function() {

+});

+

+// 상품쿠폰, 장바구니쿠폰 팝업 닫기

+$("#couponModifyPop_close").on("click", function(){

+	$("#couponModifyPop").modal("hide");

+});

+

+// 상품상세쿠폰 팝업 닫기

+$("#couponModifyPop .lap .popup_close").on("click", function() {

+	$('.popup_box').hide();

+	$('.popup_box').removeClass('active');

+	$("body").css({"overflow":"visible"});

+});

+

+//팝업 - 할인혜택 > 상품쿠폰변경 선택           

+//var od_coupon_modify_selecter1 = new sCombo('.od_pop.couponModify_pop #item1 .select_custom.coupon_list');

+//var od_coupon_modify_selecter2 = new sCombo('.od_pop.couponModify_pop #item2 .select_custom.coupon_list');

+</script>

+

+</html>

+ 85 - 75
src/main/webapp/WEB-INF/views/mob/order/OrderDcAmtInfoMob.html
Переглянути файл 

@@ -2,7 +2,7 @@
 
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">

 <!--

  *******************************************************************************

- * @source  : OrderDcAmtInfoWeb.html

+ * @source  : OrderDcAmtInfoMob.html

  * @desc    : 할인혜택 Page

  *============================================================================

  * STYLE24

@@ -10,7 +10,7 @@
 
  *============================================================================

  * VER  DATE         AUTHOR      DESCRIPTION

  * ===  ===========  ==========  =============================================

- * 1.0  2021.02.01   jsh77b     최초 작성

+ * 1.0  2021.04.05   jsh77b     최초 작성

  *******************************************************************************

  -->

 

@@ -26,11 +26,12 @@
 
 						</div>

 						<div class="data maxdisc">

 							<div class="form_field">

-								<input id="chk-maxdisc" type="checkbox" checked="">

-								<label for="chk-maxdisc"><span>최대 할인혜택을 바로

-										적용하세요!</span><br>

-								<span class="maxdisc_amount">(<em>3,000</em>원 할인)

-								</span></label>

+								<input id="chk-maxdisc" type="checkbox" checked>

+								<label for="chk-maxdisc">

+									<span>최대 할인혜택을 바로 적용하세요!</span>

+									<br>

+									<span class="maxdisc_amount">(<em class="cpnDcAmt">0</em>원 할인)</span>

+								</label>

 							</div>

 						</div>

 					</div>

@@ -43,33 +44,30 @@
 
 							<dt class="sr-only">할인혜택 바로 적용</dt>

 							<dd>

 								<div class="form_field">

-									<input id="chk-maxdisc01" type="checkbox" checked="">

-									<label for="chk-maxdisc01"><span>최대 할인혜택을 바로

-											적용하세요!</span>&nbsp;<span class="maxdisc_amount">(<em>3,000</em>원

-											할인)

-									</span></label>

+									<input id="chk-maxdisc01" type="checkbox" checked>

+									<label for="chk-maxdisc01">

+										<span>최대 할인혜택을 바로 적용하세요!</span>&nbsp;<span class="maxdisc_amount">(<em class="cpnDcAmt">0</em>원할인)</span>

+									</label>

 								</div>

 							</dd>

 						</div>

 						<div>

 							<dt>

-								할인쿠폰 <span class="maxdisc_amount">총&nbsp;<em>3,000</em>원

-									할인

-								</span>

+								할인쿠폰 <span class="maxdisc_amount">총&nbsp;<em class="goodsCartCpnDcAmt">0</em>원 할인</span>

 							</dt>

 							<dd>

 								<div class="sale_coupon_box">

-									<div>

-										<button type="button" id="btn_couponModify_pop"

-											class="btn btn_default btn_sm">

-											<span>쿠폰변경</span>

-										</button>

-									</div>

+									<th:block th:if="${goodsApplyCpnList.size() > 0} or ${cartCpnList.size() > 0}">

+										<div>

+											<button type="button" id="btn_couponModify_pop" class="btn btn_default btn_sm">

+												<span>쿠폰변경</span>

+											</button>

+										</div>

+									</th:block>

 									<div class="form_field">

 										<div class="input_wrap">

-											<input type="text" class="form_control" maxlength="13"

-												placeholder="할인코드를 입력해주세요.">

-											<button type="button" class="btn btn_dark btn_sm">

+											<input type="text" class="form_control" maxlength="13" placeholder="할인코드를 입력해주세요.">

+											<button type="button" class="btn btn_dark btn_sm" onclick="serialCpnApply()">

 												<span>적용</span>

 											</button>

 										</div>

@@ -77,44 +75,70 @@
 
 								</div>

 							</dd>

 						</div>

-						<div>

-							<dt>배송비 쿠폰</dt>

-							<dd>

-								<div class="dlvr_fee_box">

-									<div class="form_field">

-										<div class="select_custom coupon_list">

-											<!-- 비활성화시 disabled 추가 -->

-											<div class="combo">

-												<div class="select">

-													<div class="dlvr_coupon">

-														<p class="empty">선택</p>

+						

+						<!-- 배송비쿠폰 -->

+						<th:block th:if="${delvCpnList.size() > 0}">

+							<div>

+								<dt>배송비 쿠폰</dt>

+								<dd>

+									<div class="dlvr_fee_box">

+										<!-- 쿠폰 선택 전 -->

+										<div class="form_field">

+											<div class="select_custom coupon_list"><!-- 비활성화시 disabled 추가 -->

+												<div class="combo">

+													<div class="select">

+														<div class="dlvr_coupon" id="btn_delvCouponModify_pop">

+															<p class="empty">선택</p>

+														</div>

 													</div>

 												</div>

 											</div>

 										</div>

-									</div>

-									<div class="form_field">

-										<div class="select_custom" disabled>

-											<div class="combo">

-												<div class="select">

-													<div class="dlvr_coupon">

-														<p class="empty">적용 가능한 쿠폰이 없습니다</p>

+										<!-- 쿠폰 선택 전 -->

+										

+										<!-- 쿠폰 선택 적용 시 

+										<div class="form_field">

+											<div class="select_custom coupon_list">

+												<div class="combo">

+													<div class="select">

+														<div class="dlvr_coupon">

+															<p class="name">TBJ 배송비 무료쿠폰</p>

+															<p class="txt"><span>30,000</span>원 이상 구매시 최대 <span>3,000</span>원 할인</p>

+															<p class="discount"><span>15,000</span>원 할인</p>

+														</div>

 													</div>

 												</div>

-												<ul class="list">

-													<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true"추가  -->

-													<li class="selected">

+											</div>

+										</div>

+										<!-- //쿠폰 선택 적용 시 -->

+										

+										<!-- 적용 쿠폰 없을 시

+										<div class="form_field">

+											<div class="select_custom" disabled>

+												<div class="combo">

+													<div class="select">

 														<div class="dlvr_coupon">

 															<p class="empty">적용 가능한 쿠폰이 없습니다</p>

 														</div>

-													</li>

-												</ul>

+													</div>

+													

+													<ul class="list">

+														<li class="selected">

+															<div class="dlvr_coupon">

+																<p class="empty">적용 가능한 쿠폰이 없습니다</p>

+															</div>

+														</li>

+													</ul>

+												</div>

 											</div>

-										</div>

+										</div>      

+										<!-- //적용 쿠폰 없을 시 -->

 									</div>

-								</div>

-							</dd>

-						</div>

+								</dd>

+							</div>

+						</th:block>

+						<!-- //배송비쿠폰 -->

+						

 					</dl>

 				</div>

 				<div class="area_selpoint">

@@ -124,24 +148,19 @@
 
 							<dd>

 								<div class="form_field">

 									<div>

-										<input type="radio" name="rdi-beforpoint"

-											id="rdi-beforpoint1" value="" checked=""> <label

-											for="rdi-beforpoint1"><span>사용 안함</span></label>

+										<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint1" value="" checked=""> 

+										<label for="rdi-beforpoint1"><span>사용 안함</span></label>

 									</div>

 									<div>

-										<input type="radio" name="rdi-beforpoint"

-											id="rdi-beforpoint2" value=""> <label

-											for="rdi-beforpoint2"><span>사용함</span></label> <span

-											class="useable_point">(<em>1,500P</em>&nbsp;사용 가능)

-										</span>

+										<input type="radio" name="rdi-beforpoint" id="rdi-beforpoint2" value="">

+										<label for="rdi-beforpoint2"><span>사용함</span></label> 

+										<span class="useable_point">(<em>1,500P</em>&nbsp;사용 가능)</span>

 									</div>

 								</div>

 							</dd>

 						</div>

 						<div>

-							<dt>

-								STYLE24 포인트 <span>결제금액의 최대 40%까지 사용가능</span>

-							</dt>

+							<dt>STYLE24 포인트 <span>결제금액의 최대 40%까지 사용가능</span></dt>

 							<dd>

 								<div class="form_field">

 									<!-- 스타일 포인트 3만원 이상 결제시 노출 -->

@@ -153,6 +172,7 @@
 
 										</button>

 									</div>

 									<!-- 스타일 포인트 3만원 이상 결제시 노출 -->

+									

 									<!-- 스타일 포인트 3만원 미만 결제시 노출 -->

 									<div class="input_wrap">

 										<input type="text" class="form_control" maxlength=""

@@ -163,10 +183,7 @@
 
 										</button>

 									</div>

 									<!-- //스타일 포인트 3만원 미만 결제시 노출 -->

-									<p>

-										<span class="remain_point">보유:&nbsp;<em>25,500</em>P

-										</span>

-									</p>

+									<p><span class="remain_point">보유:&nbsp;<em>25,500</em>P</span></p>

 								</div>

 							</dd>

 						</div>

@@ -175,16 +192,12 @@
 
 							<dd>

 								<div class="form_field">

 									<div class="input_wrap">

-										<input type="text" class="form_control" maxlength=""

-											placeholder="사용할 금액을 입력해주세요.">

+										<input type="text" class="form_control" maxlength="" placeholder="사용할 금액을 입력해주세요.">

 										<button type="button" class="btn btn_dark btn_sm">

 											<span>적용</span>

 										</button>

 									</div>

-									<p>

-										<span class="remain_point">보유:&nbsp;<em>25,500</em>원

-										</span>

-									</p>

+									<p><span class="remain_point">보유:&nbsp;<em>25,500</em>원</span></p>

 								</div>

 							</dd>

 						</div>

@@ -206,9 +219,6 @@ $(document).ready( function() {
 
 		$("#dcAmtInfo .fold_head").addClass("on");

 		$("#dcAmtInfo .fold_cont").show();

 	}

-	

-	//할인쿠폰(배송비) 선택

-    var od_dlvrfee_coupon_selecter = new sCombo('.od .odPayment .dlvr_fee_box .select_custom.coupon_list');

 });

 </script>

 </html>

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/order/OrderDeliveryAddrInfoMob.html
Переглянути файл 

@@ -51,7 +51,7 @@
 
 									<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">

 										<em class="tag_stype1">기본배송지</em> 

 									</th:block>

-									<em class="tag_stype2 shotDelv">총알배송</em>

+									<em class="tag_stype2 shotDelv" style="display:none">총알배송</em>

 								</span>

 							</dd>

 						</div>

@@ -116,7 +116,7 @@ var deliveryAddrInfoDispYn = function(temp) {
 
 

 //컨텐츠 호출

 $(document).ready( function() {

-	var delvMemoArr = ["문 앞", "직접받고 부재시 문 앞", "경비실", "택배함"];

+	var delvMemoArr = ["문 앞", "직접 받고 부재 시 문 앞", "경비실", "택배함"];

 	var tempMemo = true;

 	

 	$("#orderForm .ship_request .delivery_list li").removeClass("selected");

+ 44 - 0
src/main/webapp/WEB-INF/views/mob/order/OrderDelvCouponApplyPopMob.html
Переглянути файл 

@@ -0,0 +1,44 @@
 
+<!DOCTYPE html>

+<html lang="ko" xmlns:th="http://www.thymeleaf.org">

+<div class="lap">

+	<div class="popup_close">카테고리닫기</div>

+	<div class="popup_head"><h2>옵션변경</h2></div>

+	<div class="popup_con">

+		<ul class="list" style="display: block;">

+			<input type="hidden" name="cpnType" value="delvCpn"/>

+			<input type="hidden" name="custCpnSq" value="0"/>

+			<input type="hidden" name="cpnDcAmt" value="0"/>

+			<input type="hidden" name="delvFeeCd" value="0"/>

+			

+			<th:block th:each="delvCpn, k : ${delvCpnList}">

+				<li class="delvCpn" th:value="${delvCpn.custCpnSq}" th:data="${delvCpn.cpnDcAmt}" th:delvfeecd="${delvCpn.delvFeeCd}" th:delvfee="${delvCpn.delvFee}">

+					<button type="button" class="dlvr_coupon">

+						<p class="name"  th:text="${delvCpn.cpnNm}"></p>

+						<p class="discount"><span th:text="${#numbers.formatInteger(delvCpn.cpnDcAmt, 1, 'COMMA')}">0</span>원 할인</p>

+					</button>

+				</li>

+			</th:block>

+			<li class="delvCpn" value="0" data="0" delvfeecd="0" delvfee="0">

+				<button type="button" class="dlvr_coupon">

+					<p class="empty">적용 안함</p>

+				</button>

+			</li>

+		</ul>

+	</div>

+</div>

+

+<script th:inline="javascript">

+//컨텐츠 호출

+$(document).ready( function() {

+

+});

+

+// 배송비쿠폰 팝업 닫기

+$('.couponSelectPop02 .popup_close').on("click",function(){

+	$('.popup_box').hide();

+	$('.popup_box').removeClass('active');

+	$("body").css({"overflow":"visible"});

+});

+</script>

+

+</html>

+ 33 - 24
src/main/webapp/WEB-INF/views/mob/order/OrderEntryInfoMob.html
Переглянути файл 

@@ -21,56 +21,46 @@
 
 			<div class="fold_head">

 				<a href="javascript:void(0)">

 					<div>

-						<div class="fold_tit">

-							<span>개인통관고유부호</span>

-						</div>

-						<div class="data">

-							<span>P123456789</span>

-						</div>

+						<div class="fold_tit"><span>개인통관고유부호</span></div>

+						<div class="data"><span></span></div>

 					</div>

 				</a>

 			</div>

 			<div class="fold_cont">

 				<div class="area_overseas">

 					<div class="info_txt">

-						<ul>

-							<li>물품가액이 $150 초과할 경우 관/부가세가 발생 할 수 있으며, 물품 종류와 해외공급자

-								관계없이 같은 날 입항하게 되면 합산과세 대상이 됩니다.</li>

-						</ul>

+						<ul><li>물품가액이 $150 초과할 경우 관/부가세가 발생 할 수 있으며, 물품 종류와 해외공급자 관계없이 같은 날 입항하게 되면 합산과세 대상이 됩니다.</li></ul>

 					</div>

 					<div class="form_field">

 						<div>

-							<input type="radio" name="rdi-overseas" id="rdi-overs1" value="" checked=""> 

+							<input type="radio" name="rdi-overseas" id="rdi-overs1" value="Y"> 

 							<label for="rdi-overs1"><span>받는사람 개인통관고유부호</span></label>

 						</div>

 						<div>

-							<input type="radio" name="rdi-overseas" id="rdi-overs2" value=""> 

+							<input type="radio" name="rdi-overseas" id="rdi-overs2" value="N" checked> 

 							<label for="rdi-overs2"><span>입력 안 함</span></label>

 						</div>

-						<div class="info_box overs1">

+						<div class="info_box overs1" style="display:none;">

 							<div class="input_wrap">

-								<input type="text" class="form_control err" maxlength="13" placeholder="P로 시작하는 13자리">

+								<input type="text" name="entryNo" class="form_control" maxlength="13" placeholder="P로 시작하는 13자리">

 								<!-- 유효하지 않은 개인통관고유부호 일때 class명 'err' 추가 -->

 							</div>

-							<div class="t_err">개인통관고유부호가 유효하지 않습니다.</div>

+							<div class="t_err" style="display:none;">개인통관고유부호가 유효하지 않습니다.</div>

 							<!-- 유효하지 않은 개인통관고유부호 일때 노출 -->

 							<div class="agree_overs">

-								<input id="chk-overs-agr" type="checkbox" checked="">

+								<input id="chk-overs-agr" type="checkbox">

 								<label for="chk-overs-agr">

 									<span>위 정보는 원활한 통관을 위해 수집 및 판매자에게 제공하며,계속 사용하도록 안전하게 STYLE24에서 저장 / 관리 합니다.&nbsp;&nbsp;<em class="tmark_required">(필수)</em></span>

 								</label>

 							</div>

 							<div class="btn_group btn_group_flex">

-								<div>

-									<button type="button" class="btn btn_dark">입력완료</button>

-								</div>

+								<div><button type="button" class="btn btn_dark">입력완료</button></div>

 							</div>

 						</div>

 						<div class="info_box overs2" style="display: none;">

 							<div class="info_txt type2">

 								<ul>

-									<li>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을 드릴

-										예정입니다.</li>

+									<li>개인통관고유부호를 입력하지 않아도 관세사무소에서 개인정보 확인을 위해 별도 연락을 드릴 예정입니다.</li>

 								</ul>

 							</div>

 						</div>

@@ -85,12 +75,31 @@
 
 <script th:inline="javascript">

 var dispYn = [[${order.dispYn}]]; // 노출여부

 

+// 화면노출

+var entryInfoDispYn = function(temp) {

+	if (temp == "Y") {

+		$("#entryInfo .fold_head").addClass("on");

+		$("#entryInfo .fold_cont").show();

+	} else {

+		$("#entryInfo .fold_head").removeClass("on");

+		$("#entryInfo .fold_cont").hide();

+	}

+}

+

 //컨텐츠 호출

 $(document).ready( function() {

 	// 화면펼침

-	if (dispYn == "Y") {

-		$("#custemerInfo .fold_head").addClass("on");

-		$("#custemerInfo .fold_cont").css("display", "block");

+	entryInfoDispYn(dispYn);

+});

+

+// 개인통관부호 유효성체크

+$("#orderForm input[name=entryNo]").on("change", function(){

+	if ($(this).val().length > 0 && $(this).val().length < 13) {

+		$(this).parent().parent().find(".t_err").show();

+		$(this).addClass("err");

+	} else {

+		$(this).parent().parent().find(".t_err").hide();

+		$(this).removeClass("err");

 	}

 });

 </script>

+ 127 - 113
src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html
Переглянути файл 

@@ -364,7 +364,7 @@
 
 				<div class="btn_group btn_group_flex">

 					<div>

 						<button type="button" class="btn btn_primary">

-							동의 후 <span class="total_price">123,456,789</span>원 결제하기

+							동의 후 <span class="total_price" id="btn_payment">0</span>원 결제하기

 						</button>

 					</div>

 				</div>

@@ -374,23 +374,12 @@
 
 </main>

 

 <!-- 할인쿠폰 변경 팝업 -->

-<div class="modal pop_full couponModify_pop" id="couponModifyPop" tabindex="-1" role="dialog" aria-labelledby="couponModifyLabel" aria-hidden="true">

-	<div class="modal-dialog" role="document">

-		<div class="modal-content">

-		</div>

-	</div>

-	<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>

-</div>

+<div class="modal pop_full couponModify_pop" id="couponModifyPop" tabindex="-1" role="dialog" aria-labelledby="couponModifyLabel" aria-hidden="true"></div>

 <!-- //할인쿠폰 변경 팝업 -->

 

 <!-- 배송비 쿠폰선택_팝업 -->

-<div id="couponSelectPop02" class="popup_box couponSelectPop couponSelectPop02">

-	<div class="lap">

-	</div>

-</div>

+<div id="couponSelectPop02" class="popup_box couponSelectPop couponSelectPop02"></div>

 <!-- //배송비 쿠폰선택_팝업 -->

-	

-	

 

 <script th:inline="javascript">

 // 배송관련정보 변수선언

@@ -497,9 +486,9 @@ var custemerInfoSet = function() {
 
 				$("#custemerInfo").html(result);

 

 				// 고객정보설정

-				$(".custNm").text($("#orderForm input[name='custNm']").val());

-				$(".email").text($("#orderForm input[name='email']").val());

-				$(".cellPhnno").text($("#orderForm input[name='cellPhnno']").val());

+				$("#orderAmtForm .custNm").text($("#orderForm input[name='custNm']").val());

+				$("#orderAmtForm .email").text($("#orderForm input[name='email']").val());

+				$("#orderAmtForm .cellPhnno").text($("#orderForm input[name='cellPhnno']").val());

 			}

 			

 			// 1.2 개인통관부호 정보

@@ -625,35 +614,6 @@ var deliveryAddrInfoSet = function(delvObj, temp) {
 
 					});	

 				}

 			});

-			

-			/*

-			// 2.2 배송요청사항 팝업열기

-			$("#btn_rqstModify_pop").on("click", function(e){

-				var jsonObj = new Object();

-				jsonObj.delvMemo = $("#orderForm input[name=delvMemo]").val();

-

-				$.ajax({

-					type		: "POST",

-					url 		: "/common/delvMemoChangePop",

-					data		: JSON.stringify(jsonObj),

-					dataType 	: "html",

-					beforeSend 	: function(xhr, settings) {

-						xhr.setRequestHeader("AJAX"			, "true");

-						xhr.setRequestHeader('Accept'		, 'application/json');

-						xhr.setRequestHeader('Content-Type'	, 'application/json');

-						gagajf.showProgressbar(true);

-					},

-					success 	: function(result) {

-						if (result != null) {

-							$("#rqstModifyPop .modal-dialog .modal-content").html(result);

-							$("#rqstModifyPop").modal("show");

-						}

-					}

-				});

-				

-				return false;

-			});

-			*/

 

 			// 1.3 총알배송가능 지역, 총알배송 가능 시간 체크(초기로드정보)

 			fnGetDailyDeliveryCheck(temp);

@@ -736,9 +696,9 @@ var orderListInfoSet = function(orderListJsonData, temp) {
 
 				

 				// 총알배송건수가 있으면 총알배송 태그 표시

 				if (parseInt($("#orderForm input[name=shotCnt]").val()) > 0 ) {

-					$(".shotDelv").show();

+					$("#orderForm .shotDelv").show();

 				} else {

-					$(".shotDelv").hide();

+					$("#orderForm .shotDelv").hide();

 				}

 			}

 			

@@ -769,18 +729,13 @@ var freegiftInfoSet = function() {
 
 				$("#freegiftInfo").html(result);

 				var total_gift 		= 0;

 				var total_deduct 	= 0;

-				

-				/*

+

 				// 2.2 사은품선택 라디오 버튼 기능

-				$(".freegiftRdo").on("click", function() {

+				$("#orderForm .freegiftRdo").on("click", function() {

 					total_gift 		= 0;

 					total_deduct 	= 0;

 					

-					$(".freegiftRdo").each(function(){

-						if ($(this).attr("allYn") == "Y" ) {

-							total_gift 		+= 1;

-						}

-						

+					$("#orderForm .freegiftRdo").each(function(){

 						// 라디오버튼 사은품 체크

 						if ($(this).is(":checked")) {

 							// 수령거부가 아닐때 체크

@@ -791,22 +746,27 @@ var freegiftInfoSet = function() {
 
 						}

 					});

 					

-					$(".total_gift").text(total_gift);							// 사은품총선택개수

-					$(".total_deduct").text(total_deduct.addComma());			// 사은품총사용포인트

-					$(".freegiftUsePnt").text(total_deduct);

+					$("#orderForm .total_gift").text(total_gift);							// 사은품총선택개수

+					$("#orderForm .total_deduct").text(total_deduct.addComma());			// 사은품총사용포인트

+					$("#orderAmtForm .freegiftUsePnt").text(total_deduct);

 					

 					// 포인트초기화기능

 					pntDcAmtReset();

 				});

-				*/

+				

+				total_gift = 0;

 				

 				// 사은품테이블 그리기

-				$(".gift_box").each(function(){

+				$("#orderForm .gift_box").each(function(){

 					$(this).find(".freegiftRdo").each(function(){

-						if ($(this).attr("allYn") == "Y" ) {

-							total_gift += 1;

+						if ($(this).is(":checked")) {

+							// 수령거부가 아닐때 체크

+							if ($(this).val() != "noSel") {

+								total_gift 		+= 1;

+								total_deduct 	+= parseInt($(this).attr("usepoint"));

+							}

 						}

-						$(".total_gift").text(total_gift);						// 사은품총선택개수

+						$("#orderForm .total_gift").text(total_gift);						// 사은품총선택개수

 					});

 				});

 			}

@@ -835,8 +795,7 @@ var paymentInfoSet = function() {
 
 			if (result != null) {

 				$("#paymentInfo").css("display", "block");

 				$("#paymentInfo").html(result);

-				

-				/*

+

 				// 결제타입명칭 설정

 				$("#orderForm .area_paymethod .paymethod_box ul li").on("click", function(){

 					var payType = $(this).find(".payType").text();

@@ -848,8 +807,8 @@ var paymentInfoSet = function() {
 
 				// 결재하기

 				$("#btn_payment").on("click", function(){

 					// 사은품정보

-					var prePntDcAmtYn		= $("input[name='rdi-beforpoint']:checked").val();

-					var paynormal			= $("input[name='rdi-paynormal']:checked").val();

+					var prePntDcAmtYn		= $("#orderForm input[name='rdi-beforpoint']:checked").val();

+					var paynormal			= $("#orderForm input[name='rdi-paynormal']:checked").val();

 					var orderDetailList		= [];

 					var delvFeeCdList		= [];

 					var ordGoodsQty			= 0;

@@ -865,7 +824,7 @@ var paymentInfoSet = function() {
 
 								$('#orderForm input[name=entryNo]').focus();

 								

 								// 배송정보화면노출

-								deliveryAddrInfoDispYn("Y");

+								entryInfoDispYn("Y");

 								return false;

 							}

 							

@@ -876,15 +835,15 @@ var paymentInfoSet = function() {
 
 								$('#orderForm input[name=entryNo]').focus();

 								

 								// 배송정보화면노출

-								deliveryAddrInfoDispYn("Y");

+								entryInfoDispYn("Y");

 								return false;

 							}

 							

-							if (!$("#chk-overs-agr").is(":checked")) {

+							if (!$("#orderForm #chk-overs-agr").is(":checked")) {

 								mcxDialog.alert("개인통관정보고유부호 정보 동의/저장항목을 체크해주세요.");

 								

 								// 배송정보화면노출

-								deliveryAddrInfoDispYn("Y");

+								entryInfoDispYn("Y");

 								return false;

 							}

 						}

@@ -892,18 +851,18 @@ var paymentInfoSet = function() {
 
 					

 					// 주문제작상품일때 주문제작정보동의

 					if (orderMadeYn == "Y") {

-						if (!$("#chk-custom-agr1").is(":checked")) {

+						if (!$("#orderForm #chk-custom-agr1").is(":checked")) {

 							mcxDialog.alert("주문제작상품 정보 동의를 체크해주세요.");

 							

 							// 배송정보화면노출

-							deliveryAddrInfoDispYn("Y");

+							madeInfoDispYn("Y");

 							return false;

 						}

 					}

 					

 					// 사은품지급할 경우 체크

-					if ($(".freegiftValArr").text().length > 0) {

-						if (!$("#chk-agree_gift").is(":checked")) {

+					if ($("#orderAmtForm .freegiftValArr").text().length > 0) {

+						if (!$("#orderForm #chk-agree_gift").is(":checked")) {

 							mcxDialog.alert("사은품 지급 정보 동의를 체크해주세요.");

 							

 							// 배송정보화면노출

@@ -1049,7 +1008,6 @@ var paymentInfoSet = function() {
 
 						}

 					});

 				});

-				*/

 

 				// 1.8 할인영역 설정 (로그인여부일때 동작)

 				if (isLogin == true) {

@@ -1117,9 +1075,8 @@ var dcAmtInfoSet = function() {
 
 			if (result != null) {

 				$("#dcAmtInfo").css("display", "block");

 				$("#dcAmtInfo").html(result);

-				

-				/*

-				// 쿠폰팝업정보로드

+

+				// 상품쿠폰 팝업정보로드

 				$.ajax( {

 					type		: "POST",

 					url 		: '/order/couponApplyPop',

@@ -1134,14 +1091,21 @@ var dcAmtInfoSet = function() {
 
 					success 	: function(result) {

 						$("#couponModifyPop").html(result);

 						

-						// 1.8.1 선포인트기능초기환

-						prePntDcAmtReset();

+						// 1.8.1 선포인트기능초기화

+						//prePntDcAmtReset();

 						

 						// 1.8.2 쿠폰적용초기화(할인율최고)(상품,장바구니)

 						custGoodsCpnInit();

 						

-						// 1.8.3 쿠폰적용초기화(할인율최고)(배송비)

-						custDelvCpnInit();

+						// 상품상세쿠폰 팝업 열기

+						$("#couponModifyPop .area_item_coupon .form_field .select_custom").on("click", function() {

+							var index 	= parseInt($(this).attr("value"));

+							var obj 	= $(".couponSelectPop").eq(index);

+							

+							obj.show().addClass("active");

+							

+							$("body").css({"overflow":"hidden"});

+						});

 						

 						// 1.8.4 쿠폰적용버튼

 						$("#btn_coupon_apply").on("click", function(){

@@ -1179,14 +1143,41 @@ var dcAmtInfoSet = function() {
 
 					}

 				});

 				

-				// 쿠폰변경팝업호출

+				// 배송비쿠폰 팝업정보로드

+				$.ajax( {

+					type		: "POST",

+					url 		: '/order/delvCouponApplyPop',

+					data		: JSON.stringify(jsonObj),

+					dataType 	: 'html',

+					beforeSend : function(xhr, settings) {

+						xhr.setRequestHeader("AJAX"			, "true");

+						xhr.setRequestHeader('Accept'		, 'application/json');

+						xhr.setRequestHeader('Content-Type'	, 'application/json');

+						gagajf.showProgressbar(true);

+					},

+					success 	: function(result) {

+						$("#couponSelectPop02").html(result);

+						

+						// 1.8.3 쿠폰적용초기화(할인율최고)(배송비)

+						custDelvCpnInit();

+					}

+				});

+				

+				// 상품쿠폰, 장바구니쿠폰 팝업 열기

 				$("#btn_couponModify_pop").on("click", function(){

-					// 쿠폰초기화

-					custGoodsCpnInit();

-					

 					$("#couponModifyPop").modal("show");

+					return false;

+				});

+

+				// 배송비상세쿠폰 팝업 열기

+				$(".od .area_seldiscount .dlvr_fee_box .select_custom").on("click", function() {

+					$('#couponSelectPop02').show().addClass("active");

+					$("body").css({"overflow":"hidden"});

 				});

 				

+				

+				

+				/*

 				// 1.8.7 포인트 적용버튼 기능

 				$("#btn_point_apply").on("click", function(){

 					var rmPntAmt 			= parseInt($("#orderForm input[name='rmPntAmt']").val());

@@ -1303,12 +1294,12 @@ var custGoodsCpnInit = function() {
 
 	$("#chk-maxdisc").attr("checked", true);

 	

 	// 쿠폰초기화

-	$(".goodsCpn").each(function(index){

+	$("#couponModifyPop .goodsCpn").each(function(index){

 		// select box 쿠폰 적용

 		var cpnCartSq = $(this).find("input[name='cpnCartSq']").val();

 		

 		// 장바구니시퀀스 체크

-		$(".cartSq").each(function(){

+		$("#orderAmtForm .cartSq").each(function(){

 			if (cpnCartSq == $(this).text()) {

 				$(this).parent().find(".goodsCpnSq").text("0");			// 상품쿠폰시퀀스

 				$(this).parent().find(".goodsCpnDcAmt").text("0");		// 상품쿠폰할인금액

@@ -1319,17 +1310,37 @@ var custGoodsCpnInit = function() {
 
 		$(this).find("input[name='cpnDcAmt']").val("0");

 		

 		// 적용안함 적용

-		var emptyHtml = $(this).find("ul li .item_coupon.empty").html();

+		var index 		= parseInt($(this).attr("value"));

+		var cpnObj 		= $(".couponSelectPop").eq(index);

+		var emptyHtml 	= cpnObj.find("ul li:last-child").html();

+

 		$(this).find(".select .item_coupon").html(emptyHtml);

-		

-		$(this).find("ul li").removeClass("selected");

 	});

 

-	// 최대할인율 쿠폰적용

-	$('.goodsCpn').each(function(index){

-		cpnIndex 		= 0;

+	// 상품쿠폰 최대할인율 쿠폰적용

+	$('#couponModifyPop .goodsCpn').each(function(index){

 		cpnApplyTemp 	= false;

 		

+		// select box 적용

+		$("#couponModifyPop .couponSelectPop ul li").each(function(){

+			cpnIndex++;

+			

+			if (cpnApplyTemp == false) {

+				if (custCpnDuplicationCheck($(this).attr("value"), index)) {

+					// 쿠폰적용

+					custCpnApply($(this), index);

+					// 쿠폰할인적용

+					cpnApplyTemp = true;

+				}

+			}

+		});

+		

+		

+		

+		

+		

+		

+		/*

 		// select 박스 반복문 실행

 		$(this).find("ul li").each(function(i){

 			cpnIndex++;

@@ -1354,8 +1365,9 @@ var custGoodsCpnInit = function() {
 
 				}

 			});

 		});

+		*/

 	});

-	

+

 	// 장바구니쿠폰초기화 

 	custCartCpnInit();

 }

@@ -1363,7 +1375,7 @@ var custGoodsCpnInit = function() {
 
 // 1.9.2 장바구니쿠폰초기화

 var custCartCpnInit = function() {

 	// 장바구니쿠폰 초기화 적용

-	$(".cartCpn").each(function(index) {

+	$("#couponModifyPop .cartCpn").each(function(index) {

 		if (index == 0) {

 			custCpnApply($(this)); // 쿠폰적용

 		}

@@ -1411,7 +1423,7 @@ var custCpnDuplicationCheck = function(custCpnSq, index) {
 
 	}

 

 	// 쿠폰중본사용체크

-	$(".goodsCpn input[name='custCpnSq']").each(function(i){

+	$("#couponModifyPop .goodsCpn input[name='custCpnSq']").each(function(i){

 		if (index != i) {

 			selCustSq = $(this).val();

 			if (selCustSq == custCpnSq) {

@@ -1524,31 +1536,31 @@ var custCpnApplyTemp = function(obj) {
 
 }

 

 // 1.11 쿠폰중복체크 후 적용가능

-var custCpnApply = function(obj) {

+var custCpnApply = function(obj, index) {

 	// select box 쿠폰 적용

-	var cpnType 	= obj.parent().find("input[name='cpnType']").val();

+	var cpnType	= $("input[name=cpnType]").val();

 	

 	// 상품쿠폰적용

 	if (cpnType == "goodsCpn") {

-		var itemHtml = obj.find(".item_coupon").html();

-		obj.parent().parent().find(".select .item_coupon").html(itemHtml);

-		obj.parent().find("input[name='cpnDcAmt']").val(obj.attr("data"));

-		obj.parent().find("input[name='custCpnSq']").val(obj.attr("value"));

+		// 적용안함 적용

+		var cpnObj 		= $(".couponSelectPop").eq(index);

+		var itemHtml 	= obj.find(".dlvr_coupon").html();

 		

-		var cpnCartSq 	= obj.parent().parent().find("input[name='cpnCartSq']").val();

+		$("#couponModifyPop .goodsCpn .select .item_coupon").eq(index).html(itemHtml);

+		$("#couponModifyPop .goodsCpn input[name='cpnDcAmt']").eq(index).val(obj.attr("data"));

+		$("#couponModifyPop .goodsCpn input[name='custCpnSq']").eq(index).val(obj.attr("value"));

+

+		var cpnCartSq 	= $("#couponModifyPop .goodsCpn input[name='cpnCartSq']").eq(index).val()

 		

 		// 장바구니시퀀스 체크

-		$(".cartSq").each(function(){

+		$("#orderForm .cartSq").each(function(){

 			if (cpnCartSq == $(this).text()) {

 				$(this).parent().find(".goodsCpnSq").text(obj.prop("value"));			// 상품쿠폰시퀀스

 				$(this).parent().find(".goodsCpnDcAmt").text(obj.attr("data"));			// 상품쿠폰할인금액

 			}

 		});

 		

-		// 선택활성화

-		$(obj).addClass("selected");

-		

-		//상품쿠폰 선택불가 처리

+		// 상품쿠폰 선택불가 처리

 		custCpnSqLiDisabled();

 	} 

 	// 장바구니쿠폰적용

@@ -1658,7 +1670,7 @@ var custCpnApply = function(obj) {
 
 	else if (cpnType == "delvCpn") {

 		// 적용안함 적용

 		var itemHtml = obj.find(".dlvr_coupon").html();

-		obj.parent().parent().find(".select .dlvr_coupon").html(itemHtml);

+		$("#orderForm .dlvr_fee_box .dlvr_coupon").html(itemHtml);

 		

 		obj.parent().find("input[name='cpnDcAmt']").val(obj.attr("data"));

 		obj.parent().find("input[name='custCpnSq']").val(obj.attr("value"));

@@ -1667,7 +1679,7 @@ var custCpnApply = function(obj) {
 
 		var delvFeeCd = obj.attr("delvfeecd");

 		

 		// 배송비쿠폰 테이블 적용

-		$(".delvFeeCd").each(function(){

+		$("#orderAmtForm .delvFeeCd").each(function(){

 			// 배송비쿠폰적용

 			if ($(this).text() == delvFeeCd) {

 				$(this).parent().find(".delvCpnSq").text(obj.attr("value"));

@@ -1679,6 +1691,8 @@ var custCpnApply = function(obj) {
 
 				$(this).parent().find(".delvCpnDcAmt").text(obj.attr("data"));

 			}

 		});

+		

+		$('.couponSelectPop02 .popup_close').trigger("click");

 	}

 	

 	// 포인트기능 리렛

+ 28 - 20
src/main/webapp/WEB-INF/views/mob/order/OrderFreegiftInfoMob.html
Переглянути файл 

@@ -2,15 +2,15 @@
 
 <html lang="ko" xmlns:th="http://www.thymeleaf.org">

 <!--

  *******************************************************************************

- * @source  : OrderFormWeb.html

- * @desc    : 주문/결제 Page

+ * @source  : OrderFreegiftInfoMob.html

+ * @desc    : 주문 사은품 Page

  *============================================================================

  * STYLE24

  * Copyright(C) 2020 TSIT, All rights reserved.

  *============================================================================

  * VER  DATE         AUTHOR      DESCRIPTION

  * ===  ===========  ==========  =============================================

- * 1.0  2021.02.01   jsh77b     최초 작성

+ * 1.0  2021.04.05   jsh77b     최초 작성

  *******************************************************************************

  -->

 

@@ -21,12 +21,11 @@
 
 			<div class="fold_head">

 				<a href="javascript:void(0)">

 					<div>

-						<div class="fold_tit">

-							<span>사은품</span>

+						<div class="fold_tit"><span>사은품</span>

 						</div>

 						<div class="data">

 							<span>사은품 총 <em class="total_gift">0</em>개 선택</span> 

-							<span><em class="total_deduct">0</em>P 차감</span>

+							<span><em class="total_deduct">0</em> P차감</span>

 						</div>

 					</div>

 				</a>

@@ -34,19 +33,27 @@
 
 			<div class="fold_cont">

 				<div class="area_selgift">

 					<th:block th:each="freegift, i : ${freegiftList}">

+						<!-- 필수사은품 -->

 						<th:block th:if="${freegift.allYn} == 'Y'">

 							<div class="gift_box necessary_gift_box">

 						</th:block>

+						<!-- //필수사은품 -->

+						<!-- 선택사은품 -->

 						<th:block th:if="${freegift.allYn} == 'N'">

 							<div class="gift_box">

 						</th:block>

+						<!-- //선택사은품 -->

 							<p class="txt">

+								<!-- 필수사은품 -->

 								<th:block th:if="${freegift.allYn} == 'Y'">

 									<span th:text="|사은품필수 ${i.count}|"></span>

 								</th:block>

+								<!-- //필수사은품 -->

+								<!-- 선택사은품 -->

 								<th:block th:if="${freegift.allYn} == 'N'">

 									<span th:text="|사은품선택 ${i.count}|"></span>

 								</th:block>

+								<!-- //선택사은품 -->

 								<th:block th:text="${freegift.freegiftNm}"></th:block>

 							</p>

 							<div class="form_field">

@@ -73,19 +80,18 @@
 
 										<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">

 											<div class="gift">

 												<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" th:usepoint="${freegiftGoods.usePoint}" allYn="N">

-												<label for="rdi-gift1">

+												<label th:for="'rdi-gift'+${i.count}+${k.count}">

 													<span class="thumb"><img src="/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>

 													<span class="name" th:text="${freegiftGoods.goodsNm}"></span> 

 													<span th:if="${freegiftGoods.usePoint} < 1" class="deduct" th:text="무료"></span>

 													<span th:if="${freegiftGoods.usePoint} > 0" class="deduct" th:text="|${#numbers.formatInteger(freegiftGoods.usePoint, 1, 'COMMA')} P|"></span>

 												</label>

 											</div>

-										

 										</th:block>

 									</th:block>

 									<div class="gift">

 										<input type="radio" th:name="'rdi-gift'+${i.count}" th:id="${i.count}+'0'" class="chk_img freegiftRdo" value="noSel" usepoint="0" allYn="N"> 

-										<label for="rdi-gift4">

+										<label th:for="${i.count}+'0'">

 											<span class="thumb"><img src="/images/pc/thumb/tmp_gift_empty.jpg" width="" alt=""></span>

 											<span class="name">사은품 수령안함</span> <span class="deduct">수령거부</span>

 										</label>

@@ -100,24 +106,20 @@
 
 						<div class="agree_gift">

 							<p>

 								<input id="chk-agree_gift" type="checkbox">

-								<labelfor="chk-agree_gift"><span>동의합니다</span></label>

+								<label for="chk-agree_gift"><span>동의합니다</span></label>

 							</p>

 							<p class="txt">사은품 지금에 대한 내용을 확인하였으며, 이에 동의합니다.</p>

 							<button type="button" class="btn_link_popup" id="btn_infoGift_btn">

 								<span>보기</span>

 							</button>

 						</div>

+						<!-- 210405_p태그 수정 -->

 						<div class="agree_gift_con">

-							<p>제1장 총칙 제1조(목적) 본 약관은 정부24 (이하 "당 사이트")가 제공하는 모든 서비스(이하

-								"서비스")의 이용조건 및 절차, 이용자와 당 사이트의 권리, 의무, 책임사항과 기타 필요한 사항을 규정함을

-								제1장 총칙 제1조(목적) 본 약관은 정부24 (이하 "당 사이트")가 제공하는 모든 서비스(이하

-								"서비스")의 이용조건 및 절차, 이용자와 당 사이트의 권리, 의무, 책임사항과 기타 필요한 사항을 규정함을

-								제1장 총칙 제1조(목적) 본 약관은 정부24 (이하 "당 사이트")가 제공하는 모든 서비스(이하

-								"서비스")의 이용조건 및 절차, 이용자와 당 사이트의 권리, 의무, 책임사항과 기타 필요한 사항을 규정함을

-								제1장 총칙 제1조(목적) 본 약관은 정부24 (이하 "당 사이트")가 제공하는 모든 서비스(이하

-								"서비스")의 이용조건 및 절차, 이용자와 당 사이트의 권리, 의무, 책임사항과 기타 필요한 사항을 규정함을

-							</p>

+							<p>스타일포인트 차감 사은품을 선택하신 경우, 결제 시 고객님의 누적 포인트에서 차감됩니다.</p>

+							<p>보유한 포인트의 금액을 넘어선 사은품은 신청이 불가합니다.</p>

+							<p>사은품 신청 시 해외배송은 불가합니다. (적립포인트 사은품 및 온라인 사은품 제외)</p>

 						</div>

+						<!-- //210405_p태그 수정 -->

 					</div>

 				</div>

 			</div>

@@ -167,7 +169,13 @@ $(document).ready( function() {
 
 	

 	$(".freegiftSqArr").text(freegiftSqArr);

 	$(".freegiftGoodsArr").text(freegiftGoodsArr);

-	

+});

+

+$(document).on('click','#btn_infoGift_btn',function(e){

+    $('.area_selgift .agree_gift_con').toggle();

+	var privacyToggle = $('#btn_infoGift_btn').find('span');

+    $(privacyToggle).text($(privacyToggle).text() == '보기' ? '닫기' : '보기');

+    return false;

 });

 </script>

 </th:block>

+ 26 - 9
src/main/webapp/WEB-INF/views/mob/order/OrderMadeInfoMob.html
Переглянути файл 

@@ -25,8 +25,8 @@
 
 						</div>

 						<div class="data custom_disc">

 							<div class="form_field">

-								<input id="chk-custom" type="checkbox" checked=""> <label

-									for="chk-custom"><span>동의합니다.</span></label>

+								<input id="chk-custom" type="checkbox" >

+								<label for="chk-custom"><span>동의합니다.</span></label>

 							</div>

 						</div>

 					</div>

@@ -37,9 +37,8 @@
 
 					<p>고객님께서 주문하신 상품에는 주문제작상품이 포함되어 있습니다.</p>

 					<div class="form_field">

 						<div class="agree_custom">

-							<input id="chk-custom-agr1" type="checkbox" checked="">

-							<label for="chk-custom-agr1"><span>주문제작상품에 대한

-									안내를 확인하였으며 배송에 동의합니다.</span></label>

+							<input id="chk-custom-agr1" type="checkbox">

+							<label for="chk-custom-agr1"><span>주문제작상품에 대한 안내를 확인하였으며 배송에 동의합니다.</span></label>

 						</div>

 					</div>

 					<div class="info_txt">

@@ -58,14 +57,32 @@
 
 <script th:inline="javascript">

 var dispYn = [[${order.dispYn}]]; // 노출여부

 

-//컨텐츠 호출

+// 화면노출

+var madeInfoDispYn = function(temp) {

+	if (temp == "Y") {

+		$("#madeInfo .fold_head").addClass("on");

+		$("#madeInfo .fold_cont").show();

+	} else {

+		$("#madeInfo .fold_head").removeClass("on");

+		$("#madeInfo .fold_cont").hide();

+	}

+}

+

+// 컨텐츠 호출

 $(document).ready( function() {

 	// 화면펼침

-	if (dispYn == "Y") {

-		$("#custemerInfo .fold_head").addClass("on");

-		$("#custemerInfo .fold_cont").css("display", "block");

+	madeInfoDispYn(dispYn);

+});

+

+// 주문제작상품동의

+$("#orderForm #chk-custom-agr1").on("click", function(){

+	if ($(this).is(":checked")) {

+		$("#orderForm #chk-custom").attr("checked", true);

+	} else {

+		$("#orderForm #chk-custom").attr("checked", false);

 	}

 });

+

 </script>

 

 </html>

+ 50 - 26
src/main/webapp/WEB-INF/views/mob/order/OrderPaymentInfoMob.html
Переглянути файл 

@@ -23,8 +23,8 @@
 
 						<div class="fold_tit">

 							<span>결제수단</span>

 						</div>

-						<div class="data">

-							<span>신용카드</span>

+						<div class="data payTypeNm">

+							<span>선택없음</span>

 						</div>

 					</div>

 				</a>

@@ -34,38 +34,62 @@
 
 					<div class="paymethod_box">

 						<div class="form_field">

 							<ul class="sel_method">

-								<li><input type="radio" name="rdi-paynormal"

-									id="payCreditCard" value=""> <label

-									for="payCreditCard"><span>신용카드</span></label></li>

-								<li><input type="radio" name="rdi-paynormal"

-									id="payKakao" value=""> <label for="payKakao"><span><em

-											class="sr-only">카카오페이 결제</em><em class="payimg kakao"></em></span></label>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payCreditCard" class="KCP" value="KCP|G014_30"> 

+									<label for="payCreditCard">

+										<span class="payType">신용카드</span>

+									</label>

 								</li>

-								<li><input type="radio" name="rdi-paynormal"

-									id="payRealBank" value=""> <label for="payRealBank"><span>실시간계좌이체</span></label>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payKakao" class="KAKAO" value="KAKAO|G014_99"> 

+									<label for="payKakao">

+										<span><em class="sr-only payType">카카오페이 결제</em>

+										<em class="payimg kakao"></em></span>

+									</label>

 								</li>

-								<li><input type="radio" name="rdi-paynormal"

-									id="payNaver" value=""> <label for="payNaver"><span><em

-											class="sr-only">네이버페이 결제</em><em class="payimg naver"></em></span></label>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payRealBank" class="KCP" value="KCP|G014_10">

+									<label for="payRealBank">

+										<span>실시간계좌이체</span>

+									</label>

 								</li>

-								<li><input type="radio" name="rdi-paynormal"

-									id="payVirtualBank" value=""> <label

-									for="payVirtualBank"><span>무통장입금</span></label></li>

-								<li><input type="radio" name="rdi-paynormal"

-									id="payPayco" value=""> <label for="payPayco"><span><em

-											class="sr-only">페이코 결제</em><em class="payimg payco"></em></span></label>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payNaver" class="NAVER" value="NAVER|G014_99">

+									<label for="payNaver">

+										<span>

+											<em class="sr-only payType">네이버페이 결제</em>

+											<em class="payimg naver"></em>

+										</span>

+									</label>

+								</li>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payVirtualBank" class="KCP" value="KCP|G014_20"> 

+									<label for="payVirtualBank">

+										<span class="payType">무통장입금</span>

+									</label>

+								</li>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payPayco" class="PAYCO" value="PAYCO|G014_30"> 

+									<label for="payPayco">

+										<span>

+											<em class="sr-only payType">페이코 결제</em>

+											<em class="payimg payco"></em>

+										</span>

+									</label>

+								</li>

+								<li>

+									<input type="radio" name="rdi-paynormal" id="payCellphone" class="KCP" value="KCP|G014_60"> 

+									<label for="payCellphone">

+										<span class="payType">휴대폰 결제</span>

+									</label>

 								</li>

-								<li><input type="radio" name="rdi-paynormal"

-									id="payCellphone" value=""> <label

-									for="payCellphone"><span>휴대폰 결제</span></label></li>

 							</ul>

 						</div>

 						<div class="form_field">

 							<div class="agree_insurance">

-								<input id="chk-insurance" type="checkbox"> <label

-									for="chk-insurance"> <span>소비자 피해 보상보험

-										신청&nbsp;&nbsp;<em class="tmark_optional">(선택)</em>

-								</span>

+								<input id="chk-insurance" type="checkbox"> 

+								<label for="chk-insurance"> 

+									<span>소비자 피해 보상보험 신청&nbsp;&nbsp;<em class="tmark_optional">(선택)</em></span>

 								</label>

 								<p>

 									‘전자상거래 등에서의 소비자보호에 관한 법률‘에 따라 현금 결제 시 서울보증보험㈜가 제공하는 소비자

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/popup/DelvAddrAddPopMob.html
Переглянути файл 

@@ -38,7 +38,7 @@
 
 										</div>

 										<div class="default_addrs">

 											<div class="form_field">

-												<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked="">

+												<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked>

 												<label for="chk-default-addrs"><span>기본 배송지로 등록</span></label>

 											</div>

 										</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/popup/DelvAddrChangePopMob.html
Переглянути файл 

@@ -86,7 +86,7 @@ $(".btn_sel_delvAddr").on("click", function(){
 
 	}

 	

 	// 부모장으로 값 전닫

-	deliveryAddrInfoSet(delvObj);

+	delvAddrSet(delvObj);

 	

 	// 팝업닫기

 	$(".close-modal").trigger("click");

+ 4 - 4
src/main/webapp/WEB-INF/views/mob/popup/DelvAddrModifyPopMob.html
Переглянути файл 

@@ -42,12 +42,12 @@
 
 										<div class="default_addrs">

 											<div class="form_field">

 												<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">

-													<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked>

+													<input id="chk-default-addrs1" type="checkbox" name="defaultYn" checked>

 												</th:block>

 												<th:block th:if="${deliveryAddrInfo.defaultYn} == 'N'">

-													<input id="chk-default-addrs" type="checkbox" name="defaultYn">

+													<input id="chk-default-addrs1" type="checkbox" name="defaultYn">

 												</th:block>

-												<label for="chk-default-addrs"><span>기본배송지로 등록</span></label>

+												<label for="chk-default-addrs1"><span>기본배송지로 등록</span></label>

 											</div>

 										</div>

 									</td>

@@ -137,7 +137,7 @@ var delvMemo = [[${deliveryAddrInfo.delvMemo}]];
 
 //컨텐츠 호출

 $(document).ready( function() {

 	

-	var delvMemoArr = ["문 앞", "직접받고 부재시 문 앞", "경비실", "택배함"];

+	var delvMemoArr = ["문 앞", "직접 받고 부재 시 문 앞", "경비실", "택배함"];

 	var tempMemo = true;

 	

 	// 배송요청사항설정

+ 39 - 38
src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html
Переглянути файл 

@@ -411,12 +411,13 @@
 
 									</div>

 								</th:block>

 							</dl>

-							<!-- 비회원인경우 노출 -->

+							<!-- 비회원인경우 노출 

 							<th:blcok th:if="!${isLogin}">

 								<div class="t_info">

 									<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);" title="회원가입 하여 할인받기" class="btn_link">회원가입 하여 할인받기</a>

 								</div>

 							</th:blcok>

+							-->

 						</div>

 						<div class="totalprice_box">

 							<dl>

@@ -428,7 +429,7 @@
 
 								<th:blcok th:if="${isLogin}">

 									<span span class="save_point" id="savePntSumAmt" th:text="|${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')} P|"></span> 적립예정

 								</th:blcok>

-								<!-- 비회원인경우 노출 -->

+								<!-- 비회원인경우 노출-->

 								<th:blcok th:if="!${isLogin}">

 									회원가입 후 구매하면&nbsp;&nbsp;<span span class="save_point" id="savePntSumAmt" th:text="|${#numbers.formatInteger(savePntSumAmt, 1, 'COMMA')} P|"></span> 적립예정

 								</th:blcok>

@@ -534,7 +535,7 @@ $(document).ready( function() {
 
 	custemerInfoSet();

 	

 	// 999. 개발화면정보설정

-	var devTemp = true;

+	var devTemp = false;

 	var arr = []

 	arr[0] = "orderInfo";

 	arr[1] = "freegiftInfo";

@@ -575,9 +576,9 @@ var custemerInfoSet = function() {
 
 				$("#custemerInfo").html(result);

 

 				// 고객정보설정

-				$(".custNm").text($("input[name='custNm']").val());

-				$(".email").text($("input[name='email']").val());

-				$(".cellPhnno").text($("input[name='cellPhnno']").val());

+				$("#orderAmtForm .custNm").text($("input[name='custNm']").val());

+				$("#orderAmtForm .email").text($("input[name='email']").val());

+				$("#orderAmtForm .cellPhnno").text($("input[name='cellPhnno']").val());

 			}

 			// 1.2 배송정보로드

 			deliveryAddrInfoSet(jsonObj, true);

@@ -603,12 +604,12 @@ var deliveryAddrInfoSet = function(delvObj, temp) {
 
 			$("#deliveryAddrInfo").html(result);

 			

 			// 배송정보설정

-			$(".recipNm").text($("#orderForm input[name='recipNm']").val());

-			$(".recipPhnno").text($("#orderForm input[name='recipPhnno']").val());

-			$(".recipZipcode").text($("#orderForm input[name='recipZipcode']").val());

-			$(".recipBaseAddr").text($("#orderForm input[name='recipBaseAddr']").val());

-			$(".recipDtlAddr").text($("#orderForm input[name='recipDtlAddr']").val());

-			$(".delvMemo").text($("#orderForm input[name='delvMemo']").val());

+			$("#orderAmtForm .recipNm").text($("#orderForm input[name='recipNm']").val());

+			$("#orderAmtForm .recipPhnno").text($("#orderForm input[name='recipPhnno']").val());

+			$("#orderAmtForm .recipZipcode").text($("#orderForm input[name='recipZipcode']").val());

+			$("#orderAmtForm .recipBaseAddr").text($("#orderForm input[name='recipBaseAddr']").val());

+			$("#orderAmtForm .recipDtlAddr").text($("#orderForm input[name='recipDtlAddr']").val());

+			$("#orderAmtForm .delvMemo").text($("#orderForm input[name='delvMemo']").val());

 			

 			// 2. 버튼기능구현

 			// 2.1 회원 배송지변경 팝업열기

@@ -799,11 +800,11 @@ var freegiftInfoSet = function() {
 
 				var total_deduct 	= 0;

 				

 				// 2.2 사은품선택 라디오 버튼 기능

-				$(".freegiftRdo").on("click", function() {

+				$("#orderForm .freegiftRdo").on("click", function() {

 					total_gift 		= 0;

 					total_deduct 	= 0;

 					

-					$(".freegiftRdo").each(function(){

+					$("#orderForm .freegiftRdo").each(function(){

 						if ($(this).attr("allYn") == "Y" ) {

 							total_gift 		+= 1;

 						}

@@ -818,21 +819,21 @@ var freegiftInfoSet = function() {
 
 						}

 					});

 					

-					$(".total_gift").text(total_gift);							// 사은품총선택개수

-					$(".total_deduct").text(total_deduct.addComma());			// 사은품총사용포인트

-					$(".freegiftUsePnt").text(total_deduct);

+					$("#orderForm .total_gift").text(total_gift);							// 사은품총선택개수

+					$("#orderForm .total_deduct").text(total_deduct.addComma());			// 사은품총사용포인트

+					$("#orderAmtForm .freegiftUsePnt").text(total_deduct);

 					

 					// 포인트초기화기능

 					pntDcAmtReset();

 				});

 				

 				// 사은품테이블 그리기

-				$(".gift_box").each(function(){

+				$("#orderForm .gift_box").each(function(){

 					$(this).find(".freegiftRdo").each(function(){

 						if ($(this).attr("allYn") == "Y" ) {

 							total_gift += 1;

 						}

-						$(".total_gift").text(total_gift);						// 사은품총선택개수

+						$("#orderForm .total_gift").text(total_gift);						// 사은품총선택개수

 					});

 				});

 			}

@@ -866,7 +867,7 @@ var paymentInfoSet = function() {
 
 				$("#orderForm .area_paymethod .paymethod_box ul li").on("click", function(){

 					var payType = $(this).find(".payType").text();

 					if ($(this).find("input[name=rdi-paynormal]").is(":checked")) {

-						$(".payTypeNm").text(payType);

+						$("#orderForm .payTypeNm").text(payType);

 					}

 				});

 				

@@ -1021,14 +1022,14 @@ var paymentInfoSet = function() {
 
 					

 					// 주문데이타 생성

 					var orderData = {

-						"custNm"				: $(".custNm").text()

-						,"email"				: $(".email").text()

-						,"recipNm"				: $(".recipNm").text()

-						,"recipPhnno"			: $(".recipPhnno").text()

-						,"recipZipcode"			: $(".recipZipcode").text()

-						,"recipBaseAddr"		: $(".recipBaseAddr").text()

-						,"recipDtlAddr"			: $(".recipDtlAddr").text()

-						,"delvMemo"				: $(".delvMemo").text()

+						"custNm"				: $("#orderAmtForm .custNm").text()

+						,"email"				: $("#orderAmtForm .email").text()

+						,"recipNm"				: $("#orderAmtForm .recipNm").text()

+						,"recipPhnno"			: $("#orderAmtForm .recipPhnno").text()

+						,"recipZipcode"			: $("#orderAmtForm .recipZipcode").text()

+						,"recipBaseAddr"		: $("#orderAmtForm .recipBaseAddr").text()

+						,"recipDtlAddr"			: $("#orderAmtForm .recipDtlAddr").text()

+						,"delvMemo"				: $("#orderAmtForm .delvMemo").text()

 						,"prePntDcAmtYn"		: prePntDcAmtYn

 						,"orderDetailList"		: orderDetailList

 						,"delvFeeCdList"		: delvFeeCdList

@@ -1036,15 +1037,15 @@ var paymentInfoSet = function() {
 
 						,"entryNo"				: entryNo

 						,"pgGb"					: pgGb

 						,"payMeans"				: payMeans // 네이버페이, 카카오페이

-						,"payAmt"				: $(".realOrdSumAmt").text()

-						,"ordNm"				: $(".custNm").text()

-						,"ordPhnno"				: $(".cellPhnno").text()

-						,"goodsNm"				: $(".goodsNm").eq(0).text()

+						,"payAmt"				: $("#orderAmtForm .realOrdSumAmt").text()

+						,"ordNm"				: $("#orderAmtForm .custNm").text()

+						,"ordPhnno"				: $("#orderAmtForm .cellPhnno").text()

+						,"goodsNm"				: $("#orderAmtForm .goodsNm").eq(0).text()

 						,"ordGoodsQty"			: ordGoodsQty

-						,"freegiftValArr"		: $(".freegiftValArr").text().split(",")

-						,"freegiftSqArr"		: $(".freegiftSqArr").text().split(",")

-						,"freegiftGoodsArr"		: $(".freegiftGoodsArr").text().split(",")

-						,"freegiftUsePointArr"	: $(".freegiftUsePointArr").text().split(",")

+						,"freegiftValArr"		: $("#orderAmtForm .freegiftValArr").text().split(",")

+						,"freegiftSqArr"		: $("#orderAmtForm .freegiftSqArr").text().split(",")

+						,"freegiftGoodsArr"		: $("#orderAmtForm .freegiftGoodsArr").text().split(",")

+						,"freegiftUsePointArr"	: $("#orderAmtForm .freegiftUsePointArr").text().split(",")

 					};

 					

 					$.ajax( {

@@ -1259,7 +1260,7 @@ var dcAmtInfoSet = function() {
 
 					}

 					

 					// 포인트 적용

-					$(".pntDcSumAmt").text(pntDcAmt);

+					$("#orderAmtForm .pntDcSumAmt").text(pntDcAmt);

 					$("#pntDcAmt").text("-"+pntDcAmt.addComma()+" 원");

 					

 					// 상품권리렛기능

@@ -1303,7 +1304,7 @@ var dcAmtInfoSet = function() {
 
 					}

 					

 					// 상품권 적용

-					$(".gfcdUseSumAmt").text(gfcdUseAmt);

+					$("#orderAmtForm .gfcdUseSumAmt").text(gfcdUseAmt);

 					$("#gfcdUseAmt").text("-"+gfcdUseAmt.addComma()+" 원");

 					

 					// 금액전체계산

+ 2 - 2
src/main/webapp/WEB-INF/views/web/popup/DelvAddrAddPopWeb.html
Переглянути файл 

@@ -56,8 +56,8 @@
 
 						<label for="rdi-request11"><span>문 앞</span></label>

 					</div>

 					<div>

-						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞" checked>

-						<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>

+						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접 받고 부재 시 문 앞" checked>

+						<label for="rdi-request12"><span>직접 받고 부재 시 문 앞</span></label>

 					</div>

 					<div>

 						<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실">

+ 3 - 3
src/main/webapp/WEB-INF/views/web/popup/DelvAddrModifyPopWeb.html
Переглянути файл 

@@ -65,8 +65,8 @@
 
 						<label for="rdi-request11"><span>문 앞</span></label>

 					</div>

 					<div>

-						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접받고 부재시 문 앞">

-						<label for="rdi-request12"><span>직접받고 부재시 문 앞</span></label>

+						<input type="radio" name="rdi-request1" id="rdi-request12" value="직접 받고 부재 시 문 앞">

+						<label for="rdi-request12"><span>직접 받고 부재 시 문 앞</span></label>

 					</div>

 					<div>

 						<input type="radio" name="rdi-request1" id="rdi-request13" value="경비실">

@@ -100,7 +100,7 @@ var delvMemo = [[${deliveryAddrInfo.delvMemo}]];
 
 //컨텐츠 호출

 $(document).ready( function() {

 	

-	var delvMemoArr = ["문 앞", "직접받고 부재시 문 앞", "경비실", "택배함"];

+	var delvMemoArr = ["문 앞", "직접 받고 부재 시 문 앞", "경비실", "택배함"];

 	var tempMemo = true;

 	

 	// 배송요청사항설정

+ 2 - 2
src/main/webapp/WEB-INF/views/web/popup/DelvMemoChangePopWeb.html
Переглянути файл 

@@ -13,7 +13,7 @@
 
 					</div>

 					<div>

 						<input type="radio" name="rdi-request3" id="rdi-request32">

-						<label for="rdi-request32"><span>직접받고 부재시 문 앞</span></label>

+						<label for="rdi-request32"><span>직접 받고 부재 시 문 앞</span></label>

 					</div>

 					<div>

 						<input type="radio" name="rdi-request3" id="rdi-request33">

@@ -47,7 +47,7 @@ var delvMemo				= [[${delvMemo}]];				// 로그인여부
 
 

 // 초기배송메모설정

 $(document).ready( function() {

-	var delvMemoArr = ["문 앞", "직접받고 부재시 문 앞", "경비실", "택배함"];

+	var delvMemoArr = ["문 앞", "직접 받고 부재 시 문 앞", "경비실", "택배함"];

 	var tempMemo = true;

 	

 	// 배송요청사항설정