Quellcode durchsuchen

주문서 쿠폰 할인정보 수정

jsh77b vor 5 Jahren
Ursprung
Commit
4019fe0714

+ 0 - 6
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1096,11 +1096,8 @@ public class TsfOrderController extends TsfBaseController {
 	@ResponseBody
 	public ModelAndView kakaoPaymentRequest(@RequestParam(value = "pg_token", required = false) String pgToken) {
 		ModelAndView mav = new ModelAndView();
-
 		mav.addObject("pgToken", pgToken);
-
 		mav.setViewName(super.getDeviceViewName("/pg/KakaoPaymentRequest"));
-
 		return mav;
 	}
 
@@ -1116,11 +1113,8 @@ public class TsfOrderController extends TsfBaseController {
 	@ResponseBody
 	public ModelAndView naverPaymentRequest(@RequestParam(value = "paymentId", required = false) String paymentId) {
 		ModelAndView mav = new ModelAndView();
-
 		mav.addObject("paymentId", paymentId);
-
 		mav.setViewName(super.getDeviceViewName("/pg/NaverPaymentRequest"));
-
 		return mav;
 	}
 

+ 153 - 144
src/main/webapp/WEB-INF/views/mob/order/OrderCouponApplyPopMob.html

@@ -1,170 +1,179 @@
 <!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 goodsCartCpn" 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>
+<form class="form_wrap form_full" name="couponApplyForm" id="couponApplyForm">
+	<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 goodsCartCpn" 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>
-									
-									<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>
-						</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 goodsCartCpn" 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-coupon00">
-									<label for="rdi-cart-coupon00">적용안함</label>
-								</div>
-							</div>
-							<input type="hidden" name="cpnType" value="cartCpn"/>
-							<input type="hidden" name="custCpnSq" value="0"/>
-							<input type="hidden" name="cpnDcAmt" value="0"/>
 						</div>
-					</div>
-				</th:block>
-				<!-- //장바구니쿠폰적용 -->
-			</div>
-		</div>
-		<div class="modal-footer">
-			<button type="button" class="btn btn_primary" id="btn_coupon_apply"><span>총 <em class="goodsCartCpnSumAmt">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>
+					</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 goodsCartCpn" th:value="${cartCpn.custCpnSq}">
+										<input type="hidden" name="dcWay" 			th:value="${cartCpn.dcWay}"/>
+										<input type="hidden" name="dcVal" 			th:value="${cartCpn.dcVal}"/>
+										<input type="hidden" name="buyLimitAmt" 	th:value="${cartCpn.buyLimitAmt}"/>
+										<input type="hidden" name="maxDcAmt" 		th:value="${cartCpn.maxDcAmt}"/>
+										
+										<!-- 장바구니쿠폰 적용 장바구니 시퀀스 -->
+										<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="${goodsCpn.buyLimitAmt} > 0">
-														<span th:text="${#numbers.formatInteger(goodsCpn.buyLimitAmt, 1, 'COMMA')}"></span>원 이상 구매시
+													<th:block th:if="${cartCpn.buyLimitAmt} > 0">
+														<span th:text="${#numbers.formatInteger(cartCpn.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 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="${goodsCpn.dcWay} == 'G240_10'">
-														<span th:text="${#numbers.formatInteger(goodsCpn.dcVal, 1, 'COMMA')}"></span>원 할인
+													<th:block th:if="${cartCpn.dcWay} == 'G240_10'">
+														<span th:text="${#numbers.formatInteger(cartCpn.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 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">
+									<input type="hidden" name="dcWay" 			th:value="0"/>
+									<input type="hidden" name="dcVal" 			th:value="0"/>
+									<input type="hidden" name="buyLimitAmt" 	th:value="0"/>
+									<input type="hidden" name="maxDcAmt" 		th:value="0"/>
+										
+									<div class="cart_coupon">
+										<input type="radio" name="rdi-cart-coupon" id="rdi-cart-coupon00">
+										<label for="rdi-cart-coupon00">적용안함</label>
+									</div>
+								</div>
+								<input type="hidden" name="cpnType" value="cartCpn"/>
+								<input type="hidden" name="custCpnSq" value="0"/>
+								<input type="hidden" name="cpnDcAmt" value="0"/>
+							</div>
+						</div>
+					</th:block>
+					<!-- //장바구니쿠폰적용 -->
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" class="btn btn_primary" id="btn_coupon_apply"><span>총 <em class="goodsCartCpnSumAmt">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 type="button" class="dlvr_coupon">
+												<p class="empty">적용 안함</p>
 											</button>
-										</li> 
-									</th:block>
-									<li value="0" data="0">
-										<button class="dlvr_coupon">
-											<p class="empty">적용 안함</p>
-										</button>
-									</li>
-								</ul>
+										</li>
+									</ul>
+								</div>
 							</div>
 						</div>
-					</div>
-					<!-- //쿠폰선택_팝업 -->
+						<!-- //쿠폰선택_팝업 -->
+					</th:block>
 				</th:block>
 			</th:block>
-		</th:block>
-		<!-- //상품쿠폰팝업적용 -->
-		
+			<!-- //상품쿠폰팝업적용 -->
+			
+		</div>
 	</div>
-</div>
-<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>
+	<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>
+</form>
 
 <script th:inline="javascript">
 //컨텐츠 호출

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

@@ -462,7 +462,7 @@ $(document).ready( function() {
 		, "foreignBuyYn"	: foreignBuyYn
 		, "orderMadeYn"		: orderMadeYn
 		, "custDelvAddrSq"	: 0
-		, "giftPackYn"		: "Y"
+		, "giftPackYn"		: giftPackYn
 	}
 	
 	jsonData = JSON.stringify(jsonObj);
@@ -1224,14 +1224,14 @@ var dcAmtInfoSet = function() {
 						// 1.8.4 쿠폰적용버튼
 						$("#btn_coupon_apply").on("click", function(){
 							// 상품쿠폰적용
-							$('#couponModifyPop .couponSelectPop ul li.selected').each(function(index){
-								custCpnApply($(this));
+							$('#couponApplyForm .couponSelectPop ul li.selected').each(function(index){
+								custCpnApply($(this), index, "goodsCpn");
 							});
 							
 							// 장바구니쿠폰적용
-							$('.cartCpn').each(function(index){
+							$('#couponApplyForm .cartCpn').each(function(index){								
 								if ($(this).find("input[name=rdi-cart-coupon]").is(":checked")) {
-									custCpnApply($(this));
+									custCpnApply($(this), index, "cartCpn");
 								}
 							});
 							
@@ -1451,7 +1451,7 @@ var custGoodsCpnInit = function() {
 		
 		// select box 적용
 		$("#couponModifyPop .couponSelectPop").eq(idx).find("ul li").each(function(){
-			// 쿠적용안되었으면실행
+			// 쿠적용안되었으면실행
 			if (cpnApplyTemp == false) {
 				// 쿠폰중복적용체크
 				if (custCpnDuplicationCheck($(this).attr("value"), idx)) {
@@ -1465,6 +1465,12 @@ var custGoodsCpnInit = function() {
 			// 쿠폰 select 버튼기능
 			$(this).on("click", function(){
 				if (custCpnDuplicationCheck($(this).attr("value"), idx)) {
+					// 2021.04.19 주문서 쿠폰 선택오류 수정
+					// 전체선택해제
+					$(this).parent().find("li").removeClass("selected");
+					// 본인선택기능
+					$(this).addClass("selected");
+					
 					// 쿠폰적용(임시)
 					custCpnApplyTemp($(this), idx, "goodsCpn");
 				} else {
@@ -1555,7 +1561,6 @@ var custCpnApplyTemp = function(obj, idx, cpnType) {
 	// 상품쿠폰적용
 	if (cpnType == "goodsCpn") {
 		var itemHtml = obj.find(".dlvr_coupon").html();
-		
 		$("#couponModifyPop .goodsCpn .select .item_coupon").eq(idx).html(itemHtml);
 		$("#couponModifyPop .goodsCpn input[name='cpnDcAmt']").eq(idx).val(obj.attr("data"));
 		$("#couponModifyPop .goodsCpn input[name='custCpnSq']").eq(idx).val(obj.attr("value"));
@@ -1563,7 +1568,7 @@ var custCpnApplyTemp = function(obj, idx, cpnType) {
 		// 장바구니쿠폰 초기화 적용
 		$("#couponModifyPop .cartCpn").each(function(index) {
 			if (index == 0) {
-				custCpnApplyTemp($(this)); // 쿠폰적용
+				custCpnApplyTemp($(this), 0, "cartCpn"); // 쿠폰적용
 			}
 		});
 		
@@ -1577,6 +1582,8 @@ var custCpnApplyTemp = function(obj, idx, cpnType) {
 	else if (cpnType == "cartCpn") {
 		var dcWay 				= obj.find("input[name='dcWay']").val();
 		var dcVal 				= obj.find("input[name='dcVal']").val();
+		var maxDcAmt 			= obj.find("input[name='maxDcAmt']").val();
+		var buyLimitAmt 		= obj.find("input[name='buyLimitAmt']").val();
 		var cartCpnDcSumAmt		= 0;
 		var tempSumAmt			= 0;
 		var cartSqLen			= $(".cartSq").length;
@@ -1621,6 +1628,13 @@ var custCpnApplyTemp = function(obj, idx, cpnType) {
 			cartCpnDcSumAmt = dcVal;
 		}
 		
+		// 2021.04.19 최대금액 체크
+		if (maxDcAmt > cartCpnDcSumAmt || maxDcAmt == 0) {
+			cartCpnDcSumAmt = cartCpnDcSumAmt;
+		} else {
+			cartCpnDcSumAmt = maxDcAmt;
+		}
+		
 		obj.find("input[name=rdi-cart-coupon]").prop("checked", true);
 		obj.parent().find("input[name=cpnDcAmt]").val(cartCpnDcSumAmt);
 		obj.parent().find("input[name=custCpnSq]").val(obj.attr("value"));
@@ -1676,12 +1690,20 @@ var custCpnApply = function(obj, idx, cpnType) {
 	else if (cpnType == "cartCpn") {
 		var dcWay 				= obj.find("input[name='dcWay']").val();
 		var dcVal 				= obj.find("input[name='dcVal']").val();
+		var maxDcAmt 			= obj.find("input[name='maxDcAmt']").val();
+		var buyLimitAmt 		= obj.find("input[name='buyLimitAmt']").val();
 		var cartCpnDcSumAmt		= 0;
 		var tempSumAmt			= 0;
 		var cartSqLen			= $("#orderAmtForm .cartSq").length;
 		var leftAmt				= 0;
 		var index				= 1;
 		
+		// 2021.04.19 장바구니시퀀스 값 초기화
+		$("#orderAmtForm .cartSq").each(function(){
+			$(this).parent().find(".cartCpnSq").text(0);
+			$(this).parent().find(".cartCpnDcAmt").text(0);
+		});
+		
 		// 장바구니쿠폰 해당 장바구니상품들 할인가 적용
 		obj.find("input[name='cartCpnCartSq']").each(function(){
 			var cartCpnCartSq 		= $(this).val();
@@ -1720,10 +1742,6 @@ var custCpnApply = function(obj, idx, cpnType) {
 			obj.find("input[name='payTypeArr']").each(function(i){
 				var payType = $(this).val();
 				$('#orderForm .'+payType).attr("disabled", false);
-				//$('#orderForm .'+payType).eq(0).attr("checked", true);
-				//if (i == 0) {
-					//$("#orderForm input[name=rdi-paynormal]").attr("checked", true);
-				//}
 			});
 		} else {
 			$("#orderForm input[name=rdi-paynormal]").attr("disabled", false);
@@ -1732,11 +1750,21 @@ var custCpnApply = function(obj, idx, cpnType) {
 		// 선택안함
 		$("#orderForm .payTypeNm").text("선택없음");
 		
+		// 2021.04.19 최대금액 체크
+		if (maxDcAmt > cartCpnDcSumAmt || maxDcAmt == 0) {
+			cartCpnDcSumAmt 	= cartCpnDcSumAmt;
+		} else {
+			// 최대값 적용 일때는 금액할인 방식을 적용
+			cartCpnDcSumAmt 	= maxDcAmt;
+			dcVal				= cartCpnDcSumAmt;
+			dcWay 				= "G240_10";
+		}
+		
 		// 금액일때 할인금액 적용
 		if (dcWay == "G240_10") {
 			cartCpnDcSumAmt = dcVal;
 			leftAmt			= dcVal;
-			index = 1;
+			index 			= 1;
 			
 			// 장바구니쿠폰 해당 장바구니상품들 할인가 적용
 			obj.find("input[name='cartCpnCartSq']").each(function(){
@@ -1747,11 +1775,13 @@ var custCpnApply = function(obj, idx, cpnType) {
 				$("#orderAmtForm .cartSq").each(function(){
 					if (cartCpnCartSq == $(this).text()) {
 						var orgCurrPrice 	= parseInt($(this).parent().find(".orgCurrPrice").text());
+						var cpn1DcAmt 		= parseInt($(this).parent().find(".cpn1DcAmt").text());
+						var goodsQty 		= parseInt($(this).parent().find(".goodsQty").text());
 						var tmtb1DcAmt 		= parseInt($(this).parent().find(".tmtb1DcAmt").text());
 						var tmtb2DcAmt 		= parseInt($(this).parent().find(".tmtb2DcAmt").text());
 						var goodsCpnDcAmt 	= parseInt($(this).parent().find(".goodsCpnDcAmt").text());
 						
-						var tempAmt 		= orgCurrPrice - tmtb1DcAmt - tmtb2DcAmt - goodsCpnDcAmt;
+						var tempAmt 		= ((orgCurrPrice - cpn1DcAmt) * goodsQty) - tmtb1DcAmt - tmtb2DcAmt - goodsCpnDcAmt;
 						var tempDiv 		= parseInt((tempAmt / tempSumAmt) * 100);
 						var cartCpnDcAmt	= 0;
 				

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/order/OrderGiftInfoMob.html

@@ -30,8 +30,8 @@
 				<div class="fold_cont" style="display: none;">
 					<div class="tabWrap">
 						<ul class="tabIndex">
-							<li><a href="javascript:;"><span>연락처 불러오기</span></a></li>
-							<li class="active"><a href="javascript:;"><span>직접입력</span></a></li>
+							<!-- <li><a href="javascript:void(0);"><span>연락처 불러오기</span></a></li> -->
+							<li class="active"><a href="javascript:void(0);"><span>직접입력</span></a></li>
 						</ul>
 						<div class="tabContents">
 							<div class="tab_cont active">

+ 134 - 129
src/main/webapp/WEB-INF/views/web/order/OrderCouponApplyPopWeb.html

@@ -1,144 +1,149 @@
 <!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:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
-							<th:block th:if="${goods.goodsCpnList.size() > 0}">
-								<div class="apply_item goodsCpn">
-									<div class="item_gd">
-										<figure>
-											<span class="thumb">
-												<img th:src="${imageUrl + '/' + goods.sysImgNm}" src="/" width="100%" 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">
-											<div class="combo">
-												<div class="select">
-													<div class="item_coupon"></div>
-												</div>
-												<ul class="list">
-													<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true"추가  -->
-													<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">
-														<li th:value="${goodsCpn.custCpnSq}" th:data="${goodsCpn.cpnDcAmt}">
-															<div class="item_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>
-															</div>
+<form class="form_wrap form_full" name="couponApplyForm" id="couponApplyForm">
+	<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:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+								<th:block th:if="${goods.goodsCpnList.size() > 0}">
+									<div class="apply_item goodsCpn">
+										<div class="item_gd">
+											<figure>
+												<span class="thumb">
+													<img th:src="${imageUrl + '/' + goods.sysImgNm}" src="/" width="100%" 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">
+												<div class="combo">
+													<div class="select">
+														<div class="item_coupon"></div>
+													</div>
+													<ul class="list">
+														<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true"추가  -->
+														<th:block th:each="goodsCpn, k : ${goods.goodsCpnList}">
+															<li th:value="${goodsCpn.custCpnSq}" th:data="${goodsCpn.cpnDcAmt}">
+																<div class="item_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>
+																</div>
+															</li>
+														</th:block>
+														<li value="0" data="0">
+															<div class="item_coupon empty"><p class="empty">적용 안함</p></div>
 														</li>
-													</th:block>
-													<li value="0" data="0">
-														<div class="item_coupon empty"><p class="empty">적용 안함</p></div>
-													</li>
-													<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"/>
-												</ul>
+														<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"/>
+													</ul>
+												</div>
 											</div>
 										</div>
 									</div>
-								</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}|" value="">
-									<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>
 							</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>
-				</th:block>
-				<!-- //장바구니쿠폰적용 -->
+					</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}"/>
+										<input type="hidden" name="buyLimitAmt" 	th:value="${cartCpn.buyLimitAmt}"/>
+										<input type="hidden" name="maxDcAmt" 		th:value="${cartCpn.maxDcAmt}"/>
+										
+										<!-- 장바구니쿠폰 적용 장바구니 시퀀스 -->
+										<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}|" value="">
+										<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>
+								<input type="hidden" name="cpnType" value="cartCpn"/>
+								<input type="hidden" name="custCpnSq" value="0"/>
+								<input type="hidden" name="cpnDcAmt" value="0"/>
+							</div>
+						</div>
+					</th:block>
+					<!-- //장바구니쿠폰적용 -->
+				</div>
+			</div>
+			<div class="modal-footer">
+				<button type="button" id="btn_coupon_apply" class="btn btn_primary">
+					<span>총 <em class="goodsCartCpnSumAmt">99,999,999</em>원 쿠폰 적용</span>
+				</button>
 			</div>
-		</div>
-		<div class="modal-footer">
-			<button type="button" id="btn_coupon_apply" class="btn btn_primary">
-				<span>총 <em class="goodsCartCpnSumAmt">99,999,999</em>원 쿠폰 적용</span>
-			</button>
 		</div>
 	</div>
-</div>
-<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>
+	<a href="#close-modal" rel="modal:close" id="couponModifyPop_close" class="close-modal">Close</a>
+</form>
 
 <script th:inline="javascript">
 //컨텐츠 호출

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

@@ -1207,12 +1207,12 @@ var dcAmtInfoSet = function() {
 						$("#btn_coupon_apply").on("click", function(){
 							
 							// 상품쿠폰적용
-							$('.goodsCpn ul li.selected').each(function(index){
+							$('#couponApplyForm .goodsCpn ul li.selected').each(function(index){
 								custCpnApply($(this));
 							});
 							
 							// 장바구니쿠폰적용
-							$('#orderAmtForm .cartCpn').each(function(index){
+							$('#couponApplyForm .cartCpn').each(function(index){
 								if ($(this).find("input[name=rdi-cart-coupon]").is(":checked")) {
 									custCpnApply($(this));
 								}
@@ -1501,7 +1501,7 @@ var custCpnApplyTemp = function(obj) {
 		obj.parent().find("input[name='custCpnSq']").val(obj.attr("value"));
 
 		// 장바구니쿠폰 초기화 적용
-		$(".cartCpn").each(function(index) {
+		$("#couponApplyForm .cartCpn").each(function(index) {
 			if (index == 0) {
 				custCpnApplyTemp($(this)); // 쿠폰적용
 			}
@@ -1514,6 +1514,8 @@ var custCpnApplyTemp = function(obj) {
 	else if (cpnType == "cartCpn") {
 		var dcWay 				= obj.find("input[name='dcWay']").val();
 		var dcVal 				= obj.find("input[name='dcVal']").val();
+		var maxDcAmt 			= obj.find("input[name='maxDcAmt']").val();
+		var buyLimitAmt 		= obj.find("input[name='buyLimitAmt']").val();
 		var cartCpnDcSumAmt		= 0;
 		var tempSumAmt			= 0;
 		var cartSqLen			= $(".cartSq").length;
@@ -1524,7 +1526,7 @@ var custCpnApplyTemp = function(obj) {
 		obj.find("input[name='cartCpnCartSq']").each(function(){
 			var cartCpnCartSq 		= $(this).val();
 			var cartCpnDcAmt		= 0;
-			
+						
 			// 장바구니시퀀스 체크
 			$("#orderAmtForm .cartSq").each(function(){
 				if (cartCpnCartSq == $(this).text()) {
@@ -1535,7 +1537,7 @@ var custCpnApplyTemp = function(obj) {
 					var tmtb2DcAmt 		= parseInt($(this).parent().find(".tmtb2DcAmt").text());
 					var goodsCpnDcAmt 	= 0;
 					
-					$(".goodsCpn input[name=cpnCartSq]").each(function(){
+					$("#orderForm .goodsCpn input[name=cpnCartSq]").each(function(){
 						if ($(this).val() == cartCpnCartSq) {
 							goodsCpnDcAmt 	= parseInt($(this).parent().find("input[name=cpnDcAmt]").val());
 						} 
@@ -1558,6 +1560,13 @@ var custCpnApplyTemp = function(obj) {
 			cartCpnDcSumAmt = dcVal;
 		}
 		
+		// 2021.04.19 최대금액 체크
+		if (maxDcAmt > cartCpnDcSumAmt || maxDcAmt == 0) {
+			cartCpnDcSumAmt = cartCpnDcSumAmt;
+		} else {
+			cartCpnDcSumAmt = maxDcAmt;
+		}
+		
 		obj.find("input[name=rdi-cart-coupon]").prop("checked", true);
 		obj.parent().find("input[name=cpnDcAmt]").val(cartCpnDcSumAmt);
 		obj.parent().find("input[name=custCpnSq]").val(obj.attr("value"));
@@ -1568,7 +1577,7 @@ var custCpnApplyTemp = function(obj) {
 	var goodsCartCpnSumAmt 	= 0;
 	var cpnType				= "";
 	
-	$("input[name='cpnDcAmt']").each(function(){
+	$("#couponApplyForm input[name='cpnDcAmt']").each(function(){
 		cpnType = $(this).parent().find("input[name=cpnType]").val();
 		
 		// 상품, 장바구니쿠폰 할인 금액만 합계 적용
@@ -1578,7 +1587,7 @@ var custCpnApplyTemp = function(obj) {
 	});
 	
 	// 상품, 장바구니쿠폰 할인 금액만 합계 적용
-	$(".modal-footer .goodsCartCpnSumAmt").text(getZeroMinusDelAmt(goodsCartCpnSumAmt));
+	$("#couponApplyForm .modal-footer .goodsCartCpnSumAmt").text(getZeroMinusDelAmt(goodsCartCpnSumAmt));
 }
 
 // 1.11 쿠폰중복체크 후 적용가능
@@ -1613,12 +1622,20 @@ var custCpnApply = function(obj) {
 	else if (cpnType == "cartCpn") {
 		var dcWay 				= obj.find("input[name='dcWay']").val();
 		var dcVal 				= obj.find("input[name='dcVal']").val();
+		var maxDcAmt 			= obj.find("input[name='maxDcAmt']").val();
+		var buyLimitAmt 		= obj.find("input[name='buyLimitAmt']").val();
 		var cartCpnDcSumAmt		= 0;
 		var tempSumAmt			= 0;
-		var cartSqLen			= $(".cartSq").length;
+		var cartSqLen			= $("#orderAmtForm .cartSq").length;
 		var leftAmt				= 0;
 		var index				= 1;
 		
+		// 2021.04.19 장바구니시퀀스 값 초기화
+		$("#orderAmtForm .cartSq").each(function(){
+			$(this).parent().find(".cartCpnSq").text(0);
+			$(this).parent().find(".cartCpnDcAmt").text(0);
+		});
+		
 		// 장바구니쿠폰 해당 장바구니상품들 할인가 적용
 		obj.find("input[name='cartCpnCartSq']").each(function(){
 			var cartCpnCartSq 		= $(this).val();
@@ -1657,10 +1674,6 @@ var custCpnApply = function(obj) {
 			obj.find("input[name='payTypeArr']").each(function(i){
 				var payType = $(this).val();
 				$('#orderForm .'+payType).attr("disabled", false);
-				//$('#orderForm .'+payType).eq(0).attr("checked", true);
-				//if (i == 0) {
-					//$("#orderForm input[name=rdi-paynormal]").attr("checked", true);
-				//}
 			});
 		} else {
 			$("#orderForm input[name=rdi-paynormal]").attr("disabled", false);
@@ -1669,11 +1682,21 @@ var custCpnApply = function(obj) {
 		// 선택안함
 		$("#orderForm .payTypeNm").text("선택없음");
 		
+		// 2021.04.19 최대금액 체크
+		if (maxDcAmt > cartCpnDcSumAmt || maxDcAmt == 0) {
+			cartCpnDcSumAmt 	= cartCpnDcSumAmt;
+		} else {
+			// 최대값 적용 일때는 금액할인 방식을 적용
+			cartCpnDcSumAmt 	= maxDcAmt;
+			dcVal				= cartCpnDcSumAmt;
+			dcWay 				= "G240_10";
+		}
+		
 		// 금액일때 할인금액 적용
 		if (dcWay == "G240_10") {
 			cartCpnDcSumAmt = dcVal;
 			leftAmt			= dcVal;
-			index = 1;
+			index 			= 1;
 			
 			// 장바구니쿠폰 해당 장바구니상품들 할인가 적용
 			obj.find("input[name='cartCpnCartSq']").each(function(){
@@ -1684,11 +1707,13 @@ var custCpnApply = function(obj) {
 				$("#orderAmtForm .cartSq").each(function(){
 					if (cartCpnCartSq == $(this).text()) {
 						var orgCurrPrice 	= parseInt($(this).parent().find(".orgCurrPrice").text());
+						var cpn1DcAmt 		= parseInt($(this).parent().find(".cpn1DcAmt").text());
+						var goodsQty 		= parseInt($(this).parent().find(".goodsQty").text());
 						var tmtb1DcAmt 		= parseInt($(this).parent().find(".tmtb1DcAmt").text());
 						var tmtb2DcAmt 		= parseInt($(this).parent().find(".tmtb2DcAmt").text());
 						var goodsCpnDcAmt 	= parseInt($(this).parent().find(".goodsCpnDcAmt").text());
 						
-						var tempAmt 		= orgCurrPrice - tmtb1DcAmt - tmtb2DcAmt - goodsCpnDcAmt;
+						var tempAmt 		= ((orgCurrPrice - cpn1DcAmt) * goodsQty) - tmtb1DcAmt - tmtb2DcAmt - goodsCpnDcAmt;
 						var tempDiv 		= parseInt((tempAmt / tempSumAmt) * 100);
 						var cartCpnDcAmt	= 0;