@aptos-scp/scp-component-store-selling-features-domain-model 1.18.0 → 1.20.0

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

@@ -37,6 +37,7 @@ export interface IValidationRules {
 export interface ITenderGroup {
     tenderAuthCategory: TenderAuthCategory;
     tenderIds?: string[];
+    tenderType?: string;
     groupLabel?: ILabel;
     subType?: TenderSubType;
 }
@@ -137,6 +138,7 @@ export declare class TenderType {
     private static getActiveTenders;
     private static filterActiveTenderIds;
     private static tenderAuthCategoryIsActive;
+    private static tenderTypeIsActive;
     private static getActiveTenderGroupings;
     private static getActiveTenderGroupsByTenderGroupingsConfig;
     private static getActiveTenderGroupsByTenders;

package/lib/domain/model/TenderType.js

@@ -338,6 +338,14 @@ class TenderType {
         });
         return !!activeTenderDef;
     }
+    static tenderTypeIsActive(tenderType, configuredTenders, isRefund, withTransaction, withOfflineTransaction, accountingCurrency) {
+        //search configured tenders for tenderType and check if active
+        const activeTenderDef = configuredTenders.find((configuredTender) => {
+            return (tenderType === configuredTender.tenderType &&
+                tenderIsActive(configuredTender, isRefund, withTransaction, false, false, withOfflineTransaction, accountingCurrency));
+        });
+        return !!activeTenderDef;
+    }
     static getActiveTenderGroupings(container, accountingCurrency, isRefund, withTransaction, activeTenders, originalTransactionsDetails, withOfflineTransaction) {
         const configurationManager = container.get(scp_component_store_selling_core_1.DI_TYPES.IConfigurationManager);
         const configuredTenderGroupings = configurationManager.getTendersUIValues().tenderGroupings;
@@ -360,9 +368,13 @@ class TenderType {
             else if (configuredTenderGroup.hasOwnProperty("tenderAuthCategory")) {
                 return TenderType.tenderAuthCategoryIsActive(configuredTenderGroup.tenderAuthCategory, filterOriginalTenders(configuredTenders, originalTransactionsDetails, true), isRefund, withTransaction, withOfflineTransaction, accountingCurrency);
             }
+            else if (configuredTenderGroup.hasOwnProperty("tenderType")) {
+                return TenderType.tenderTypeIsActive(configuredTenderGroup.tenderType, filterOriginalTenders(configuredTenders, originalTransactionsDetails, true), isRefund, withTransaction, withOfflineTransaction, accountingCurrency);
+            }
         }).map((configuredTenderGroup) => ({
             tenderAuthCategory: configuredTenderGroup.tenderAuthCategory,
             tenderIds: TenderType.filterActiveTenderIds(configuredTenderGroup.tenderIds, filteredConfiguredTenders, isRefund, withTransaction, withOfflineTransaction, accountingCurrency),
+            tenderType: configuredTenderGroup.tenderType,
             groupLabel: configuredTenderGroup.groupButtonText,
         }));
         return handleValueCertificateGroup(activeTendersGroups, filterOriginalTenders(configuredTenders, originalTransactionsDetails, true), isRefund, withTransaction, withOfflineTransaction, accountingCurrency);

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

@@ -216,6 +216,12 @@ class ItemLine extends BaseTransactionLine_1.BaseTransactionLine {
             if (originalDiscountReason) {
                 itemLine._originalDiscountReason = originalDiscountReason;
             }
+            const originalTaxOverride = collectedData.get(Constants_1.CollectedDataKey.OriginalTaxOverride);
+            if (originalTaxOverride) {
+                itemLine._originalTaxOverride = originalTaxOverride;
+                itemLine._taxOverride = originalTaxOverride.taxOverride;
+                itemLine._preTaxOverrideDetails = originalTaxOverride.preTaxOverrideDetails;
+            }
         }
         const originalRedemptionLoyaltyTransactionKeys = collectedData.get(Constants_1.CollectedDataKey.OriginalRedemptionLoyaltyTransactionKeys);
         if (((_f = originalRedemptionLoyaltyTransactionKeys) === null || _f === void 0 ? void 0 : _f.length) > 0) {

package/lib/domain/model/tender/TenderAuthorizationStatusLine.d.ts

@@ -23,6 +23,7 @@ export declare class TenderAuthorizationStatusLine extends BaseTransactionLine i
     private _offlineAuthorizationCode;
     private _tenderAuthCategory;
     private _tenderType;
+    private _tenderTypeName;
     private _entryMethod;
     private _tenderReversalFailed;
     private _actionType;
@@ -58,7 +59,7 @@ export declare class TenderAuthorizationStatusLine extends BaseTransactionLine i
     get subType(): TenderSubType;
     get mappedRefundTenderTypeName(): string;
     get isTenderAuthorizationFallback(): boolean;
-    protected constructor(lineNumber: number, lineType: string, status: TenderAuthorizationStatus, tenderAmount: Money, authResponse: IAuthorizationResponse, failureReasonCode: TenderAuthFailureReasonCode, authorizationDeviceId: string, transactionLineReference: ITransactionLineReferenceType, forcedAuthorizationApproval: boolean, cardNumber: string, giftCardPin: string, valueCertificateNumber: string, offlineAuthorizationCode: string, offlineApprovalCode: string, tenderAuthCategory: TenderAuthCategory, tenderType: TenderType, entryMethod: EntryMethod, tenderReversalFailed: boolean, originalTenderLineReferences: IOriginalTransactionRefundReference[], actionType: ActionType, mappedRefundTenderTypeName: string, subType: TenderSubType, isChangeProcessing: boolean, isTenderAuthorizationFallback: boolean);
+    protected constructor(lineNumber: number, lineType: string, status: TenderAuthorizationStatus, tenderAmount: Money, authResponse: IAuthorizationResponse, failureReasonCode: TenderAuthFailureReasonCode, authorizationDeviceId: string, transactionLineReference: ITransactionLineReferenceType, forcedAuthorizationApproval: boolean, cardNumber: string, giftCardPin: string, valueCertificateNumber: string, offlineAuthorizationCode: string, offlineApprovalCode: string, tenderAuthCategory: TenderAuthCategory, tenderType: TenderType, tenderTypeName: string, entryMethod: EntryMethod, tenderReversalFailed: boolean, originalTenderLineReferences: IOriginalTransactionRefundReference[], actionType: ActionType, mappedRefundTenderTypeName: string, subType: TenderSubType, isChangeProcessing: boolean, isTenderAuthorizationFallback: boolean);
     protected newTransactionLine(): TenderAuthorizationStatusLine;
 }
 export declare function isTenderAuthorizationStatusLine(transactionLine: ITransactionLine): transactionLine is TenderAuthorizationStatusLine;

package/lib/domain/model/tender/TenderAuthorizationStatusLine.js

@@ -9,7 +9,7 @@ const Constants_1 = require("../Constants");
 const TenderType_1 = require("../TenderType");
 exports.TENDER_AUTH_STATUS_LINE_TYPE = "TenderAuthorizationStatus";
 class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactionLine {
-    constructor(lineNumber, lineType, status, tenderAmount, authResponse, failureReasonCode, authorizationDeviceId, transactionLineReference, forcedAuthorizationApproval, cardNumber, giftCardPin, valueCertificateNumber, offlineAuthorizationCode, offlineApprovalCode, tenderAuthCategory, tenderType, entryMethod, tenderReversalFailed, originalTenderLineReferences, actionType, mappedRefundTenderTypeName, subType, isChangeProcessing, isTenderAuthorizationFallback) {
+    constructor(lineNumber, lineType, status, tenderAmount, authResponse, failureReasonCode, authorizationDeviceId, transactionLineReference, forcedAuthorizationApproval, cardNumber, giftCardPin, valueCertificateNumber, offlineAuthorizationCode, offlineApprovalCode, tenderAuthCategory, tenderType, tenderTypeName, entryMethod, tenderReversalFailed, originalTenderLineReferences, actionType, mappedRefundTenderTypeName, subType, isChangeProcessing, isTenderAuthorizationFallback) {
         super(lineNumber, lineType);
         this._status = status;
         this._tenderAmount = tenderAmount;
@@ -25,6 +25,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         this._valueCertificateNumber = valueCertificateNumber;
         this._tenderAuthCategory = tenderAuthCategory;
         this._tenderType = tenderType;
+        this._tenderTypeName = tenderTypeName;
         this._entryMethod = entryMethod;
         this._tenderReversalFailed = tenderReversalFailed;
         this._originalTenderLineReferences = originalTenderLineReferences;
@@ -35,6 +36,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         this._isTenderAuthorizationFallback = isTenderAuthorizationFallback;
     }
     static create(lineNumber, lineType, uiBusinessEvent, collectedData) {
+        var _a;
         const status = collectedData.get(Constants_1.CollectedDataKey.TenderAuthorizationStatus);
         const tenderAmount = collectedData.get(Constants_1.CollectedDataKey.TenderAmount);
         const authResponse = collectedData.get(Constants_1.CollectedDataKey.TenderAuthResponse);
@@ -49,6 +51,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         const transactionLineReference = collectedData.get(Constants_1.CollectedDataKey.TransactionLineReference);
         const originalTenderLineReferences = collectedData.get(Constants_1.CollectedDataKey.OriginalTenderLineReferences);
         const tenderType = collectedData.get(Constants_1.CollectedDataKey.TenderType);
+        const tenderTypeName = ((_a = tenderType) === null || _a === void 0 ? void 0 : _a.tenderTypeName) || collectedData.get(Constants_1.CollectedDataKey.TenderTypeName);
         const tenderAuthCategory = tenderType
             ? tenderType.tenderAuthCategory
             : collectedData.get(Constants_1.CollectedDataKey.TenderAuthCategory);
@@ -60,7 +63,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         const subType = collectedData.get(Constants_1.CollectedDataKey.TenderSubType);
         const isChangeProcessing = collectedData.get(Constants_1.CollectedDataKey.IsChangeProcessing);
         const isTenderAuthorizationFallback = collectedData.get(Constants_1.CollectedDataKey.IsTenderFallback);
-        return new TenderAuthorizationStatusLine(lineNumber, lineType, status, tenderAmount, authResponse, failureReasonCode, authorizationDeviceId, transactionLineReference, forcedAuthorizationApproval, cardNumber, giftCardPin, valueCertificateNumber, offlineAuthorizationCode, offlineApprovalCode, tenderAuthCategory, tenderType, entryMethod, tenderReversalFailed, originalTenderLineReferences, actionType, mappedRefundTenderTypeName, subType, isChangeProcessing, isTenderAuthorizationFallback);
+        return new TenderAuthorizationStatusLine(lineNumber, lineType, status, tenderAmount, authResponse, failureReasonCode, authorizationDeviceId, transactionLineReference, forcedAuthorizationApproval, cardNumber, giftCardPin, valueCertificateNumber, offlineAuthorizationCode, offlineApprovalCode, tenderAuthCategory, tenderType, tenderTypeName, entryMethod, tenderReversalFailed, originalTenderLineReferences, actionType, mappedRefundTenderTypeName, subType, isChangeProcessing, isTenderAuthorizationFallback);
     }
     static createFromJsonObject(transactionLineJsonObj) {
         const lineNumber = BaseTransactionLine_1.BaseTransactionLine.lineNumberFromJsonObject(transactionLineJsonObj);
@@ -76,6 +79,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         const originalTenderLineReferences = transactionLineJsonObj._originalTenderLineReferences;
         const tenderAuthCategory = Constants_1.TenderAuthCategory[transactionLineJsonObj._tenderAuthCategory];
         const tenderType = TenderType_1.TenderType.createFromJsonObject(transactionLineJsonObj._tenderType);
+        const tenderTypeName = transactionLineJsonObj._tenderTypeName;
         const entryMethod = transactionLineJsonObj._entryMethod;
         const tenderReversalFailed = transactionLineJsonObj._tenderReversalFailed;
         const actionType = transactionLineJsonObj._actionType;
@@ -101,7 +105,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         }
         const status = scp_types_commerce_transaction_1.TenderAuthorizationStatus[transactionLineJsonObj._status];
         const failureReasonCode = scp_types_commerce_transaction_1.TenderAuthFailureReasonCode[transactionLineJsonObj._failureReasonCode];
-        const tenderAuthorizationStatusLine = new TenderAuthorizationStatusLine(lineNumber, lineType, status, tenderAmount, authResponse, failureReasonCode, authorizationDeviceId, transactionLineReference, forcedAuthorizationApproval, cardNumber, giftCardPin, valueCertificateNumber, offlineAuthorizationCode, offlineApprovalCode, tenderAuthCategory, tenderType, entryMethod, tenderReversalFailed, originalTenderLineReferences, actionType, mappedRefundTenderTypeName, subType, isChangeProcessing, isTenderAuthorizationFallback);
+        const tenderAuthorizationStatusLine = new TenderAuthorizationStatusLine(lineNumber, lineType, status, tenderAmount, authResponse, failureReasonCode, authorizationDeviceId, transactionLineReference, forcedAuthorizationApproval, cardNumber, giftCardPin, valueCertificateNumber, offlineAuthorizationCode, offlineApprovalCode, tenderAuthCategory, tenderType, tenderTypeName, entryMethod, tenderReversalFailed, originalTenderLineReferences, actionType, mappedRefundTenderTypeName, subType, isChangeProcessing, isTenderAuthorizationFallback);
         tenderAuthorizationStatusLine.loadFromJsonObject(transactionLineJsonObj);
         return tenderAuthorizationStatusLine;
     }
@@ -154,7 +158,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         return this.tenderType ? this.tenderType.tenderName : undefined;
     }
     get tenderTypeName() {
-        return this.tenderType ? this.tenderType.tenderTypeName : undefined;
+        return this.tenderType ? this.tenderType.tenderTypeName : this._tenderTypeName;
     }
     get tenderAuthCategory() {
         return this._tenderAuthCategory;
@@ -184,7 +188,7 @@ class TenderAuthorizationStatusLine extends BaseTransactionLine_1.BaseTransactio
         return this._isTenderAuthorizationFallback;
     }
     newTransactionLine() {
-        return new TenderAuthorizationStatusLine(this.lineNumber, this.lineType, this.status, this.tenderAmount, this.authResponse, this.failureReasonCode, this.authorizationDeviceId, this.transactionLineReference, this.forcedAuthorizationApproval, this.cardNumber, this.giftCardPin, this._valueCertificateNumber, this.offlineAuthorizationCode, this.offlineApprovalCode, this.tenderAuthCategory, this._tenderType, this._entryMethod, this._tenderReversalFailed, this._originalTenderLineReferences, this._actionType, this._mappedRefundTenderTypeName, this._subType, this._isChangeProcessing, this._isTenderAuthorizationFallback);
+        return new TenderAuthorizationStatusLine(this.lineNumber, this.lineType, this.status, this.tenderAmount, this.authResponse, this.failureReasonCode, this.authorizationDeviceId, this.transactionLineReference, this.forcedAuthorizationApproval, this.cardNumber, this.giftCardPin, this._valueCertificateNumber, this.offlineAuthorizationCode, this.offlineApprovalCode, this.tenderAuthCategory, this._tenderType, this.tenderTypeName, this._entryMethod, this._tenderReversalFailed, this._originalTenderLineReferences, this._actionType, this._mappedRefundTenderTypeName, this._subType, this._isChangeProcessing, this._isTenderAuthorizationFallback);
     }
 }
 exports.TenderAuthorizationStatusLine = TenderAuthorizationStatusLine;

package/package.json

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