@aptos-scp/scp-component-store-selling-features-domain-model 2.10.4 → 2.10.6

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

@@ -154,7 +154,8 @@ export declare class StoreItem implements ISourceIndication, IStoreItemDescripto
     isEmployeeDiscountAllowed(): boolean;
     private static extractRetailLocationSpecificItemData;
     private static calculatePermanentPrice;
-    private static calculatePermanentPriceAtLevel;
+    private static calculateBasePermanentPriceAtLevel;
+    private static calculatePermanentPriceChangeAtLevel;
     private static calculateTemporaryPrice;
     private static calculateTemporaryPriceAtLevel;
     private static temporaryPriceEffectiveDateTime;

package/lib/domain/model/StoreItem.js

@@ -490,7 +490,7 @@ class StoreItem {
         return { storeGroupItem, retailStoreItem };
     }
     static calculatePermanentPrice(itemToConvert, storeGroupItem, retailStoreItem, accountingCurrency) {
-        let permanentPrice = StoreItem.calculatePermanentPriceAtLevel(retailStoreItem, accountingCurrency);
+        let permanentPrice = StoreItem.calculatePermanentPriceChangeAtLevel(retailStoreItem, accountingCurrency);
         if (permanentPrice) {
             return {
                 price: permanentPrice.price,
@@ -500,7 +500,7 @@ class StoreItem {
                 },
             };
         }
-        permanentPrice = StoreItem.calculatePermanentPriceAtLevel(storeGroupItem, accountingCurrency);
+        permanentPrice = StoreItem.calculatePermanentPriceChangeAtLevel(storeGroupItem, accountingCurrency);
         if (permanentPrice) {
             return {
                 price: permanentPrice.price,
@@ -510,7 +510,37 @@ class StoreItem {
                 },
             };
         }
-        permanentPrice = StoreItem.calculatePermanentPriceAtLevel(itemToConvert, accountingCurrency);
+        permanentPrice = StoreItem.calculatePermanentPriceChangeAtLevel(itemToConvert, accountingCurrency);
+        if (permanentPrice) {
+            return {
+                price: permanentPrice.price,
+                source: {
+                    organizationScope: scp_component_store_items_1.OrganizationScope.AllRetailLocations,
+                    changeScope: permanentPrice.changeScope,
+                },
+            };
+        }
+        permanentPrice = StoreItem.calculateBasePermanentPriceAtLevel(retailStoreItem, accountingCurrency);
+        if (permanentPrice) {
+            return {
+                price: permanentPrice.price,
+                source: {
+                    organizationScope: scp_component_store_items_1.OrganizationScope.OneRetailLocation,
+                    changeScope: permanentPrice.changeScope,
+                },
+            };
+        }
+        permanentPrice = StoreItem.calculateBasePermanentPriceAtLevel(storeGroupItem, accountingCurrency);
+        if (permanentPrice) {
+            return {
+                price: permanentPrice.price,
+                source: {
+                    organizationScope: scp_component_store_items_1.OrganizationScope.RetailLocationsGroup,
+                    changeScope: permanentPrice.changeScope,
+                },
+            };
+        }
+        permanentPrice = StoreItem.calculateBasePermanentPriceAtLevel(itemToConvert, accountingCurrency);
         if (permanentPrice) {
             return {
                 price: permanentPrice.price,
@@ -521,8 +551,19 @@ class StoreItem {
             };
         }
     }
-    static calculatePermanentPriceAtLevel(item, accountingCurrency) {
-        var _a, _b;
+    static calculateBasePermanentPriceAtLevel(item, accountingCurrency) {
+        var _a;
+        if (accountingCurrency && item) {
+            const price2 = item.permanentPrice;
+            if (((_a = price2) === null || _a === void 0 ? void 0 : _a.currency) === accountingCurrency) {
+                const price = StoreItem.convertStoreItemComponentIPriceToPrice(price2);
+                return { price, changeScope: scp_component_store_items_1.PriceChangeLevelType.Item };
+            }
+        }
+        return undefined;
+    }
+    static calculatePermanentPriceChangeAtLevel(item, accountingCurrency) {
+        var _a;
         if (accountingCurrency && item) {
             if (item.effectivePricing) {
                 const price1 = item.effectivePricing.permanentPrice;
@@ -531,11 +572,6 @@ class StoreItem {
                     return { price, changeScope: item.effectivePricing.permanentPriceSource };
                 }
             }
-            const price2 = item.permanentPrice;
-            if (((_b = price2) === null || _b === void 0 ? void 0 : _b.currency) === accountingCurrency) {
-                const price = StoreItem.convertStoreItemComponentIPriceToPrice(price2);
-                return { price, changeScope: scp_component_store_items_1.PriceChangeLevelType.Item };
-            }
         }
         return undefined;
     }

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.4",
+  "version": "2.10.6",
   "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
   }
 }