@aptos-scp/scp-component-store-selling-features-domain-model 2.10.3 → 2.10.5

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

@@ -161,6 +161,7 @@ export declare class MerchandiseTransaction extends RetailTransaction implements
     private _prepaidTendersToApply?;
     private _transactionSubTotalExcludingPreviouslyCollected;
     private _transactionTotalSavingsExcludingPreviouslyCollected;
+    private _transactionSubTotalExcPrepaidAndExcTranDisc;
     private _transactionTotalTaxExcludingPreviouslyCollected;
     private _balanceDueExcludingPreviouslyCollected;
     private _transactionTotalExcludingPreviouslyCollected;
@@ -197,6 +198,7 @@ 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

@@ -96,6 +96,7 @@ 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);
@@ -226,6 +227,8 @@ class MerchandiseTransaction extends RetailTransaction_1.RetailTransaction {
             transaction._prepaidTendersToApply = this._prepaidTendersToApply;
             transaction._transactionSubTotalExcludingPreviouslyCollected =
                 this._transactionSubTotalExcludingPreviouslyCollected;
+            transaction._transactionSubTotalExcPrepaidAndExcTranDisc =
+                this._transactionSubTotalExcPrepaidAndExcTranDisc;
             transaction._transactionTotalSavingsExcludingPreviouslyCollected =
                 this._transactionTotalSavingsExcludingPreviouslyCollected;
             transaction._transactionTotalTaxExcludingPreviouslyCollected =
@@ -347,6 +350,9 @@ 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
      */
@@ -862,6 +868,10 @@ 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],
@@ -1056,6 +1066,7 @@ 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,
@@ -1212,6 +1223,9 @@ 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

@@ -40,6 +40,7 @@ export interface ITenderGroup {
     tenderType?: string;
     groupLabel?: ILabel;
     subType?: TenderSubType;
+    refundableAmount?: Money;
 }
 export interface IChangeBehaviorDefinition {
     forfeitChange?: boolean;
@@ -98,7 +99,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): Money;
+    static getRefundableAmountByGroup(group: ITenderGroup, displayInfo: any, currency: string, configuration: IConfigurationManager, refundDue?: Money, useGroupRefundableAmount?: boolean): 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;

package/lib/domain/model/TenderType.js

@@ -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) {
+    static getRefundableAmountByGroup(group, displayInfo, currency, configuration, refundDue, useGroupRefundableAmount = false) {
         var _a, _b, _c, _d;
         const withoutTransactionTotal = TenderType.getWithoutTransactionTotal(displayInfo, currency, configuration);
         const withTransactionTotal = TenderType.getWithTransactionTotal(displayInfo, currency, configuration);
@@ -127,14 +127,19 @@ class TenderType {
             }
         });
         let refundableAmount = new scp_component_business_core_1.Money(0, currency);
-        if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithTransaction)) {
-            refundableAmount = refundableAmount.plus(withTransactionTotal);
+        if (group.refundableAmount && useGroupRefundableAmount) {
+            refundableAmount = group.refundableAmount;
         }
-        if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithoutTransaction)) {
-            refundableAmount = refundableAmount.plus(withoutTransactionTotal);
-        }
-        if (tenderAllowRefund.includes(ITendersConfig_1.AllowRefund.WithOfflineTransaction)) {
-            refundableAmount = refundableAmount.plus(withOfflineTransactionTotal);
+        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);
+            }
         }
         return getLowestRefundDue(refundDue, undefined, refundableAmount);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "2.10.3",
+  "version": "2.10.5",
   "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",
@@ -202,13 +202,5 @@
     "extends": [
       "@aptos-scp/scp-component-commit-configs/.commitlintrc.js"
     ]
-  },
-  "release": {
-    "repositoryUrl": "https://auth@bitbucket.org/aptosretail/scp-component-store-selling-features-domain-model.git",
-    "tagFormat": "@aptos-scp/scp-component-store-selling-features-domain-model@${version}",
-    "extends": [
-      "@aptos-scp/scp-component-commit-configs/releaserc.config.js"
-    ],
-    "npmPublish": true
   }
 }