@aptos-scp/scp-component-store-selling-features-domain-model 1.45.0-patch.8 → 1.45.1

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

@@ -1034,4 +1034,3 @@ export declare enum AssignCustomerForReturnAction {
     Skip = "Skip"
 }
 export declare const DELIVERY_CONTACT_UPDATED_EVENT: string;
-export declare const DELIVERY_SHIPPING_FEE_UPDATED_EVENT: string;

package/lib/domain/model/Constants.js

@@ -1041,5 +1041,4 @@ var AssignCustomerForReturnAction;
     AssignCustomerForReturnAction["Skip"] = "Skip";
 })(AssignCustomerForReturnAction = exports.AssignCustomerForReturnAction || (exports.AssignCustomerForReturnAction = {}));
 exports.DELIVERY_CONTACT_UPDATED_EVENT = "Delivery.ContactUpdated";
-exports.DELIVERY_SHIPPING_FEE_UPDATED_EVENT = "Delivery.ShippingFeeUpdated";
 //# sourceMappingURL=Constants.js.map

package/lib/domain/model/FulfillmentGroup.js

@@ -93,7 +93,7 @@ class FulfillmentGroup {
         return this;
     }
     static getDeliveryAddress(contact) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w;
         const primaryAddress = (_a = contact.addresses) === null || _a === void 0 ? void 0 : _a.find((address) => address.primaryIndicator);
         return {
             addressLine1: ((_b = contact) === null || _b === void 0 ? void 0 : _b.address1) || ((_c = primaryAddress) === null || _c === void 0 ? void 0 : _c.address1),
@@ -106,7 +106,6 @@ class FulfillmentGroup {
             countryCode: ((_r = contact) === null || _r === void 0 ? void 0 : _r.countryCode) || ((_s = primaryAddress) === null || _s === void 0 ? void 0 : _s.countryCode),
             firstAdminDivision: ((_t = contact) === null || _t === void 0 ? void 0 : _t.firstAdminDivision) || ((_u = primaryAddress) === null || _u === void 0 ? void 0 : _u.firstAdminDivision),
             firstAdminDivisionCode: ((_v = contact) === null || _v === void 0 ? void 0 : _v.firstAdminDivisionCode) || ((_w = primaryAddress) === null || _w === void 0 ? void 0 : _w.firstAdminDivisionCode),
-            firstAdminDivisionType: ((_x = contact) === null || _x === void 0 ? void 0 : _x.firstAdminDivisionType) || ((_y = primaryAddress) === null || _y === void 0 ? void 0 : _y.firstAdminDivisionType),
         };
     }
     static getDeliveryContact(contact) {

package/lib/domain/model/TenderType.js

@@ -141,15 +141,13 @@ class TenderType {
         var _a, _b, _c, _d;
         let total = new scp_component_business_core_1.Money(0, accountingCurrency);
         (_b = (_a = displayInfo) === null || _a === void 0 ? void 0 : _a.shippingFeeDisplayLines) === null || _b === void 0 ? void 0 : _b.forEach((shippingFeeDisplayLine) => {
-            var _a;
             if (shippingFeeDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.TransactionFeeRefund) {
-                total = total.plus((_a = shippingFeeDisplayLine.extendedAmountIncludingTax) === null || _a === void 0 ? void 0 : _a.abs());
+                total = total.plus(shippingFeeDisplayLine.extendedAmountIncludingTax.abs());
             }
         });
         (_d = (_c = displayInfo) === null || _c === void 0 ? void 0 : _c.itemFeeDisplayLines) === null || _d === void 0 ? void 0 : _d.forEach((itemFeeDisplayLine) => {
-            var _a;
             if (itemFeeDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemFeeRefund) {
-                total = total.plus((_a = itemFeeDisplayLine.extendedAmountIncludingTax) === null || _a === void 0 ? void 0 : _a.abs());
+                total = total.plus(itemFeeDisplayLine.extendedAmount.abs());
             }
         });
         return total;
@@ -238,7 +236,8 @@ class TenderType {
         withoutTransactionTotal = withoutTransactionTotal.plus(withoutTransactionItemAmount);
         const withoutTransactionTenderedAmount = TenderType.getTenderedAmountsWithoutTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
         withoutTransactionTotal = withoutTransactionTotal.minus(withoutTransactionTenderedAmount);
-        // shipping and item fee are not returned on RWOR
+        const feesTotal = TenderType.getFeesTotal(displayInfo, accountingCurrency);
+        withoutTransactionTotal = withoutTransactionTotal.plus(feesTotal);
         return withoutTransactionTotal;
     }
     static getWithTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
@@ -256,12 +255,11 @@ class TenderType {
         var _a, _b;
         let withOfflineTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
         const withOfflineTransactionItemAmount = TenderType.getItemAmountsWithOfflineTransaction((_a = displayInfo) === null || _a === void 0 ? void 0 : _a.itemDisplayLines, accountingCurrency);
-        if (withOfflineTransactionItemAmount.isPositive()) {
-            withOfflineTransactionTotal = withOfflineTransactionTotal.plus(withOfflineTransactionItemAmount);
-            const withOfflineTransactionTenderedAmount = TenderType.getTenderedAmountsWithOfflineTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
-            withOfflineTransactionTotal = withOfflineTransactionTotal.minus(withOfflineTransactionTenderedAmount);
-        }
-        // shipping and item fee are not returned on offline returns
+        withOfflineTransactionTotal = withOfflineTransactionTotal.plus(withOfflineTransactionItemAmount);
+        const withOfflineTransactionTenderedAmount = TenderType.getTenderedAmountsWithOfflineTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
+        withOfflineTransactionTotal = withOfflineTransactionTotal.minus(withOfflineTransactionTenderedAmount);
+        const feesTotal = TenderType.getFeesTotal(displayInfo, accountingCurrency);
+        withOfflineTransactionTotal = withOfflineTransactionTotal.plus(feesTotal);
         return withOfflineTransactionTotal;
     }
     static getOriginalRefundableTenders(container, accountingCurrency, originalTransactionsDetails, balanceDue, itemTypes, orderTypes, isRefund, productAttributeTypes, displayInfo) {

package/lib/domain/model/discounts/lineTypes.js

@@ -7,22 +7,18 @@ exports.ITEM_MANUAL_DISCOUNT_LINE_TYPE = "ItemManualDiscount";
 exports.TRANSACTION_MANUAL_DISCOUNT_LINE_TYPE = "TransactionManualDiscount";
 exports.LOYALTY_DISCOUNT_LINE_TYPE = "LoyaltyDiscount";
 function isManualItemDiscountLine(transactionLine) {
-    return (transactionLine &&
-        (transactionLine instanceof ManualItemDiscountLine_1.ManualItemDiscountLine ||
-            (transactionLine.lineType === exports.ITEM_MANUAL_DISCOUNT_LINE_TYPE &&
-                transactionLine.itemLineReference !== undefined)));
+    return (transactionLine instanceof ManualItemDiscountLine_1.ManualItemDiscountLine ||
+        (transactionLine.lineType === exports.ITEM_MANUAL_DISCOUNT_LINE_TYPE &&
+            transactionLine.itemLineReference !== undefined));
 }
 exports.isManualItemDiscountLine = isManualItemDiscountLine;
 function isManualTransactionDiscountLine(transactionLine) {
-    return (transactionLine &&
-        (transactionLine instanceof ManualTransactionDiscountLine_1.ManualTransactionDiscountLine ||
-            transactionLine.lineType === exports.TRANSACTION_MANUAL_DISCOUNT_LINE_TYPE));
+    return (transactionLine instanceof ManualTransactionDiscountLine_1.ManualTransactionDiscountLine ||
+        transactionLine.lineType === exports.TRANSACTION_MANUAL_DISCOUNT_LINE_TYPE);
 }
 exports.isManualTransactionDiscountLine = isManualTransactionDiscountLine;
 function isLoyaltyDiscountLine(transactionLine) {
-    return (transactionLine &&
-        (transactionLine instanceof LoyaltyDiscountLine_1.LoyaltyDiscountLine ||
-            transactionLine.lineType === exports.LOYALTY_DISCOUNT_LINE_TYPE));
+    return (transactionLine instanceof LoyaltyDiscountLine_1.LoyaltyDiscountLine || transactionLine.lineType === exports.LOYALTY_DISCOUNT_LINE_TYPE);
 }
 exports.isLoyaltyDiscountLine = isLoyaltyDiscountLine;
 function isManualDiscountLine(transactionLine) {

package/lib/domain/model/fee/FeeLineExtendedAmountDecorator.d.ts

@@ -1,5 +1,5 @@
 import { Money } from "@aptos-scp/scp-component-business-core";
-import { IExtendedAmountMaintainer, ITransactionLine } from "@aptos-scp/scp-component-store-selling-core";
+import { ITransactionLine } from "@aptos-scp/scp-component-store-selling-core";
 import { IAppliedTax } from "@aptos-scp/scp-component-taxation";
 import { ITransactionLineTaxes } from "../item/IItemLine";
 import { BaseFeeLineDecorator } from "./BaseFeeLineDecorator";
@@ -11,7 +11,7 @@ export interface IExtendedAmountFields {
     taxByAuthority?: IAppliedTax[];
     totalLineTax?: Money;
 }
-export declare abstract class FeeLineExtendedAmountDecorator extends BaseFeeLineDecorator implements IExtendedAmountMaintainer {
+export declare abstract class FeeLineExtendedAmountDecorator extends BaseFeeLineDecorator {
     protected _newExtendedAmount: Money;
     protected _newExtendedAmountExcludingTax: Money;
     protected _newExtendedAmountIncludingTax: Money;
@@ -29,7 +29,6 @@ export declare abstract class FeeLineExtendedAmountDecorator extends BaseFeeLine
     get taxByAuthority(): IAppliedTax[];
     get totalLineTax(): Money;
     get extendedAmountExcludingTransactionDiscounts(): Money;
-    updateExtendedAmount(amount: Money): ITransactionLine;
     updateExtendedAmountExcludingTax(amount: Money): ITransactionLine;
     updateExtendedAmountIncludingTax(amount: Money): ITransactionLine;
     setTransactionLineTaxes(transactionLineTaxes: ITransactionLineTaxes, extendedAmount?: Money): FeeLineExtendedAmountDecorator;

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

@@ -95,12 +95,6 @@ class FeeLineExtendedAmountDecorator extends BaseFeeLineDecorator_1.BaseFeeLineD
     get extendedAmountExcludingTransactionDiscounts() {
         return this.extendedAmount;
     }
-    updateExtendedAmount(amount) {
-        amount = FeeLine_1.adjustSignForFeeLineType(this.lineType, amount);
-        const newLine = this.clone();
-        newLine._newExtendedAmount = amount;
-        return newLine;
-    }
     updateExtendedAmountExcludingTax(amount) {
         amount = FeeLine_1.adjustSignForFeeLineType(this.lineType, amount);
         const newLine = this.clone();

package/lib/domain/model/shipping/ShippingFeeLineChangeDecorator.d.ts

@@ -2,11 +2,10 @@ import { Money } from "@aptos-scp/scp-component-business-core";
 import { ITransactionLineFactory } from "@aptos-scp/scp-component-store-selling-core";
 import { FeeLine } from "../fee/FeeLine";
 import { BaseFeeLineDecorator } from "../fee/BaseFeeLineDecorator";
-import { FeeLineExtendedAmountDecorator, IExtendedAmountFields } from "../fee/FeeLineExtendedAmountDecorator";
 import { IFulfillmentGroupFee } from "../fee/IFeeLine";
 export declare const SHIPPING_FEE_CHANGE_ANNOTATION_SOURCE_TYPE: string;
 export declare const DECORATOR_TYPE_SHIPPING_FEE_LINE_CHANGE: string;
-export declare class ShippingFeeLineChangeDecorator extends FeeLineExtendedAmountDecorator {
+export declare class ShippingFeeLineChangeDecorator extends BaseFeeLineDecorator {
     private _newUnitAmount;
     private _feesByFulfillmentGroup;
     private _newTaxGroupId;
@@ -14,7 +13,7 @@ export declare class ShippingFeeLineChangeDecorator extends FeeLineExtendedAmoun
     private _newDescription;
     private _newLongDescription;
     static createFromJsonObject(transactionLineJsonObj: any, transactionLineFactory: ITransactionLineFactory): ShippingFeeLineChangeDecorator;
-    constructor(feeLine?: FeeLine, annotationSourceLineNumber?: number, newUnitAmount?: Money, feesByFulfillmentGroup?: IFulfillmentGroupFee[], newTaxGroupId?: string, newFeeId?: string, newDescription?: string, newLongDescription?: string, extendedAmountFields?: IExtendedAmountFields);
+    constructor(feeLine?: FeeLine, annotationSourceLineNumber?: number, newUnitAmount?: Money, feesByFulfillmentGroup?: IFulfillmentGroupFee[], newTaxGroupId?: string, newFeeId?: string, newDescription?: string, newLongDescription?: string);
     get unitAmount(): Money;
     get unitAmountBeforeOverride(): Money;
     get feesByFulfillmentGroup(): IFulfillmentGroupFee[];

package/lib/domain/model/shipping/ShippingFeeLineChangeDecorator.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const scp_component_business_core_1 = require("@aptos-scp/scp-component-business-core");
 const BaseFeeLineDecorator_1 = require("../fee/BaseFeeLineDecorator");
-const FeeLineExtendedAmountDecorator_1 = require("../fee/FeeLineExtendedAmountDecorator");
 exports.SHIPPING_FEE_CHANGE_ANNOTATION_SOURCE_TYPE = "ShippingFee";
 exports.DECORATOR_TYPE_SHIPPING_FEE_LINE_CHANGE = "SHIPPING_FEE_LINE_DECORATOR";
-class ShippingFeeLineChangeDecorator extends FeeLineExtendedAmountDecorator_1.FeeLineExtendedAmountDecorator {
-    constructor(feeLine, annotationSourceLineNumber, newUnitAmount, feesByFulfillmentGroup, newTaxGroupId, newFeeId, newDescription, newLongDescription, extendedAmountFields) {
-        super(exports.DECORATOR_TYPE_SHIPPING_FEE_LINE_CHANGE, feeLine, undefined, exports.SHIPPING_FEE_CHANGE_ANNOTATION_SOURCE_TYPE, annotationSourceLineNumber, extendedAmountFields);
+class ShippingFeeLineChangeDecorator extends BaseFeeLineDecorator_1.BaseFeeLineDecorator {
+    constructor(feeLine, annotationSourceLineNumber, newUnitAmount, feesByFulfillmentGroup, newTaxGroupId, newFeeId, newDescription, newLongDescription) {
+        super(exports.DECORATOR_TYPE_SHIPPING_FEE_LINE_CHANGE, feeLine, undefined, exports.SHIPPING_FEE_CHANGE_ANNOTATION_SOURCE_TYPE, annotationSourceLineNumber);
         this._newUnitAmount = newUnitAmount;
         this._feesByFulfillmentGroup = feesByFulfillmentGroup;
         this._newTaxGroupId = newTaxGroupId;
@@ -37,12 +36,11 @@ class ShippingFeeLineChangeDecorator extends FeeLineExtendedAmountDecorator_1.Fe
         });
         const feesByFulfillmentGroup = transactionLineJsonObj._feesByFulfillmentGroup;
         const annotationSourceLineNumber = BaseFeeLineDecorator_1.BaseFeeLineDecorator.getAnnotationSourceLineNumberFromJsonObject(transactionLineJsonObj);
-        const extendedAmountFields = FeeLineExtendedAmountDecorator_1.FeeLineExtendedAmountDecorator.getExtendedAmountFieldsFromJsonObject(transactionLineJsonObj);
         const newTaxGroupId = transactionLineJsonObj._newTaxGroupId;
         const newFeeId = transactionLineJsonObj._newFeeId;
         const newDescription = transactionLineJsonObj._newDescription;
         const newLongDescription = transactionLineJsonObj._newLongDescription;
-        const feeLineQuantityChangeDecorator = new ShippingFeeLineChangeDecorator(decoratedFeeLine, annotationSourceLineNumber, newUnitAmount, feesByFulfillmentGroup, newTaxGroupId, newFeeId, newDescription, newLongDescription, extendedAmountFields);
+        const feeLineQuantityChangeDecorator = new ShippingFeeLineChangeDecorator(decoratedFeeLine, annotationSourceLineNumber, newUnitAmount, feesByFulfillmentGroup, newTaxGroupId, newFeeId, newDescription, newLongDescription);
         return feeLineQuantityChangeDecorator;
     }
     get unitAmount() {
@@ -76,13 +74,7 @@ class ShippingFeeLineChangeDecorator extends FeeLineExtendedAmountDecorator_1.Fe
         return newShippingFeeLineChangeDecorator;
     }
     newTransactionLine() {
-        return new ShippingFeeLineChangeDecorator(this.decoratedTransactionLine, this.annotationSourceLineNumber, this._newUnitAmount, this._feesByFulfillmentGroup, this._newTaxGroupId, this._newFeeId, this._newDescription, this._newLongDescription, {
-            extendedAmount: this.extendedAmount,
-            extendedAmountExcludingTax: this.extendedAmountExcludingTax,
-            extendedAmountIncludingTax: this.extendedAmountIncludingTax,
-            taxByAuthority: this.taxByAuthority,
-            totalLineTax: this.totalLineTax,
-        });
+        return new ShippingFeeLineChangeDecorator(this.decoratedTransactionLine, this.annotationSourceLineNumber, this._newUnitAmount, this._feesByFulfillmentGroup, this._newTaxGroupId, this._newFeeId, this._newDescription, this._newLongDescription);
     }
 }
 exports.ShippingFeeLineChangeDecorator = ShippingFeeLineChangeDecorator;

package/package.json

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