@aptos-scp/scp-component-store-selling-features-domain-model 2.34.2 → 2.35.0

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

@@ -1,5 +1,5 @@
 import { Money, Price } from "@aptos-scp/scp-component-business-core";
-import { IExternalId, IImage, IItem, IPrice as IStoreItemsPrice, IProductAttribute, IProductAttributeTranslation, IStoreItemDescriptor, ItemType as StoreItemType, OrganizationScope, PriceChangeLevelType, Status, TreatmentRules, ITranslation } from "@aptos-scp/scp-component-store-items";
+import { IExternalId, IImage, IItem, IPrice as IStoreItemsPrice, IProductAttribute, IProductAttributeTranslation, IStoreItemDescriptor, ItemType as StoreItemType, ItemSubType, OrganizationScope, PriceChangeLevelType, Status, TreatmentRules, ITranslation } from "@aptos-scp/scp-component-store-items";
 import { IConfigurationManager, RetailLocationIdentity } from "@aptos-scp/scp-component-store-selling-core";
 import { ItemType } from "@aptos-scp/scp-types-commerce-transaction";
 import { MerchandiseHierarchyNodeResponseV2 } from "@aptos-scp/scp-types-store-items";
@@ -145,6 +145,7 @@ export declare class StoreItem implements ISourceIndication, IStoreItemDescripto
     defaultReturnPrice?: Price;
     images?: IImage[];
     subscriptionFrequencyCodes?: string[];
+    subType?: ItemSubType;
     static createFromJsonObject(storeItemJsonObj: any): StoreItem;
     static convertStoreItemComponentIPriceToPrice(value: IStoreItemsPrice): Price;
     static createFromItemObject(configurationManager: IConfigurationManager, retailLocationIdentity: RetailLocationIdentity, accountingCurrency: string, itemToConvert: IItem, locale?: string, sourceIndicator?: SourceType): StoreItem;

package/lib/domain/model/StoreItem.js

@@ -322,6 +322,9 @@ class StoreItem {
         if (storeItemJsonObj.subscriptionFrequencyCodes) {
             storeItem.subscriptionFrequencyCodes = storeItemJsonObj.subscriptionFrequencyCodes;
         }
+        if (storeItemJsonObj.subType) {
+            storeItem.subType = storeItemJsonObj.subType;
+        }
         storeItem.departmentGroupId = StoreItem.getStringFromJsonObject(storeItemJsonObj.departmentGroupId);
         return storeItem;
     }
@@ -447,6 +450,9 @@ class StoreItem {
             if (item.subscriptionFrequencyCodes) {
                 storeItem.subscriptionFrequencyCodes = item.subscriptionFrequencyCodes;
             }
+            if (item.subType) {
+                storeItem.subType = item.subType;
+            }
         }
         catch (err) {
             logger.catching(err, entryMessage);

package/lib/domain/model/fee/FeeLine.js

@@ -292,24 +292,24 @@ class FeeLine extends BaseTransactionLine_1.BaseTransactionLine {
         return transactionLineJsonObj._taxGroupId;
     }
     static getExtendedAmountFromCollectedData(collectedData) {
-        if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmount) && FeeLine.isPickupFulfilmentTransaction) {
+        if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmount)) {
             return collectedData.get(Constants_1.CollectedDataKey.FeeExtendedAmount);
         }
-        undefined;
+        return undefined;
     }
     static getExtendedAmountExcludingTaxFromCollectedData(collectedData) {
         if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmountExcludingTax) &&
             FeeLine.isPickupFulfilmentTransaction) {
             return collectedData.get(Constants_1.CollectedDataKey.FeeExtendedAmountExcludingTax);
         }
-        undefined;
+        return undefined;
     }
     static getExtendedAmountIncludingTaxFromCollectedData(collectedData) {
         if (collectedData.has(Constants_1.CollectedDataKey.FeeExtendedAmountIncludingTax) &&
             FeeLine.isPickupFulfilmentTransaction) {
             return collectedData.get(Constants_1.CollectedDataKey.FeeExtendedAmountIncludingTax);
         }
-        undefined;
+        return undefined;
     }
     copyLineWithNewLineNumber(newLineNumber) {
         const clonedItem = this.clone();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "2.34.2",
+  "version": "2.35.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",
@@ -56,7 +56,7 @@
     "@aptos-scp/scp-component-business-core": "^1.12.7",
     "@aptos-scp/scp-component-logging": "^2.1.16",
     "@aptos-scp/scp-component-pricing": "^7.66.4",
-    "@aptos-scp/scp-component-store-items": "^1.22.2",
+    "@aptos-scp/scp-component-store-items": "^1.23.0",
     "@aptos-scp/scp-component-store-selling-core": "^18.9.3",
     "@aptos-scp/scp-component-taxation": "^5.28.0",
     "@aptos-scp/scp-component-user": "^1.4.0",
@@ -79,7 +79,7 @@
     "@aptos-scp/scp-component-logging": "^2.1.16",
     "@aptos-scp/scp-component-pricing": "^7.66.4",
     "@aptos-scp/scp-component-rn-circuit-breaker": "^1.0.15",
-    "@aptos-scp/scp-component-store-items": "^1.22.2",
+    "@aptos-scp/scp-component-store-items": "^1.23.0",
     "@aptos-scp/scp-component-store-selling-core": "^18.9.3",
     "@aptos-scp/scp-component-taxation": "^5.28.0",
     "@aptos-scp/scp-component-user": "^1.4.0",
@@ -97,7 +97,7 @@
     "@aptos-scp/scp-types-orders": "^4.11.0",
     "@aptos-scp/scp-types-pricing": "^4.30.0",
     "@aptos-scp/scp-types-ss-transaction-history": "^1.6.0",
-    "@aptos-scp/scp-types-store-items": "^1.34.0",
+    "@aptos-scp/scp-types-store-items": "^1.41.0",
     "@aptos-scp/scp-types-terminal-settings": "^1.3.0",
     "@aptos-scp/scp-types-transaction": "^1.4.3",
     "@aptos-scp/scp-types-user": "^1.5.2",