|
|
@@ -308,6 +308,7 @@
|
|
|
<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none;" name="orderDetailInfo">
|
|
|
<tr style="height:30px;">
|
|
|
<th>cartSq</th>
|
|
|
+ <th style="display:none">goodsNm</th>
|
|
|
<th>orgCurrPrice</th>
|
|
|
<th>cpn1DcSq</th>
|
|
|
<th>cpn1DcAmt</th>
|
|
|
@@ -338,6 +339,7 @@
|
|
|
<th:block th:each="goods, i : ${delvAllCart}">
|
|
|
<tr style="height:30px;">
|
|
|
<td class="cartSq" th:text="${goods.cartSq}"></td>
|
|
|
+ <td class="goodsNm" th:text="${goods.goodsNm}" style="display:none"></td>
|
|
|
<td class="orgCurrPrice" th:text="${goods.orgCurrPrice}"></td>
|
|
|
<td class="cpn1CpnSq" th:text="${goods.cpn1CpnSq}"></td>
|
|
|
<td class="cpn1DcAmt" th:text="${goods.orgCurrPrice} - ${goods.currPrice}"></td>
|
|
|
@@ -673,7 +675,7 @@ $(document).ready( function() {
|
|
|
custemerInfoSet(jsonData);
|
|
|
|
|
|
// 999. 개발화면정보설정
|
|
|
- var devTemp = true;
|
|
|
+ var devTemp = false;
|
|
|
var arr = []
|
|
|
arr[0] = "orderInfo";
|
|
|
arr[1] = "freegiftInfo";
|
|
|
@@ -928,6 +930,8 @@ var paymentInfoSet = function(jsonData) {
|
|
|
var prePntDcAmtYn = $("input[name='rdi-beforpoint']:checked").val();
|
|
|
var orderDetailList = [];
|
|
|
var delvFeeCdList = [];
|
|
|
+ var ordGoodsQty = 0;
|
|
|
+ var goodsNm = "";
|
|
|
|
|
|
// 주문상세데이타 생성
|
|
|
$(".cartSq").each(function(){
|
|
|
@@ -944,19 +948,23 @@ var paymentInfoSet = function(jsonData) {
|
|
|
,"tmtb2Sq" : $(this).parent().find(".tmtb2Sq").text()
|
|
|
,"tmtb2DcAmt" : $(this).parent().find(".tmtb2DcAmt").text()
|
|
|
,"goodsCpnSq" : $(this).parent().find(".goodsCpnSq").text()
|
|
|
- ,"goodsCpnDCAmt" : $(this).parent().find(".goodsCpnDCAmt").text()
|
|
|
+ ,"goodsCpnDcAmt" : $(this).parent().find(".goodsCpnDcAmt").text()
|
|
|
,"cartCpnSq" : $(this).parent().find(".cartCpnSq").text()
|
|
|
- ,"carrtCpnDCAmt" : $(this).parent().find(".cartCpnDCAmt").text()
|
|
|
+ ,"cartCpnDcAmt" : $(this).parent().find(".cartCpnDcAmt").text()
|
|
|
,"prePntDcAmt" : $(this).parent().find(".prePntDcAmt1").text()
|
|
|
,"pntDcAmt" : $(this).parent().find(".pntDcAmt1").text()
|
|
|
,"gfcdUseAmt" : $(this).parent().find(".gfcdUseAmt1").text()
|
|
|
+ ,"realOrdAmt" : $(this).parent().find(".realOrdAmt1").text()
|
|
|
,"savePntAmt" : $(this).parent().find(".savePntAmt1").text()
|
|
|
,"shotDelvYn" : $(this).parent().find(".shotDelvYn").text()
|
|
|
,"foreignBuyYn" : $(this).parent().find(".foreignYn").text()
|
|
|
- ,"orderMadeYn" : $(this).parent().find(".orderMadeYn").text()
|
|
|
+ ,"makeGoodsYn" : $(this).parent().find(".orderMadeYn").text()
|
|
|
,"delvFeeCd" : $(this).parent().find(".delvFeeCd").text()
|
|
|
}
|
|
|
|
|
|
+ // 상품수
|
|
|
+ ordGoodsQty++;
|
|
|
+
|
|
|
orderDetailList.push(orderDetailData);
|
|
|
});
|
|
|
|
|
|
@@ -986,6 +994,15 @@ var paymentInfoSet = function(jsonData) {
|
|
|
,"prePntDcAmtYn" : prePntDcAmtYn
|
|
|
,"orderDetailList" : orderDetailList
|
|
|
,"delvFeeCdList" : delvFeeCdList
|
|
|
+ ,"shotDelvYn" : shotDelvYn
|
|
|
+ ,"entryNo" : $("input[name='entryNo']").val()
|
|
|
+ ,"pgGb" : "KCP"
|
|
|
+ ,"payMeans" : "G014_30"
|
|
|
+ ,"payAmt" : $(".realOrdSumAmt").text()
|
|
|
+ ,"ordNm" : $(".custNm").text()
|
|
|
+ ,"ordPhnno" : $(".cellPhnno").text()
|
|
|
+ ,"goodsNm" : $(".goodsNm").eq(0).text()
|
|
|
+ ,"ordGoodsQty" : ordGoodsQty
|
|
|
};
|
|
|
|
|
|
var orderData = JSON.stringify(orderData);
|
|
|
@@ -1003,14 +1020,12 @@ var paymentInfoSet = function(jsonData) {
|
|
|
},
|
|
|
success : function(result) {
|
|
|
// 결재정보로드
|
|
|
- //$("#order_info").html(result);
|
|
|
- //jsf__pay(document.order_info);
|
|
|
+ $("#order_info").html(result);
|
|
|
+ jsf__pay(document.order_info);
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
// 1.8 할인영역 설정
|
|
|
dcAmtInfoSet(jsonData);
|
|
|
}
|
|
|
@@ -1234,6 +1249,9 @@ var dcAmtInfoSet = function(jsonData) {
|
|
|
// 금액전체계산
|
|
|
custCpnSumAmtCal();
|
|
|
});
|
|
|
+
|
|
|
+ // 금액계산초기화
|
|
|
+ custCpnSumAmtCal();
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -1657,13 +1675,13 @@ var custCpnSumAmtCal = function() {
|
|
|
cpnDcSumAmt = cpnDcSumAmt + (goodsCpnDcAmt + cartCpnDcAmt);
|
|
|
prePntDcSumAmt = prePntDcSumAmt + prePntDcAmt1;
|
|
|
|
|
|
- var ordAmt = ((orgCurrPrice - cpn1DcAmt) + optAddPrice) * goodsQty;
|
|
|
+ var ordAmt = ((orgCurrPrice + - cpn1DcAmt) + optAddPrice) * goodsQty;
|
|
|
ordSumAmt = ordSumAmt + ordAmt;
|
|
|
|
|
|
// 선포인트사용여부
|
|
|
// 할인금액합계 = 다다익선수량금액 + 다다익선금액금액 + 상품쿠폰금액 + 장바구니금액 + 선포인트금액
|
|
|
if (prePntDcAmtYn == "Y") {
|
|
|
- dcSumAmt = tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt + prePntDcAmt1;
|
|
|
+ dcSumAmt = tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt + prePntDcAmt1;
|
|
|
} else {
|
|
|
dcSumAmt = tmtb1DcAmt + tmtb2DcAmt + goodsCpnDcAmt + cartCpnDcAmt;
|
|
|
}
|
card007