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

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

@@ -23,6 +23,10 @@
 <script type="text/javascript" src="/ux/pc/js/slick.min.js"></script>
 <script type="text/javascript" src="/ux/pc/js/jquery-ui.js"></script>
 
+<!-- xodud1202 -->
+
+<!-- // xodud1202 -->
+
 <!--  container -->
 <form id="payForm" name="payForm">
 	<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
@@ -448,12 +452,13 @@
 																								<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"/>
 																								
 																								<div class="select" value="0">선택없음</div>
 																								<ul class="list">
 																									<li value="0">선택없음</li>
 																									<th:block th:each="delvCpn, k : ${delvCpnList}">
-																										<li th:value="${delvCpn.custCpnSq}" th:data="${delvCpn.cpnDcAmt}" th:text="${delvCpn.cpnNm}"></li>
+																										<li th:value="${delvCpn.custCpnSq}" th:data="${delvCpn.cpnDcAmt}" th:delvfeecd="${delvCpn.delvFeeCd}" th:text="${delvCpn.cpnNm}"></li>
 																									</th:block>
 																								</ul>
 																							</div>
@@ -914,7 +919,7 @@
 										</div>
 										<div>
 											<dt>다다익선할인금액</dt>
-											<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')}원|"></span></dd>
+											<dd><span class="disc_amount" id="tmtbDcSumAmt" th:text="|-${#numbers.formatInteger(tmtbDcSumAmt, 1, 'COMMA')}원|"></span></dd>
 										</div>
 										<div>
 											<dt>쿠폰할인금액</dt>
@@ -1183,6 +1188,7 @@ $(document).ready( function() {
 	var resCnt 				= [[${resCnt}]];				// 자사 예약 배송건수
 	var delvCnt 			= [[${delvCnt}]];				// 입전 일반 배송건수
 	var shotDelvYn			= [[${shotDelvYn}]];			// 총알배송여부
+	var sumDelvFee			= [[${sumDelvFee}]];			// 배송비합계
 	
 	// 할인관련정보 변수선언
 	var freegiftList		= [[${freegiftList}]];			// 사은품 프로모션 목록
@@ -1382,7 +1388,7 @@ $(document).ready( function() {
 			
 			var cpnCartSq 	= obj.parent().parent().find("input[name='cpnCartSq']").val();
 			
-			// 장바구니시퀀스 체크
+			// 장바구니상품시퀀스 체크
 			$("input[name='cartSq']").each(function(){
 				if (cpnCartSq == $(this).val()) {
 					$(this).parent().find("input[name='goodsCpnSq']").val(obj.prop("value"));		// 상품쿠폰시퀀스
@@ -1478,7 +1484,14 @@ $(document).ready( function() {
 		}
 		// 배송비쿠폰적용
 		else if (cpnType == "delvCpn") {
+			// 적용된 할인금액 text 설정 
+			var dcAmtStr = "- " + parseInt(obj.attr("data")).addComma() + " 원 할인적용";
+			obj.parent().parent().parent().parent().parent().find(".cp_amount").text(dcAmtStr);
+			
+			var cpnCartSq 	= obj.parent().parent().find("input[name='cpnCartSq']").val();
 			
+			obj.parent().parent().find("input[name='cpnDcAmt']").val(obj.attr("data"));
+			obj.parent().parent().find("input[name='delvFeeCd']").val(obj.attr("delvfeecd"));
 		}
 		
 		// select box 쿠폰 적용 (공통적용)
@@ -1522,8 +1535,20 @@ $(document).ready( function() {
 			}
 		});
 		
-		$(".maxdisc_amount").text("(-" + cpnDcSumAmt.addComma() + "원)");
+		// 쿠폰영역
+		$(".maxdisc_amount").text("(-" + cpnDcSumAmt.addComma() + "원)"); // 쿠폰할인금액합계
 		$("#cpnApplyCnt").text(cpnApplyCnt + "장");
+		
+		// 상품목록영역
+		$("#couponDcSumAmt").text("-" + cpnDcSumAmt.addComma() + "원"); // 쿠폰할인금액합계
+		// 배송비할인적용
+		$("input[name='cpnType']").each(function(){
+			if ($(this).val() == "delvCpn") {
+				sumDelvFee = parseInt(sumDelvFee) - parseInt($(this).parent().find("input[name='cpnDcAmt']").val()); 
+				// 최종배송비
+				$("#delvSumAmt").text(sumDelvFee.addComma() + "원");
+			}
+		});
 	};
 	
 	// 쿠폰 선택없음 기능 구현
@@ -1554,7 +1579,10 @@ $(document).ready( function() {
 		}
 		// 배송비쿠폰적용
 		else if (cpnType == "delvCpn") {
-			
+			// 장바구니쿠폰 시퀀스 0, 장바구니할인금액 0
+			$("input[name='cartSq']").each(function(){
+				$(this).parent().find("input[name='delvFeeCd']").val("0");
+			});
 		}
 		
 		obj.parent().parent().find("input[name='custCpnSq']").val("0");