@aptos-scp/scp-component-store-selling-features-domain-model 2.30.0 → 2.30.1

package/lib/domain/model/TenderType.js

@@ -741,8 +741,19 @@ function getOriginalTenderRefundableAmount(originalTender, refundDue, originalTr
         const originalTran = (_b = originalTransactionDetails) === null || _b === void 0 ? void 0 : _b.find((origTran) => origTran.originalTransactionId === originalTenderReferenceTranId);
         if (refundDue) {
             const returnTotalAmount = getReturnOrCancelTotalAmount(originalTran);
+            const originalTenderId = originalTender.isMappedTender
+                ? originalTender.mappedOriginTenderId
+                : originalTender.tenderId;
+            // originalTranTenderAdjustmentTotal is the aggregate of all adjustments that were applied to
+            // the tender in the source transaction
+            const originalTranTenderAdjustmentTotal = originalTran.originalTenders.reduce((adjustmentTotal, tender) => tender.tenderId === originalTenderId && tender.adjustmentAmount instanceof scp_component_business_core_1.Money
+                ? adjustmentTotal.plus(tender.adjustmentAmount)
+                : adjustmentTotal, new scp_component_business_core_1.Money(0, refundDue.currency));
+            // adjust the raw refundableAmount of origTranRef to factor in the total adjustments
+            // applied to the tender
+            const adjustedOriginalTranRefRefundableAmount = adjustAmount(origTranRef.refundableAmount, originalTranTenderAdjustmentTotal);
             // If transaction was partially returned, tranRef.refundableAmount will have the full original tender amount, default to the partial return total amount
-            const originalTenderAmount = getLowestRefundDue(undefined, returnTotalAmount, origTranRef.refundableAmount);
+            const originalTenderAmount = getLowestRefundDue(undefined, returnTotalAmount, adjustedOriginalTranRefRefundableAmount);
             // Mapped tenders will only use their transaction references for refund amount calculation, if they have been fully tendered,
             // they will not have transaction references, do not subtract refunded amount
             const currentTranRefundableAmount = calculateRefundableAmount(originalTenderAmount, originalTender.isMappedTender ? undefined : originalTender.refundedAmount, returnTotalAmount, refundDue);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "2.30.0",
+  "version": "2.30.1",
   "description": "This component library provides the common components to handle the coordination of processing the business events from the UI.",
   "private": false,
   "license": "SEE LICENSE IN LICENSE.md",