@aptos-scp/scp-component-store-selling-features-domain-model 1.53.2 → 1.53.3-patch.1

package/lib/domain/model/Constants.d.ts

@@ -614,6 +614,7 @@ export declare enum CollectedDataKey {
     ExtendedAmountFromExternalItem = "extendedAmountFromExternalItem",
     ExtendedAmountIncludingTaxFromExternalItem = "extendedAmountIncludingTaxFromExternalItem",
     ExtendedAmountExcludingTaxFromExternalItem = "extendedAmountExcludingTaxFromExternalItem",
+    OriginalAdjustments = "originalAdjustments",
     OriginalTenderLineReferences = "originalTenderLineReferences",
     OriginalTenderReferences = "originalTenderReferences",
     OriginalTransactionReference = "originalTransactionReference",

package/lib/domain/model/Constants.js

@@ -623,6 +623,7 @@ var CollectedDataKey;
     CollectedDataKey["ExtendedAmountFromExternalItem"] = "extendedAmountFromExternalItem";
     CollectedDataKey["ExtendedAmountIncludingTaxFromExternalItem"] = "extendedAmountIncludingTaxFromExternalItem";
     CollectedDataKey["ExtendedAmountExcludingTaxFromExternalItem"] = "extendedAmountExcludingTaxFromExternalItem";
+    CollectedDataKey["OriginalAdjustments"] = "originalAdjustments";
     CollectedDataKey["OriginalTenderLineReferences"] = "originalTenderLineReferences";
     CollectedDataKey["OriginalTenderReferences"] = "originalTenderReferences";
     CollectedDataKey["OriginalTransactionReference"] = "originalTransactionReference";

package/lib/domain/model/fee/BaseFeeLineDecorator.js

@@ -64,7 +64,12 @@ class BaseFeeLineDecorator extends BaseLineDecorator_1.BaseLineDecorator {
         return this.decoratedTransactionLine.extendedAmount;
     }
     get extendedAmountAdjustment() {
-        return this.extendedAmount.minus(this.decoratedTransactionLine.extendedAmount);
+        if (this.decoratedTransactionLine.extendedAmount) {
+            return this.extendedAmount.minus(this.decoratedTransactionLine.extendedAmount);
+        }
+        else {
+            return this._lineSavings.times(-1);
+        }
     }
     get extendedAmountExcludingTax() {
         return this.decoratedTransactionLine.extendedAmountExcludingTax;

package/lib/domain/model/item/ISerializedPriceCalculationResultsWithSource.d.ts

@@ -1,6 +1,6 @@
 import { IPricingMetadataPersistanceObject, ISerializedLinePricingAdjustment, ISerializedSubline, ISerializedSublinePricingAdjustment, ISublinePricingAdjustment, RewardIssue } from "@aptos-scp/scp-component-pricing";
 import { ISerializedNonFinancialReward } from "@aptos-scp/scp-component-pricing/lib/interfaces/ILineNonFinancialReward";
-import { ICompetitivePriceInformation, ILoyaltyInformation, ISupervisorOverrideInformation, SourceIndicator } from "@aptos-scp/scp-types-commerce-transaction";
+import { ICompetitivePriceInformation, ILoyaltyInformation, ISupervisorOverrideInformation, PricingAdjustmentScope, SourceIndicator } from "@aptos-scp/scp-types-commerce-transaction";
 import { PotentialPromotion } from "@aptos-scp/scp-types-pricing";
 export interface ISerializedPriceCalculationResultsWithSource {
     readonly lineAdjustments: ISerializedLinePricingAdjustmentWithSource[];
@@ -34,6 +34,7 @@ export interface ISerializedSublinePricingAdjustmentWithSource extends ISerializ
     isEmployeeDiscount?: boolean;
 }
 export interface ISublinePricingAdjustmentWithSource extends ISublinePricingAdjustment {
+    adjustmentScope?: PricingAdjustmentScope;
     sourceIndicator?: SourceIndicator;
     reasonCode?: string;
     reasonListType?: string;

package/lib/domain/model/item/ItemLine.d.ts

@@ -109,6 +109,7 @@ export declare class ItemLine extends BaseTransactionLine implements IItemLine,
     private _originalRedemptionLoyaltyTransactionKeys?;
     private _originalSaleLoyaltyTransactionKeys?;
     private _originalDiscountReason?;
+    private _originalAdjustments?;
     private _taxIndicatorOnReceipt?;
     /**
      * The create method is called by the transaction line factory to create an instance and initialize it from the

package/lib/domain/model/item/ItemLine.js

@@ -54,6 +54,7 @@ class ItemLine extends BaseTransactionLine_1.BaseTransactionLine {
         const lineNumberFromOrder = collectedData.get(Constants_1.CollectedDataKey.LineNumberFromOrder);
         const lineSavings = collectedData.get(Constants_1.CollectedDataKey.LineSavings);
         const sendSaleLine = collectedData.get(Constants_1.CollectedDataKey.SendSaleItem);
+        const originalAdjustments = collectedData.get(Constants_1.CollectedDataKey.OriginalAdjustments);
         accountingCurrency = (storeItem.price && storeItem.price.amount.currency) || accountingCurrency;
         let itemLine = new ItemLine(lineNumber, lineType, (storeItem.price && storeItem.price.amount.currency) || accountingCurrency, lineSavings);
         if (additionalItemInfo) {
@@ -233,6 +234,11 @@ class ItemLine extends BaseTransactionLine_1.BaseTransactionLine {
                 itemLine._preTaxOverrideDetails = originalTaxOverride.preTaxOverrideDetails;
             }
         }
+        if (((lineType === exports.ITEM_SALE_LINE_TYPE && uiBusinessEvent.type === UIBusinessEventTypes_1.ORDER_ITEM_PICKUP_EVENT) ||
+            (lineType === exports.ITEM_CANCEL_LINE_TYPE && uiBusinessEvent.type === UIBusinessEventTypes_1.ORDER_ITEM_CANCELLATION_EVENT)) &&
+            originalAdjustments) {
+            itemLine._originalAdjustments = originalAdjustments;
+        }
         const originalRedemptionLoyaltyTransactionKeys = collectedData.get(Constants_1.CollectedDataKey.OriginalRedemptionLoyaltyTransactionKeys);
         if (((_f = originalRedemptionLoyaltyTransactionKeys) === null || _f === void 0 ? void 0 : _f.length) > 0) {
             itemLine._originalRedemptionLoyaltyTransactionKeys = originalRedemptionLoyaltyTransactionKeys;
@@ -611,7 +617,7 @@ class ItemLine extends BaseTransactionLine_1.BaseTransactionLine {
         return this._originalTaxOverride;
     }
     get originalAdjustments() {
-        return undefined;
+        return this._originalAdjustments;
     }
     get eligibleForSubscription() {
         return this._eligibleForSubscription;
@@ -936,6 +942,7 @@ class ItemLine extends BaseTransactionLine_1.BaseTransactionLine {
         newItemLine._extendedRegularAmount = this._extendedRegularAmount;
         newItemLine._originalRedemptionLoyaltyTransactionKeys = this._originalRedemptionLoyaltyTransactionKeys;
         newItemLine._originalSaleLoyaltyTransactionKeys = this._originalSaleLoyaltyTransactionKeys;
+        newItemLine._originalAdjustments = this._originalAdjustments;
         return newItemLine;
     }
     // eslint-disable-next-line complexity
@@ -1078,6 +1085,7 @@ class ItemLine extends BaseTransactionLine_1.BaseTransactionLine {
             transactionLineJsonObj._originalRedemptionLoyaltyTransactionKeys;
         this._originalSaleLoyaltyTransactionKeys = transactionLineJsonObj._originalSaleLoyaltyTransactionKeys;
         this._originalDiscountReason = transactionLineJsonObj.originalDiscountReason;
+        this._originalAdjustments = transactionLineJsonObj._originalAdjustments;
     }
     newTransactionLine() {
         return new ItemLine(this.lineNumber, this.lineType, this._accountingCurrency);

package/lib/domain/model/item/ItemLineManualDiscountDecorator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const scp_component_business_core_1 = require("@aptos-scp/scp-component-business-core");
 const StoreItem_1 = require("../StoreItem");
 const BaseItemLineDecorator_1 = require("./BaseItemLineDecorator");
+const ItemLine_1 = require("./ItemLine");
 const ItemLineBaseDiscountDecorator_1 = require("./ItemLineBaseDiscountDecorator");
 exports.DECORATOR_TYPE_ITEM_LINE_MANUAL_ITEM_DISCOUNT = "ITEM_LINE_MANUAL_ITEM_DISCOUNT_DECORATOR";
 exports.DECORATOR_TYPE_ITEM_LINE_EMPLOYEE_ITEM_DISCOUNT = "ITEM_LINE_EMPLOYEE_ITEM_DISCOUNT_DECORATOR";
@@ -167,7 +168,9 @@ class ItemLineManualDiscountDecorator extends ItemLineBaseDiscountDecorator_1.It
             : this.unitPrice;
     }
     get extendedAmountExcludingTransactionDiscounts() {
-        return this.lineDecoratorType === exports.DECORATOR_TYPE_ITEM_LINE_MANUAL_TRANSACTION_DISCOUNT
+        return this.lineDecoratorType === exports.DECORATOR_TYPE_ITEM_LINE_MANUAL_TRANSACTION_DISCOUNT &&
+            !ItemLine_1.isFulfillmentLine(this.decoratedTransactionLine) &&
+            !ItemLine_1.isCancelLine(this.decoratedTransactionLine)
             ? this.decoratedTransactionLine.extendedAmountExcludingTransactionDiscounts
             : this.decoratedTransactionLine.extendedAmountExcludingTransactionDiscounts.minus(this.adjustmentAmount);
     }

package/package.json

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