@aptos-scp/scp-component-store-selling-features-domain-model 1.55.0 → 1.56.0

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

@@ -103,7 +103,6 @@ export declare enum UiInputKey {
     SAME_AS_BILLTO = "input_sameAsBillTo",
     BILLING = "input_billing",
     CANCEL_PAYMENT_REASON = "input_cancelPaymentReason",
-    CARD_HOLDER = "input_cardHolder",
     CASH_DRAWER_STATUS = "input_cashDrawerStatus",
     COMPLETE_RESUME_EVENT = "input_resumeCompleteEvent",
     COUNTRY_CODE = "input_countryCode",
@@ -659,6 +658,7 @@ export declare enum CollectedDataKey {
     TenderPaymentIsCompleted = "tenderPaymentIsCompleted",
     PaginationMetadata = "paginationMetadata",
     PaidAmount = "PaidAmount",
+    PaymentAccountLookupLineReference = "paymentAccountLookupLineReference",
     PaidOutReference = "paidOutReference",
     PhoneNumber = "phoneNumber",
     Percent = "percentage",

package/lib/domain/model/Constants.js

@@ -105,7 +105,6 @@ var UiInputKey;
     UiInputKey["SAME_AS_BILLTO"] = "input_sameAsBillTo";
     UiInputKey["BILLING"] = "input_billing";
     UiInputKey["CANCEL_PAYMENT_REASON"] = "input_cancelPaymentReason";
-    UiInputKey["CARD_HOLDER"] = "input_cardHolder";
     UiInputKey["CASH_DRAWER_STATUS"] = "input_cashDrawerStatus";
     UiInputKey["COMPLETE_RESUME_EVENT"] = "input_resumeCompleteEvent";
     UiInputKey["COUNTRY_CODE"] = "input_countryCode";
@@ -667,6 +666,7 @@ var CollectedDataKey;
     CollectedDataKey["TenderPaymentIsCompleted"] = "tenderPaymentIsCompleted";
     CollectedDataKey["PaginationMetadata"] = "paginationMetadata";
     CollectedDataKey["PaidAmount"] = "PaidAmount";
+    CollectedDataKey["PaymentAccountLookupLineReference"] = "paymentAccountLookupLineReference";
     CollectedDataKey["PaidOutReference"] = "paidOutReference";
     CollectedDataKey["PhoneNumber"] = "phoneNumber";
     CollectedDataKey["Percent"] = "percentage";

package/lib/domain/model/account/IPaymentAccountHolderValidationLine.d.ts

@@ -1,9 +1,10 @@
 import { ITransactionLine } from "@aptos-scp/scp-component-store-selling-core";
 import { ICardHolder } from "@aptos-scp/scp-types-commerce-devices";
-import { PaymentAccountHolderIdentificationType } from "@aptos-scp/scp-types-commerce-transaction";
+import { ISameTransactionLineReference, PaymentAccountHolderIdentificationType } from "@aptos-scp/scp-types-commerce-transaction";
 export interface IPaymentAccountHolderValidationLine extends ITransactionLine {
     readonly accountHolder: ICardHolder;
     readonly identificationType: PaymentAccountHolderIdentificationType;
     readonly firstAdminDivision: string;
     readonly accountHolderMismatch?: boolean;
+    readonly paymentAccountLookupLineReference?: ISameTransactionLineReference;
 }

package/lib/domain/model/account/IPaymentAccountLookupLine.d.ts

@@ -11,4 +11,5 @@ export interface IPaymentAccountLookupLine extends ITransactionLine {
     readonly referenceNumber?: string;
     readonly authorizationDeviceId?: string;
     readonly accountBalance?: IMoney;
+    readonly tenderName?: string;
 }

package/lib/domain/model/account/PaymentAccountHolderValidationLine.d.ts

@@ -1,5 +1,5 @@
 import { ITransactionLine, UiBusinessEvent } from "@aptos-scp/scp-component-store-selling-core";
-import { PaymentAccountHolderIdentificationType } from "@aptos-scp/scp-types-commerce-transaction";
+import { ISameTransactionLineReference, PaymentAccountHolderIdentificationType } from "@aptos-scp/scp-types-commerce-transaction";
 import { ICardHolder } from "@aptos-scp/scp-types-commerce-devices";
 import { BaseTransactionLine } from "../BaseTransactionLine";
 import { IPaymentAccountHolderValidationLine } from "./IPaymentAccountHolderValidationLine";
@@ -9,6 +9,7 @@ export declare class PaymentAccountHolderValidationLine extends BaseTransactionL
     private readonly _identificationType;
     private readonly _firstAdminDivision;
     private readonly _accountHolderMismatch?;
+    private readonly _paymentAccountLookupLineReference?;
     static create(lineNumber: number, lineType: string, uiBusinessEvent: UiBusinessEvent, collectedData: Readonly<Map<string, any>>): PaymentAccountHolderValidationLine;
     static createFromJsonObject(transactionLineJsonObj: any): PaymentAccountHolderValidationLine;
     get couldAffectPricing(): boolean;
@@ -16,7 +17,8 @@ export declare class PaymentAccountHolderValidationLine extends BaseTransactionL
     get identificationType(): PaymentAccountHolderIdentificationType;
     get firstAdminDivision(): string;
     get accountHolderMismatch(): boolean;
-    constructor(lineNumber: number, lineType: string, accountHolder: ICardHolder, identificationType: PaymentAccountHolderIdentificationType, firstAdminDivision: string, accountHolderMismatch: boolean);
+    get paymentAccountLookupLineReference(): ISameTransactionLineReference | undefined;
+    constructor(lineNumber: number, lineType: string, accountHolder: ICardHolder, identificationType: PaymentAccountHolderIdentificationType, firstAdminDivision: string, accountHolderMismatch: boolean, paymentAccountLookupLineReference: ISameTransactionLineReference);
     protected newTransactionLine(): PaymentAccountHolderValidationLine;
 }
 export declare function isPaymentAccountHolderValidationLine(transactionLine: ITransactionLine): transactionLine is IPaymentAccountHolderValidationLine;

package/lib/domain/model/account/PaymentAccountHolderValidationLine.js

@@ -4,12 +4,13 @@ const BaseTransactionLine_1 = require("../BaseTransactionLine");
 const Constants_1 = require("../Constants");
 exports.PAYMENT_ACCOUNT_HOLDER_VALIDATION_LINE_TYPE = "PaymentAccountHolderValidation";
 class PaymentAccountHolderValidationLine extends BaseTransactionLine_1.BaseTransactionLine {
-    constructor(lineNumber, lineType, accountHolder, identificationType, firstAdminDivision, accountHolderMismatch) {
+    constructor(lineNumber, lineType, accountHolder, identificationType, firstAdminDivision, accountHolderMismatch, paymentAccountLookupLineReference) {
         super(lineNumber, lineType);
         this._accountHolder = accountHolder;
         this._identificationType = identificationType;
         this._firstAdminDivision = firstAdminDivision;
         this._accountHolderMismatch = accountHolderMismatch;
+        this._paymentAccountLookupLineReference = paymentAccountLookupLineReference;
     }
     static create(lineNumber, lineType, uiBusinessEvent, collectedData) {
         const firstName = collectedData.get(Constants_1.CollectedDataKey.FirstName);
@@ -21,7 +22,8 @@ class PaymentAccountHolderValidationLine extends BaseTransactionLine_1.BaseTrans
         const identificationType = collectedData.get(Constants_1.CollectedDataKey.IdentificationType);
         const firstAdminDivision = collectedData.get(Constants_1.CollectedDataKey.FirstAdminDivision);
         const accountHolderMismatch = collectedData.get(Constants_1.CollectedDataKey.AccountHolderMismatch);
-        return new PaymentAccountHolderValidationLine(lineNumber, lineType, accountHolder, identificationType, firstAdminDivision, accountHolderMismatch);
+        const paymentAccountLookupLineReference = collectedData.get(Constants_1.CollectedDataKey.PaymentAccountLookupLineReference);
+        return new PaymentAccountHolderValidationLine(lineNumber, lineType, accountHolder, identificationType, firstAdminDivision, accountHolderMismatch, paymentAccountLookupLineReference);
     }
     static createFromJsonObject(transactionLineJsonObj) {
         const lineNumber = BaseTransactionLine_1.BaseTransactionLine.lineNumberFromJsonObject(transactionLineJsonObj);
@@ -30,7 +32,8 @@ class PaymentAccountHolderValidationLine extends BaseTransactionLine_1.BaseTrans
         const identificationType = transactionLineJsonObj._identificationType;
         const firstAdminDivision = transactionLineJsonObj._firstAdminDivision;
         const accountHolderMismatch = transactionLineJsonObj._accountHolderMismatch;
-        return new PaymentAccountHolderValidationLine(lineNumber, lineType, accountHolder, identificationType, firstAdminDivision, accountHolderMismatch);
+        const paymentAccountLookupLineReference = transactionLineJsonObj._paymentAccountLookupLineReference;
+        return new PaymentAccountHolderValidationLine(lineNumber, lineType, accountHolder, identificationType, firstAdminDivision, accountHolderMismatch, paymentAccountLookupLineReference);
     }
     get couldAffectPricing() {
         return false;
@@ -47,8 +50,11 @@ class PaymentAccountHolderValidationLine extends BaseTransactionLine_1.BaseTrans
     get accountHolderMismatch() {
         return this._accountHolderMismatch;
     }
+    get paymentAccountLookupLineReference() {
+        return this._paymentAccountLookupLineReference;
+    }
     newTransactionLine() {
-        return new PaymentAccountHolderValidationLine(this.lineNumber, this.lineType, this._accountHolder, this._identificationType, this._firstAdminDivision, this._accountHolderMismatch);
+        return new PaymentAccountHolderValidationLine(this.lineNumber, this.lineType, this._accountHolder, this._identificationType, this._firstAdminDivision, this._accountHolderMismatch, this._paymentAccountLookupLineReference);
     }
 }
 exports.PaymentAccountHolderValidationLine = PaymentAccountHolderValidationLine;

package/lib/domain/model/account/PaymentAccountLookupLine.d.ts

@@ -14,6 +14,7 @@ export declare class PaymentAccountLookupLine extends BaseTransactionLine implem
     private readonly _referenceNumber?;
     private readonly _authorizationDeviceId?;
     private readonly _accountBalance?;
+    private readonly _tenderName?;
     static create(lineNumber: number, lineType: string, uiBusinessEvent: UiBusinessEvent, collectedData: Readonly<Map<string, any>>): PaymentAccountLookupLine;
     static createFromJsonObject(transactionLineJsonObj: any): PaymentAccountLookupLine;
     get couldAffectPricing(): boolean;
@@ -25,7 +26,8 @@ export declare class PaymentAccountLookupLine extends BaseTransactionLine implem
     get referenceNumber(): string;
     get authorizationDeviceId(): string;
     get accountBalance(): IMoney;
-    protected constructor(lineNumber: number, lineType: string, cardHolder: ICardHolder, lookupResult?: PaymentAccountLookupResult, lookupResultReason?: string, accountNumber?: string, cardToken?: string, referenceNumber?: string, authorizationDeviceId?: string, accountBalance?: IMoney);
+    get tenderName(): string;
+    protected constructor(lineNumber: number, lineType: string, cardHolder: ICardHolder, lookupResult?: PaymentAccountLookupResult, lookupResultReason?: string, accountNumber?: string, cardToken?: string, referenceNumber?: string, authorizationDeviceId?: string, accountBalance?: IMoney, tenderName?: string);
     protected newTransactionLine(): PaymentAccountLookupLine;
 }
 export declare function isPaymentAccountLookupLine(transactionLine: ITransactionLine): transactionLine is PaymentAccountLookupLine;

package/lib/domain/model/account/PaymentAccountLookupLine.js

@@ -6,7 +6,7 @@ const BaseTransactionLine_1 = require("../BaseTransactionLine");
 const Constants_1 = require("../Constants");
 exports.PAYMENT_ACCOUNT_LOOKUP_LINE_TYPE = "PaymentAccountLookup";
 class PaymentAccountLookupLine extends BaseTransactionLine_1.BaseTransactionLine {
-    constructor(lineNumber, lineType, cardHolder, lookupResult, lookupResultReason, accountNumber, cardToken, referenceNumber, authorizationDeviceId, accountBalance) {
+    constructor(lineNumber, lineType, cardHolder, lookupResult, lookupResultReason, accountNumber, cardToken, referenceNumber, authorizationDeviceId, accountBalance, tenderName) {
         super(lineNumber, lineType);
         this._cardHolder = cardHolder;
         this._lookupResult = lookupResult;
@@ -16,6 +16,7 @@ class PaymentAccountLookupLine extends BaseTransactionLine_1.BaseTransactionLine
         this._referenceNumber = referenceNumber;
         this._authorizationDeviceId = authorizationDeviceId;
         this._accountBalance = accountBalance;
+        this._tenderName = tenderName;
     }
     static create(lineNumber, lineType, uiBusinessEvent, collectedData) {
         var _a, _b, _c, _d, _e, _f, _g;
@@ -28,7 +29,8 @@ class PaymentAccountLookupLine extends BaseTransactionLine_1.BaseTransactionLine
         const referenceNumber = (_f = accountLookupResponse) === null || _f === void 0 ? void 0 : _f.referenceNumber;
         const accountBalance = (_g = accountLookupResponse) === null || _g === void 0 ? void 0 : _g.balance;
         const authorizationDeviceId = collectedData.get(Constants_1.CollectedDataKey.AuthorizationDeviceId);
-        return new PaymentAccountLookupLine(lineNumber, lineType, cardHolder, lookupResult, lookupResultReason, accountNumber, cardToken, referenceNumber, authorizationDeviceId, accountBalance);
+        const tenderName = collectedData.get(Constants_1.CollectedDataKey.TenderName);
+        return new PaymentAccountLookupLine(lineNumber, lineType, cardHolder, lookupResult, lookupResultReason, accountNumber, cardToken, referenceNumber, authorizationDeviceId, accountBalance, tenderName);
     }
     static createFromJsonObject(transactionLineJsonObj) {
         const lineNumber = BaseTransactionLine_1.BaseTransactionLine.lineNumberFromJsonObject(transactionLineJsonObj);
@@ -41,7 +43,8 @@ class PaymentAccountLookupLine extends BaseTransactionLine_1.BaseTransactionLine
         const referenceNumber = transactionLineJsonObj._referenceNumber;
         const authorizationDeviceId = transactionLineJsonObj._authorizationDeviceId;
         const accountBalance = transactionLineJsonObj._accountBalance;
-        const accountLookupLine = new PaymentAccountLookupLine(lineNumber, lineType, cardHolder, lookupResult, lookupResultReason, accountNumber, cardToken, referenceNumber, authorizationDeviceId, accountBalance);
+        const tenderName = transactionLineJsonObj._tenderName;
+        const accountLookupLine = new PaymentAccountLookupLine(lineNumber, lineType, cardHolder, lookupResult, lookupResultReason, accountNumber, cardToken, referenceNumber, authorizationDeviceId, accountBalance, tenderName);
         accountLookupLine.loadFromJsonObject(transactionLineJsonObj);
         return accountLookupLine;
     }
@@ -72,8 +75,11 @@ class PaymentAccountLookupLine extends BaseTransactionLine_1.BaseTransactionLine
     get accountBalance() {
         return this._accountBalance;
     }
+    get tenderName() {
+        return this._tenderName;
+    }
     newTransactionLine() {
-        return new PaymentAccountLookupLine(this.lineNumber, this.lineType, this._cardHolder, this._lookupResult, this._lookupResultReason, this._accountNumber, this._cardToken, this._referenceNumber, this._authorizationDeviceId, this._accountBalance);
+        return new PaymentAccountLookupLine(this.lineNumber, this.lineType, this._cardHolder, this._lookupResult, this._lookupResultReason, this._accountNumber, this._cardToken, this._referenceNumber, this._authorizationDeviceId, this._accountBalance, this._tenderName);
     }
 }
 exports.PaymentAccountLookupLine = PaymentAccountLookupLine;

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.55.0",
+  "version": "1.56.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",
@@ -62,7 +62,7 @@
     "@aptos-scp/scp-types-client-registration": "^1.4.0",
     "@aptos-scp/scp-types-core-config": "^2.2.1",
     "@aptos-scp/scp-types-commerce-devices": "^4.1.0",
-    "@aptos-scp/scp-types-commerce-transaction": "^1.75.0",
+    "@aptos-scp/scp-types-commerce-transaction": "^1.75.1",
     "@aptos-scp/scp-types-customer": "^3.7.0",
     "@aptos-scp/scp-types-einvoice": "^1.17.0",
     "@aptos-scp/scp-types-inventory": "^2.0.0",
@@ -84,7 +84,7 @@
     "@aptos-scp/scp-component-user": "^1.4.0",
     "@aptos-scp/scp-types-client-registration": "^1.4.0",
     "@aptos-scp/scp-types-commerce-devices": "^4.1.0",
-    "@aptos-scp/scp-types-commerce-transaction": "^1.75.0",
+    "@aptos-scp/scp-types-commerce-transaction": "^1.75.1",
     "@aptos-scp/scp-types-core": "^1.0.5",
     "@aptos-scp/scp-types-core-config": "^2.2.1",
     "@aptos-scp/scp-types-currency-conversion": "^1.2.0",