@aptos-scp/scp-component-store-selling-features-domain-model 1.45.0-patch.2 → 1.45.0-patch.3

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

@@ -98,6 +98,13 @@ export declare class TenderType {
     static getActiveRefundConfiguredTenderGroups(container: Container, accountingCurrency: string, withTransaction: boolean, activeTenders: TenderType[], originalTransactionsDetails: IOriginalTransactionDetails[], withOfflineTransaction: boolean): ITenderGroup[];
     static tenderIsCreditOrDebit(tenderType: any): boolean;
     static getRefundableAmountByGroup(group: ITenderGroup, displayInfo: any, currency: string, configuration: IConfigurationManager, refundDue?: Money): Money;
+    static getFeesTotal(displayInfo: any, accountingCurrency: string): Money;
+    static getTenderedAmountsWithoutTransaction(tenderDisplayLines: any[], accountingCurrency: string, configurationManager: IConfigurationManager): Money;
+    static getTenderedAmountsWithTransaction(tenderDisplayLines: any[], accountingCurrency: string, configurationManager: IConfigurationManager): Money;
+    static getTenderedAmountsWithOfflineTransaction(tenderDisplayLines: any[], accountingCurrency: string, configurationManager: IConfigurationManager): Money;
+    static getItemAmountsWithoutTransaction(itemDisplayLines: any[], accountingCurrency: string): Money;
+    static getItemAmountsWithTransaction(itemDisplayLines: any[], accountingCurrency: string): Money;
+    static getItemAmountsWithOfflineTransaction(itemDisplayLines: any[], accountingCurrency: string): Money;
     static getWithoutTransactionTotal(displayInfo: any, accountingCurrency: string, configurationManager: IConfigurationManager): Money;
     static getWithTransactionTotal(displayInfo: any, accountingCurrency: string, configurationManager: IConfigurationManager): Money;
     static getWithOfflineTransactionTotal(displayInfo: any, accountingCurrency: string, configurationManager: IConfigurationManager): Money;

package/lib/domain/model/TenderType.js

@@ -137,75 +137,129 @@ class TenderType {
         }
         return getLowestRefundDue(refundDue, undefined, refundableAmount);
     }
-    static getWithoutTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
+    static getFeesTotal(displayInfo, accountingCurrency) {
         var _a, _b, _c, _d;
-        let withoutTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
-        (_b = (_a = displayInfo) === null || _a === void 0 ? void 0 : _a.itemDisplayLines) === null || _b === void 0 ? void 0 : _b.forEach((itemDisplayLine) => {
-            if ((itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemOrder && itemDisplayLine.cancelled) ||
-                (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemReturn &&
-                    _.isUndefined(itemDisplayLine.lineNumberFromReturnTransaction) &&
-                    _.isUndefined(itemDisplayLine.sublineIndexFromReturnItem) &&
-                    _.isUndefined(itemDisplayLine.offlineReturnReferenceNumber))) {
-                withoutTransactionTotal = withoutTransactionTotal.plus(itemDisplayLine.extendedAmount.abs());
-                withoutTransactionTotal = !_.isEmpty(itemDisplayLine.totalLineTax)
-                    ? withoutTransactionTotal.plus(itemDisplayLine.totalLineTax.abs())
-                    : withoutTransactionTotal;
+        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) => {
+            if (shippingFeeDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.TransactionFeeRefund) {
+                total = total.plus(shippingFeeDisplayLine.extendedAmountIncludingTax.abs());
             }
         });
-        (_d = (_c = displayInfo) === null || _c === void 0 ? void 0 : _c.tenderDisplayLines) === null || _d === void 0 ? void 0 : _d.forEach((tenderDisplayLine) => {
+        (_d = (_c = displayInfo) === null || _c === void 0 ? void 0 : _c.itemFeeDisplayLines) === null || _d === void 0 ? void 0 : _d.forEach((itemFeeDisplayLine) => {
+            if (itemFeeDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemFeeRefund) {
+                total = total.plus(itemFeeDisplayLine.extendedAmount.abs());
+            }
+        });
+        return total;
+    }
+    static getTenderedAmountsWithoutTransaction(tenderDisplayLines, accountingCurrency, configurationManager) {
+        var _a;
+        let withoutTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
+        (_a = tenderDisplayLines) === null || _a === void 0 ? void 0 : _a.forEach((tenderDisplayLine) => {
             var _a, _b;
             const tender = getConfiguredTender(tenderDisplayLine.tenderId, configurationManager);
             if (_.isEmpty(tenderDisplayLine.originalTenderReferences) &&
                 ((_b = (_a = tender) === null || _a === void 0 ? void 0 : _a.allowRefund) === null || _b === void 0 ? void 0 : _b.indexOf(ITendersConfig_1.AllowRefund.WithoutTransaction)) >= 0) {
-                withoutTransactionTotal = withoutTransactionTotal.minus(tenderDisplayLine.tenderAmount.abs());
+                withoutTransactionTotal = withoutTransactionTotal.plus(tenderDisplayLine.tenderAmount.abs());
             }
         });
         return withoutTransactionTotal;
     }
-    static getWithTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
-        var _a, _b, _c, _d;
+    static getTenderedAmountsWithTransaction(tenderDisplayLines, accountingCurrency, configurationManager) {
+        var _a;
         let withTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
-        (_b = (_a = displayInfo) === null || _a === void 0 ? void 0 : _a.itemDisplayLines) === null || _b === void 0 ? void 0 : _b.forEach((itemDisplayLine) => {
-            if (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemCancel ||
-                (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemReturn &&
-                    !_.isUndefined(itemDisplayLine.lineNumberFromReturnTransaction) &&
-                    !_.isUndefined(itemDisplayLine.sublineIndexFromReturnItem))) {
-                withTransactionTotal = withTransactionTotal.plus(itemDisplayLine.extendedAmount.abs());
-                withTransactionTotal = !_.isEmpty(itemDisplayLine.totalLineTax)
-                    ? withTransactionTotal.plus(itemDisplayLine.totalLineTax.abs())
-                    : withTransactionTotal;
-            }
-        });
-        (_d = (_c = displayInfo) === null || _c === void 0 ? void 0 : _c.tenderDisplayLines) === null || _d === void 0 ? void 0 : _d.forEach((tenderDisplayLine) => {
+        (_a = tenderDisplayLines) === null || _a === void 0 ? void 0 : _a.forEach((tenderDisplayLine) => {
             var _a, _b;
             const tender = getConfiguredTender(tenderDisplayLine.tenderId, configurationManager);
             if (((_b = (_a = tender) === null || _a === void 0 ? void 0 : _a.allowRefund) === null || _b === void 0 ? void 0 : _b.indexOf(ITendersConfig_1.AllowRefund.WithTransaction)) >= 0 ||
                 !_.isEmpty(tenderDisplayLine.originalTenderReferences)) {
-                withTransactionTotal = withTransactionTotal.minus(tenderDisplayLine.tenderAmount.abs());
+                withTransactionTotal = withTransactionTotal.plus(tenderDisplayLine.tenderAmount.abs());
             }
         });
         return withTransactionTotal;
     }
-    static getWithOfflineTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
-        var _a, _b, _c, _d;
+    static getTenderedAmountsWithOfflineTransaction(tenderDisplayLines, accountingCurrency, configurationManager) {
+        var _a;
         let withOfflineTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
-        (_b = (_a = displayInfo) === null || _a === void 0 ? void 0 : _a.itemDisplayLines) === null || _b === void 0 ? void 0 : _b.forEach((itemDisplayLine) => {
-            var _a, _b;
-            if (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemReturn &&
-                !_.isUndefined(itemDisplayLine.offlineReturnReferenceNumber)) {
-                withOfflineTransactionTotal = withOfflineTransactionTotal.plus((_a = itemDisplayLine.extendedAmount) === null || _a === void 0 ? void 0 : _a.abs());
-                withOfflineTransactionTotal = !_.isEmpty(itemDisplayLine.totalLineTax)
-                    ? withOfflineTransactionTotal.plus((_b = itemDisplayLine.totalLineTax) === null || _b === void 0 ? void 0 : _b.abs())
-                    : undefined;
-            }
-        });
-        (_d = (_c = displayInfo) === null || _c === void 0 ? void 0 : _c.tenderDisplayLines) === null || _d === void 0 ? void 0 : _d.forEach((tenderDisplayLine) => {
+        (_a = tenderDisplayLines) === null || _a === void 0 ? void 0 : _a.forEach((tenderDisplayLine) => {
             var _a, _b;
             const tender = getConfiguredTender(tenderDisplayLine.tenderId, configurationManager);
             if (((_b = (_a = tender) === null || _a === void 0 ? void 0 : _a.allowRefund) === null || _b === void 0 ? void 0 : _b.indexOf(ITendersConfig_1.AllowRefund.WithOfflineTransaction)) >= 0) {
-                withOfflineTransactionTotal = withOfflineTransactionTotal.minus(tenderDisplayLine.tenderAmount.abs());
+                withOfflineTransactionTotal = withOfflineTransactionTotal.plus(tenderDisplayLine.tenderAmount.abs());
+            }
+        });
+        return withOfflineTransactionTotal;
+    }
+    static getItemAmountsWithoutTransaction(itemDisplayLines, accountingCurrency) {
+        var _a;
+        let withoutTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
+        (_a = itemDisplayLines) === null || _a === void 0 ? void 0 : _a.forEach((itemDisplayLine) => {
+            if ((itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemOrder && itemDisplayLine.cancelled) ||
+                (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemReturn &&
+                    _.isUndefined(itemDisplayLine.lineNumberFromReturnTransaction) &&
+                    _.isUndefined(itemDisplayLine.sublineIndexFromReturnItem) &&
+                    _.isUndefined(itemDisplayLine.offlineReturnReferenceNumber))) {
+                withoutTransactionTotal = withoutTransactionTotal.plus(itemDisplayLine.extendedAmountIncludingTax.abs());
             }
         });
+        return withoutTransactionTotal;
+    }
+    static getItemAmountsWithTransaction(itemDisplayLines, accountingCurrency) {
+        var _a;
+        let withTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
+        (_a = itemDisplayLines) === null || _a === void 0 ? void 0 : _a.forEach((itemDisplayLine) => {
+            if (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemCancel ||
+                (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemReturn &&
+                    !_.isUndefined(itemDisplayLine.lineNumberFromReturnTransaction) &&
+                    !_.isUndefined(itemDisplayLine.sublineIndexFromReturnItem))) {
+                withTransactionTotal = withTransactionTotal.plus(itemDisplayLine.extendedAmountIncludingTax.abs());
+            }
+        });
+        return withTransactionTotal;
+    }
+    static getItemAmountsWithOfflineTransaction(itemDisplayLines, accountingCurrency) {
+        var _a;
+        let withOfflineTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
+        (_a = itemDisplayLines) === null || _a === void 0 ? void 0 : _a.forEach((itemDisplayLine) => {
+            var _a;
+            if (itemDisplayLine.lineType === scp_types_commerce_transaction_1.LineType.ItemReturn &&
+                !_.isUndefined(itemDisplayLine.offlineReturnReferenceNumber)) {
+                withOfflineTransactionTotal = withOfflineTransactionTotal.plus((_a = itemDisplayLine.extendedAmountIncludingTax) === null || _a === void 0 ? void 0 : _a.abs());
+            }
+        });
+        return withOfflineTransactionTotal;
+    }
+    static getWithoutTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
+        var _a, _b;
+        let withoutTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
+        const withoutTransactionItemAmount = TenderType.getItemAmountsWithoutTransaction((_a = displayInfo) === null || _a === void 0 ? void 0 : _a.itemDisplayLines, accountingCurrency);
+        withoutTransactionTotal = withoutTransactionTotal.plus(withoutTransactionItemAmount);
+        const withoutTransactionTenderedAmount = TenderType.getTenderedAmountsWithoutTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
+        withoutTransactionTotal = withoutTransactionTotal.minus(withoutTransactionTenderedAmount);
+        const feesTotal = TenderType.getFeesTotal(displayInfo, accountingCurrency);
+        withoutTransactionTotal = withoutTransactionTotal.plus(feesTotal);
+        return withoutTransactionTotal;
+    }
+    static getWithTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
+        var _a, _b;
+        let withTransactionTotal = new scp_component_business_core_1.Money(0, accountingCurrency);
+        const withTransactionItemAmount = TenderType.getItemAmountsWithTransaction((_a = displayInfo) === null || _a === void 0 ? void 0 : _a.itemDisplayLines, accountingCurrency);
+        withTransactionTotal = withTransactionTotal.plus(withTransactionItemAmount);
+        const withTransactionTenderedAmount = TenderType.getTenderedAmountsWithTransaction((_b = displayInfo) === null || _b === void 0 ? void 0 : _b.tenderDisplayLines, accountingCurrency, configurationManager);
+        withTransactionTotal = withTransactionTotal.minus(withTransactionTenderedAmount);
+        const feesTotal = TenderType.getFeesTotal(displayInfo, accountingCurrency);
+        withTransactionTotal = withTransactionTotal.plus(feesTotal);
+        return withTransactionTotal;
+    }
+    static getWithOfflineTransactionTotal(displayInfo, accountingCurrency, configurationManager) {
+        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);
+        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/package.json

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