|
|
@@ -916,7 +916,9 @@ var fnCalculateRefundAmt = function (obj) {
|
|
|
gridOptionsCancelReqToBeList.api.setRowData(result.cancelOrderRefundList);
|
|
|
gridOptionsDelvCdList.api.setRowData(result.cancelDelvRefundList);
|
|
|
|
|
|
+ // 2021.07.01 배송비 수정(마지막취소에만 배송비 환불)
|
|
|
let spanSumDeliveryFee = result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
|
|
|
+ let sumDeliveryFee = result.sumDeliveryFee - result.spanDelvCpnDcAmt;
|
|
|
|
|
|
$("#spanPayAmt").text(result.spanPayAmt.addComma()); //총 결제 금액
|
|
|
$("#spanSumRealOrdAmt").text(result.spanSumRealOrdAmt.addComma()); //상품 실결제 금액
|
|
|
@@ -950,17 +952,17 @@ var fnCalculateRefundAmt = function (obj) {
|
|
|
if (result.spanRealCnclRtnAmt > 0) {
|
|
|
// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
|
|
|
if (isCustomer) {
|
|
|
- result.spanRefundAmt = (result.spanRealCnclRtnAmt + spanSumDeliveryFee) - result.spanTotDeliveryFee;
|
|
|
+ result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee) - result.spanTotDeliveryFee;
|
|
|
|
|
|
// 2021.07.01
|
|
|
// @ 마이너스금액이면 허들깨지면서 배송비 발생
|
|
|
// @ 플러스금액이면 마지막취소시 배송금액 환불
|
|
|
- var spanRealDelvAmt = spanSumDeliveryFee - result.spanTotDeliveryFee;
|
|
|
+ var spanRealDelvAmt = sumDeliveryFee - result.spanTotDeliveryFee;
|
|
|
$("#spanRealDelvAmt").text(spanRealDelvAmt.addComma()); //환불배송비금액
|
|
|
}
|
|
|
// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
|
|
|
else {
|
|
|
- result.spanRefundAmt = (result.spanRealCnclRtnAmt + spanSumDeliveryFee);
|
|
|
+ result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee);
|
|
|
|
|
|
// 2021.05.13 추가배송비금액 수정
|
|
|
$("#spanRealDelvAmt").text(spanSumDeliveryFee.addComma()); //환불배송비금액
|
tsit14