|
|
@@ -348,6 +348,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>goodsNm</th>
|
|
|
<th>orgCurrPrice</th>
|
|
|
<th>cpn1DcSq</th>
|
|
|
<th>cpn1DcAmt</th>
|
|
|
@@ -984,16 +985,17 @@ 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()
|
|
|
}
|
|
|
|
|
|
@@ -1026,6 +1028,11 @@ var paymentInfoSet = function(jsonData) {
|
|
|
,"prePntDcAmtYn" : prePntDcAmtYn
|
|
|
,"orderDetailList" : orderDetailList
|
|
|
,"delvFeeCdList" : delvFeeCdList
|
|
|
+ ,"shotDelvYn" : shotDelvYn
|
|
|
+ ,"entryNo" : $("input[name='entryNo']").val()
|
|
|
+ ,"payAmt" : $(".realOrdSumAmt").text()
|
|
|
+ ,"goodsNm" : $(".realOrdSumAmt").text()
|
|
|
+ ,"goodsCnt" : $(".realOrdSumAmt").text()
|
|
|
};
|
|
|
|
|
|
var orderData = JSON.stringify(orderData);
|
|
|
@@ -1048,9 +1055,7 @@ var paymentInfoSet = function(jsonData) {
|
|
|
}
|
|
|
});
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
// 1.8 할인영역 설정
|
|
|
dcAmtInfoSet(jsonData);
|
|
|
}
|
|
|
@@ -1274,6 +1279,9 @@ var dcAmtInfoSet = function(jsonData) {
|
|
|
// 금액전체계산
|
|
|
custCpnSumAmtCal();
|
|
|
});
|
|
|
+
|
|
|
+ // 금액계산초기화
|
|
|
+ custCpnSumAmtCal();
|
|
|
}
|
|
|
}
|
|
|
});
|
|
|
@@ -1697,13 +1705,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;
|
|
|
}
|