|
|
@@ -535,14 +535,14 @@ export default {
|
|
|
|
|
|
const isPaymentFirstThenInvoice = row.transactionMode == 2;
|
|
|
const isNotUnpaid = row.paymentStatus != 0;
|
|
|
- const paymentCondition = isPaymentFirstThenInvoice && isNotUnpaid;
|
|
|
+ const paymentCondition = (isPaymentFirstThenInvoice && isNotUnpaid) || !isPaymentFirstThenInvoice;
|
|
|
|
|
|
const isCashOnDelivery = row.settlementMode == 3;
|
|
|
const isPrepayment = row.paymentType == 1;
|
|
|
const isDelivered = row.deliveryStatus != 0;
|
|
|
const deliveryCondition = isCashOnDelivery && (isPrepayment || (!isPrepayment && isDelivered));
|
|
|
|
|
|
- return isNotFullInvoiced && (paymentCondition || deliveryCondition);
|
|
|
+ return isNotFullInvoiced && ((deliveryCondition || !isCashOnDelivery) && paymentCondition);
|
|
|
};
|
|
|
}
|
|
|
},
|