@aptos-scp/scp-component-store-selling-features-domain-model 2.30.0 → 2.31.0-patch.1

package/lib/domain/model/Customer.js

@@ -210,6 +210,7 @@ class Customer {
             customer.loyaltyMembershipLookupIndicator = customerFromJson.loyaltyMembershipLookupIndicator;
             customer.hasLoyaltyMemberships = customerFromJson.hasLoyaltyMemberships;
             customer.loyaltyMemberships = customerFromJson.loyaltyMemberships;
+            customer.hiddenLoyaltyMemberships = customerFromJson.hiddenLoyaltyMemberships;
             customer.availableLoyaltyPlans = customerFromJson.availableLoyaltyPlans;
             customer.allowPromptForLoyaltyEnrollment = customerFromJson.allowPromptForLoyaltyEnrollment;
             customer.earliestNextLoyaltyEnrollmentPromptDate =

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/lib/domain/model/fee/FeeLine.js

@@ -292,24 +292,24 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
         return transactionLineJsonObj._taxGroupId;
     }
     static getExtendedAmountFromCollectedData(collectedData) {
-        if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmount) && FeeLine.isPickupFulfilmentTransaction) {
+        if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmount)) {
             return collectedData.get(Constants_1.CollectedDataKey.FeeExtendedAmount);
         }
-        undefined;
+        return undefined;
     }
     static getExtendedAmountExcludingTaxFromCollectedData(collectedData) {
         if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmountExcludingTax) &&
             FeeLine.isPickupFulfilmentTransaction) {
             return collectedData.get(Constants_1.CollectedDataKey.FeeExtendedAmountExcludingTax);
         }
-        undefined;
+        return undefined;
     }
     static getExtendedAmountIncludingTaxFromCollectedData(collectedData) {
         if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmountIncludingTax) &&
             FeeLine.isPickupFulfilmentTransaction) {
             return collectedData.get(Constants_1.CollectedDataKey.FeeExtendedAmountIncludingTax);
         }
-        undefined;
+        return undefined;
     }
     copyLineWithNewLineNumber(newLineNumber) {
         const clonedItem = this.clone();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "2.30.0",
+  "version": "2.31.0-patch.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",