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

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

@@ -161,7 +161,6 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
     private _prepaidTendersToApply?;
     private _transactionSubTotalExcludingPreviouslyCollected;
     private _transactionTotalSavingsExcludingPreviouslyCollected;
-    private _transactionSubTotalExcPrepaidAndExcTranDisc;
     private _transactionTotalTaxExcludingPreviouslyCollected;
     private _balanceDueExcludingPreviouslyCollected;
     private _transactionTotalExcludingPreviouslyCollected;
@@ -197,7 +196,6 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
     get transactionTotalTransactionDiscounts(): Money;
     get transactionTotalTendered(): Money;
     get transactionTotalTenderedPreviouslyCollected(): Money;
-    get transactionSubTotalExcPrepaidAndExcTranDisc(): Money;
     /**
      * Transaction SubTotal excluding previously collected tendered amount and excluding tax
      */

package/lib/domain/model/MerchandiseTransaction.js

@@ -95,7 +95,6 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
         this._digestValue = digestValue;
         this._prepaidTendersToApply = prepaidTendersToApply;
         this._transactionSubTotalExcludingPreviouslyCollected = new scp_component_business_core_1.Money(0, accountingCurrency);
-        this._transactionSubTotalExcPrepaidAndExcTranDisc = new scp_component_business_core_1.Money(0, accountingCurrency);
         this._transactionTotalSavingsExcludingPreviouslyCollected = new scp_component_business_core_1.Money(0, accountingCurrency);
         this._transactionTotalTaxExcludingPreviouslyCollected = new scp_component_business_core_1.Money(0, accountingCurrency);
         this._balanceDueExcludingPreviouslyCollected = new scp_component_business_core_1.Money(0, accountingCurrency);
@@ -225,8 +224,6 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             transaction._prepaidTendersToApply = this._prepaidTendersToApply;
             transaction._transactionSubTotalExcludingPreviouslyCollected =
                 this._transactionSubTotalExcludingPreviouslyCollected;
-            transaction._transactionSubTotalExcPrepaidAndExcTranDisc =
-                this._transactionSubTotalExcPrepaidAndExcTranDisc;
             transaction._transactionTotalSavingsExcludingPreviouslyCollected =
                 this._transactionTotalSavingsExcludingPreviouslyCollected;
             transaction._transactionTotalTaxExcludingPreviouslyCollected =
@@ -348,9 +345,6 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
     get transactionTotalTenderedPreviouslyCollected() {
         return this._transactionTotalTenderedPreviouslyCollected;
     }
-    get transactionSubTotalExcPrepaidAndExcTranDisc() {
-        return this._transactionSubTotalExcPrepaidAndExcTranDisc;
-    }
     /**
      * Transaction SubTotal excluding previously collected tendered amount and excluding tax
      */
@@ -858,10 +852,6 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
                 "transaction.totalTenderedExcludingPreviouslyCollected",
                 this.transactionTotalTenderedExcludingPreviouslyCollected,
             ],
-            [
-                "transaction.transactionSubTotalExcPrepaidAndExcTranDisc",
-                this._transactionSubTotalExcPrepaidAndExcTranDisc,
-            ],
             ["transaction.totalPreviouslyCollectedTenders", this.transactionTotalPreviouslyCollectedTenders],
             ["transaction.totalTenderedOnOrderCreate", this.transactionTotalTenderedOnOrderCreate],
             ["transaction.totalChangeTendered", this.transactionTotalChangeTendered],
@@ -1054,7 +1044,6 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             _digestValue: this._digestValue,
             _prepaidTendersToApply: this.prepaidTendersToApply,
             _transactionSubTotalExcludingPreviouslyCollected: this.transactionSubTotalExcludingPreviouslyCollected,
-            _transactionSubTotalExcPrepaidAndExcTranDisc: this.transactionSubTotalExcPrepaidAndExcTranDisc,
             _transactionTotalSavingsExcludingPreviouslyCollected: this.transactionTotalSavingsExcludingPreviouslyCollected,
             _transactionTotalTaxExcludingPreviouslyCollected: this.transactionTotalTaxExcludingPreviouslyCollected,
             _balanceDueExcludingPreviouslyCollected: this.transactionBalanceDueExcludingPreviouslyCollected,
@@ -1210,9 +1199,6 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
         this._transactionSubTotalExcludingPreviouslyCollected =
             transactionJsonObj._transactionSubTotalExcludingPreviouslyCollected &&
                 new scp_component_business_core_1.Money(transactionJsonObj._transactionSubTotalExcludingPreviouslyCollected);
-        this._transactionSubTotalExcPrepaidAndExcTranDisc =
-            transactionJsonObj._transactionSubTotalExcPrepaidAndExcTranDisc &&
-                new scp_component_business_core_1.Money(transactionJsonObj._transactionSubTotalExcPrepaidAndExcTranDisc);
         this._transactionTotalSavingsExcludingPreviouslyCollected =
             transactionJsonObj._transactionTotalSavingsExcludingPreviouslyCollected &&
                 new scp_component_business_core_1.Money(transactionJsonObj._transactionTotalSavingsExcludingPreviouslyCollected);

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

@@ -7,7 +7,6 @@ import { AllowRefund } from "./configuration/ITendersConfig";
 import { ILabel, IPinRules, OverTenderRule, TenderAuthCategory } from "./Constants";
 import { MerchandiseTransaction } from "./MerchandiseTransaction";
 import { IOriginalTender, IOriginalTransactionDetails } from "./TenderHandlingSession";
-export declare const mapTenderTypeToI18nCode: Map<string, string>;
 export declare enum TenderSignatureCapturePolicy {
     AuthResponseOnly = "AuthResponseOnly",
     ConfigurationOnly = "ConfigurationOnly",
@@ -41,7 +40,6 @@ export interface ITenderGroup {
     tenderType?: string;
     groupLabel?: ILabel;
     subType?: TenderSubType;
-    refundableAmount?: Money;
 }
 export interface IChangeBehaviorDefinition {
     forfeitChange?: boolean;
@@ -100,7 +98,7 @@ export declare class TenderType {
     static getActiveConfiguredTenderGroups(container: Container, accountingCurrency: string, activeTenders: TenderType[]): ITenderGroup[];
     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, useGroupRefundableAmount?: boolean): Money;
+    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;
@@ -161,10 +159,6 @@ export declare class TenderType {
     private static convertTenderTypeToGroup;
     private static getActiveCashTenders;
 }
-export declare function combineOriginalUnreferencedAndMappedTenders(tender: IOriginalTender, unreferencedAndMappedTenders: IOriginalTender[]): void;
-export declare function getConfiguredTender(originalTenderId: string, configurationManager: IConfigurationManager): any;
-export declare function getAllRefundableCardTypes(tenderTypeBehavior: any): string[];
-export declare function getMappedCardTypeNames(tenderConfig: any, refundCardTypes: any): string[];
 export declare function getActiveTendersByConfiguredPaymentRestrictions(activeTenderTypes: TenderType[], saleItemTypes: string[], diContainer: Container, orderTypes?: string[], productAttributeTypes?: string[]): TenderType[];
 export declare function getRefundableTendersByPaymentRestrictions(originalRefundableTenders: IOriginalTender[], saleItemTypes: string[], diContainer: Container, orderTypes?: string[], productAttributeTypes?: string[]): IOriginalTender[];
 export declare function getSaleItemTypes(transaction: MerchandiseTransaction): string[];
@@ -173,8 +167,6 @@ export declare function getProductAttributeTypes(transaction: MerchandiseTransac
 export declare function transactionHasPaymentRestrictionTypes(itemTypes: string[], orderTypes: string[], productAttributeTypes: string[]): boolean;
 export declare function getPaymentRestrictionBehaviors(diContainer: Container, tenderType: string): IConfigurationValues;
 export declare function isPaymentRestrictionBehaviorsConfigured(diContainer: Container, activeTenderTypes: TenderType[]): boolean;
-export declare function sortOriginalTenders(originalTenders: IOriginalTender[]): IOriginalTender[];
-export declare function buildMappedOriginalTender(originalTender: IOriginalTender, tenderName: string, tenderType: string, tenderId: string, tenderAuthCategory: TenderAuthCategory, transactionId: string, originalTransactions: IOriginalTransactionDetails[], subType: TenderSubType, cardType?: string, excludedCardTypes?: string[]): IOriginalTender;
 export declare function tenderIsActive(tenderDef: IConfigurationValues, isRefund: boolean, withTransaction: boolean, withReference: boolean, mappedTender: boolean, offlineTransaction: boolean, accountingCurrency: string): boolean;
 export declare function findConfiguredTenderFor(activeTenders: TenderType[], responseData: IAuthorizationResponse, tenderAuthCategory?: TenderAuthCategory): TenderType | TenderAuthFailureReasonCode;
 export declare function getReturnOrCancelTotalAmount(originalTran: IOriginalTransactionDetails): Money;
@@ -183,4 +175,3 @@ export declare function allowWalletSpecificTender(tenderAuthCategory: TenderAuth
 export declare function paymentDeviceCardExists(activeTenders: TenderType[]): boolean;
 export declare function walletSpecificTenderExists(activeTenders: TenderType[]): boolean;
 export declare function getTenderAuthCategoryFromTenderType(tenderType: string): TenderAuthCategory;
-export declare function getCardTypeExceptions(tenderId: string, tenderDefinitions: any, tenderTypeBehavior: any): any;

package/lib/domain/model/TenderType.js

@@ -13,7 +13,7 @@ const ItemLine_1 = require("./item/ItemLine");
 const utility_1 = require("../utility");
 const TenderHandlingSession_1 = require("./TenderHandlingSession");
 const logger = scp_component_logging_1.LogManager.getLogger("com.aptos.storesellingfeatures.domain.model.tendertype");
-exports.mapTenderTypeToI18nCode = new Map([
+const mapTenderTypeToI18nCode = new Map([
     [scp_types_commerce_devices_1.TenderType.Credit, "tenderTypeCredit"],
     [scp_types_commerce_devices_1.TenderType.Debit, "tenderTypeDebit"],
     [scp_types_commerce_devices_1.TenderType.Cash, "tenderTypeCash"],
@@ -88,7 +88,7 @@ class TenderType {
         var _a, _b;
         return (((_a = tenderType) === null || _a === void 0 ? void 0 : _a.tenderType) === scp_types_commerce_devices_1.TenderType.Credit || ((_b = tenderType) === null || _b === void 0 ? void 0 : _b.tenderTyp) === scp_types_commerce_devices_1.TenderType.Debit);
     }
-    static getRefundableAmountByGroup(group, displayInfo, currency, configuration, refundDue, useGroupRefundableAmount = false) {
+    static getRefundableAmountByGroup(group, displayInfo, currency, configuration, refundDue) {
         var _a, _b, _c, _d;
         const withoutTransactionTotal = TenderType.getWithoutTransactionTotal(displayInfo, currency, configuration);
         const withTransactionTotal = TenderType.getWithTransactionTotal(displayInfo, currency, configuration);
@@ -127,19 +127,14 @@ class TenderType {
             }
         });
         let refundableAmount = new scp_component_business_core_1.Money(0, currency);
-        if (group.refundableAmount && useGroupRefundableAmount) {
-            refundableAmount = group.refundableAmount;
+        if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithTransaction)) {
+            refundableAmount = refundableAmount.plus(withTransactionTotal);
         }
-        else {
-            if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithTransaction)) {
-                refundableAmount = refundableAmount.plus(withTransactionTotal);
-            }
-            if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithoutTransaction)) {
-                refundableAmount = refundableAmount.plus(withoutTransactionTotal);
-            }
-            if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithOfflineTransaction)) {
-                refundableAmount = refundableAmount.plus(withOfflineTransactionTotal);
-            }
+        if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithoutTransaction)) {
+            refundableAmount = refundableAmount.plus(withoutTransactionTotal);
+        }
+        if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithOfflineTransaction)) {
+            refundableAmount = refundableAmount.plus(withOfflineTransactionTotal);
         }
         return getLowestRefundDue(refundDue, undefined, refundableAmount);
     }
@@ -709,7 +704,6 @@ function combineOriginalUnreferencedAndMappedTenders(tender, unreferencedAndMapp
         unreferencedAndMappedTenders.push(_.cloneDeep(tender));
     }
 }
-exports.combineOriginalUnreferencedAndMappedTenders = combineOriginalUnreferencedAndMappedTenders;
 function getOriginalTenderRefundableAmount(originalTender, refundDue, originalTransactionDetails, withTransactionTotal, withoutTransactionTotal, withOfflineTransactionTotal) {
     var _a;
     if (!originalTender) {
@@ -777,7 +771,6 @@ function getConfiguredTender(originalTenderId, configurationManager) {
     return (_b = (_a = configurationManager
         .getTendersValues()) === null || _a === void 0 ? void 0 : _a.tenderDefinitions) === null || _b === void 0 ? void 0 : _b.find((tender) => tender.tenderId === originalTenderId);
 }
-exports.getConfiguredTender = getConfiguredTender;
 function getConfiguredMappedTenders(originalTender, configurationManager, transactionId, originalTransactions, refundDue) {
     var _a, _b, _c, _d, _e, _f;
     const mappedTenders = [];
@@ -789,12 +782,12 @@ function getConfiguredMappedTenders(originalTender, configurationManager, transa
     let refundCardTypes;
     let refundTenderTypes;
     let excludeCardTypes;
-    const cardTypeExceptionsForOriginalTender = getCardTypeExceptions(originalTender.tenderId, tenderDefinitions, tenderTypeBehavior);
+    const cardTypeExceptionsForOriginalTender = getCardTypeExceptions(originalTender, tenderDefinitions, tenderTypeBehavior);
     // If the card type for the original tender is defined in the cardTypeExceptions, then use that
     if (!_.isEmpty(cardTypeExceptionsForOriginalTender)) {
         refundTenderTypes = cardTypeExceptionsForOriginalTender.refundTenderTypes;
         refundCardTypes = cardTypeExceptionsForOriginalTender.refundCardTypes;
-        const mappedCardTypeNames = getMappedCardTypeNames(tenderConfig, refundCardTypes);
+        const mappedCardTypeNames = getMappedCardTypeNames(originalTender, tenderConfig, refundCardTypes);
         excludeCardTypes = mappedCardTypeNames;
         addCardTypeTendersToMappedTenders(mappedCardTypeNames, tenderDefinitions, mappedTenders, originalTender, transactionId, originalTransactions);
     }
@@ -826,7 +819,6 @@ function getAllRefundableCardTypes(tenderTypeBehavior) {
     }
     return refundableCardTypes;
 }
-exports.getAllRefundableCardTypes = getAllRefundableCardTypes;
 function addCardTypeTendersToMappedTenders(mappedCardTypeNames, tenderDefinitions, mappedTenders, originalTender, transactionId, originalTransactions) {
     var _a;
     (_a = mappedCardTypeNames) === null || _a === void 0 ? void 0 : _a.forEach((cardType) => {
@@ -853,7 +845,7 @@ function addTenderTypesToMappedTenders(mappedTenderTypeNames, tenderDefinitions,
         if ((_a = tenderDefs) === null || _a === void 0 ? void 0 : _a.length) {
             tenderDefs.forEach((tenderDef) => {
                 const label = tenderDef.tenderType === scp_types_commerce_devices_1.TenderType.Cash
-                    ? I18n.t(exports.mapTenderTypeToI18nCode.get(tenderType), { defaultValue: tenderDef.tenderName })
+                    ? I18n.t(mapTenderTypeToI18nCode.get(tenderType), { defaultValue: tenderDef.tenderName })
                     : (tenderDef.tenderLabel &&
                         I18n.t(tenderDef.tenderLabel.i18nCode, {
                             defaultValue: tenderDef.tenderLabel.default,
@@ -863,7 +855,7 @@ function addTenderTypesToMappedTenders(mappedTenderTypeNames, tenderDefinitions,
             });
         }
         else {
-            const tenderName = I18n.t(exports.mapTenderTypeToI18nCode.get(tenderType), { defaultValue: tenderType });
+            const tenderName = I18n.t(mapTenderTypeToI18nCode.get(tenderType), { defaultValue: tenderType });
             mappedTenders.push(buildMappedOriginalTender(originalTender, tenderName, tenderType, undefined, getTenderAuthCategoryFromTenderType(tenderType), transactionId, originalTransactions, undefined, undefined, excludedCardTypes));
         }
     });
@@ -878,7 +870,7 @@ function getMappedTenderTypeNames(originalTender, tenderConfig, originalTransact
                 isOriginalTenderAmountAllowed(originalTender, mappedRefundTenderType, originalTransactions, refundDue));
         }));
 }
-function getMappedCardTypeNames(tenderConfig, refundCardTypes) {
+function getMappedCardTypeNames(originalTender, tenderConfig, refundCardTypes) {
     return (refundCardTypes &&
         Object.keys(refundCardTypes).filter((cardType) => {
             const mappedRefundCardType = refundCardTypes[cardType];
@@ -887,7 +879,6 @@ function getMappedCardTypeNames(tenderConfig, refundCardTypes) {
                 (!mappedRefundCardType.hasOwnProperty("allowed") || mappedRefundCardType["allowed"] === true));
         }));
 }
-exports.getMappedCardTypeNames = getMappedCardTypeNames;
 function getActiveTendersByConfiguredPaymentRestrictions(activeTenderTypes, saleItemTypes, diContainer, orderTypes, productAttributeTypes) {
     let nonRestrictedTenderTypes = [];
     let restrictedTenderTypes = [];
@@ -1138,7 +1129,6 @@ function sortOriginalTenders(originalTenders) {
         return a.originalTenderAmount.gt(b.originalTenderAmount) ? -1 : 0;
     });
 }
-exports.sortOriginalTenders = sortOriginalTenders;
 function allowMappedTender(tenderType, tenderConfig) {
     return tenderConfig.tenderDefinitions.some((tender) => { var _a; return tender.tenderType === tenderType && ((_a = tender.allowRefund) === null || _a === void 0 ? void 0 : _a.indexOf("WhenMapped")) > -1; });
 }
@@ -1177,7 +1167,6 @@ function buildMappedOriginalTender(originalTender, tenderName, tenderType, tende
         mappedOriginTenderId: originalTender.tenderId,
     };
 }
-exports.buildMappedOriginalTender = buildMappedOriginalTender;
 function isOriginalTenderFullyRefunded(originalTender, returnTotalAmount) {
     var _a;
     const totalRefundedAmount = originalTender &&
@@ -1627,15 +1616,14 @@ function getChangeAmount(balanceDue, tenderAmount) {
         return tenderAmount.minus(balanceDue);
     }
 }
-function getCardTypeExceptions(tenderId, tenderDefinitions, tenderTypeBehavior) {
+function getCardTypeExceptions(originalTender, tenderDefinitions, tenderTypeBehavior) {
     var _a, _b;
     // Find the tender definition for the original tender
-    const originalTenderDefinition = tenderDefinitions.find((tender) => tender.tenderId === tenderId);
+    const originalTenderDefinition = tenderDefinitions.find((tender) => tender.tenderId === originalTender.tenderId);
     // If
     if (originalTenderDefinition && ((_b = (_a = tenderTypeBehavior) === null || _a === void 0 ? void 0 : _a.cardTypeExceptions) === null || _b === void 0 ? void 0 : _b.enabled)) {
         // Is there an entry for the card type in the cardTypeExceptions?
         return tenderTypeBehavior.cardTypeExceptions[originalTenderDefinition.cardType];
     }
 }
-exports.getCardTypeExceptions = getCardTypeExceptions;
 //# sourceMappingURL=TenderType.js.map

package/package.json

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