@aptos-scp/scp-component-store-selling-features-domain-model 3.1.0 → 3.2.1

package/lib/domain/model/StoreItem.js

@@ -325,7 +325,7 @@ class StoreItem {
         if (storeItemJsonObj.subType) {
             storeItem.subType = storeItemJsonObj.subType;
         }
-        if (storeItemJsonObj.autoSubscribe) {
+        if (_.isBoolean(storeItemJsonObj.autoSubscribe)) {
             storeItem.autoSubscribe = storeItemJsonObj.autoSubscribe;
         }
         storeItem.departmentGroupId = StoreItem.getStringFromJsonObject(storeItemJsonObj.departmentGroupId);
@@ -456,7 +456,7 @@ class StoreItem {
             if (item.subType) {
                 storeItem.subType = item.subType;
             }
-            if (item.autoSubscribe) {
+            if (_.isBoolean(item.autoSubscribe)) {
                 storeItem.autoSubscribe = item.autoSubscribe;
             }
         }

package/lib/domain/model/TenderType.js

@@ -623,14 +623,12 @@ class TenderType {
         const nonIntegratedGroup = activeTenders.find((tender) => tender.tenderAuthCategory === Constants_1.TenderAuthCategory.NonIntegratedDevice)
             ? [{ tenderAuthCategory: Constants_1.TenderAuthCategory.NonIntegratedDevice }]
             : [];
-        let giftGroup = activeTenders.find((tender) => tender.tenderAuthCategory === Constants_1.TenderAuthCategory.GiftDevice)
+        const giftDeviceGroup = activeTenders.some((tender) => tender.tenderAuthCategory === Constants_1.TenderAuthCategory.GiftDevice)
             ? [{ tenderAuthCategory: Constants_1.TenderAuthCategory.GiftDevice }]
             : [];
-        if (!(giftGroup && giftGroup.length > 0)) {
-            giftGroup = activeTenders.find((tender) => tender.tenderAuthCategory === Constants_1.TenderAuthCategory.StoredValueCardService)
-                ? [{ tenderAuthCategory: Constants_1.TenderAuthCategory.StoredValueCardService }]
-                : [];
-        }
+        const storedValueCardServiceGroup = activeTenders.some((tender) => tender.tenderAuthCategory === Constants_1.TenderAuthCategory.StoredValueCardService)
+            ? [{ tenderAuthCategory: Constants_1.TenderAuthCategory.StoredValueCardService }]
+            : [];
         const valueCertificateGroup = ((_a = activeTenders
             .filter((tender) => tender.tenderAuthCategory === Constants_1.TenderAuthCategory.StoredValueCertificateService)) === null || _a === void 0 ? void 0 : _a.map((certificateTender) => {
             return {
@@ -651,7 +649,8 @@ class TenderType {
             ...cardGroup,
             ...ttpGroup,
             ...nonIntegratedGroup,
-            ...giftGroup,
+            ...giftDeviceGroup,
+            ...storedValueCardServiceGroup,
             ...valueCertificateGroup,
             ...walletGroup,
             ...loyaltyGroup,
@@ -678,6 +677,8 @@ function combineOriginalUnreferencedAndMappedTenders(tender, unreferencedAndMapp
             combinedTender.isMappedTender &&
             tender.tenderAuthCategory !== Constants_1.TenderAuthCategory.None &&
             tender.tenderAuthCategory !== Constants_1.TenderAuthCategory.StoredValueCertificateService &&
+            tender.tenderAuthCategory !== Constants_1.TenderAuthCategory.StoredValueCardService &&
+            tender.tenderAuthCategory !== Constants_1.TenderAuthCategory.GiftDevice &&
             tender.tenderType === combinedTender.tenderType &&
             (!combinedTender.cardType || tender.cardType === combinedTender.cardType)));
     if (matchingUnreferencedTender) {
@@ -872,7 +873,8 @@ function addTenderTypesToMappedTenders(mappedTenderTypeNames, tenderDefinitions,
                 ((_a = tenderDef.allowRefund) === null || _a === void 0 ? void 0 : _a.indexOf("WhenMapped")) > -1 &&
                 (tenderDef.tenderAuthCategory === Constants_1.TenderAuthCategory.None ||
                     tenderDef.tenderAuthCategory === Constants_1.TenderAuthCategory.StoredValueCertificateService ||
-                    tenderDef.tenderAuthCategory === Constants_1.TenderAuthCategory.GiftDevice);
+                    tenderDef.tenderAuthCategory === Constants_1.TenderAuthCategory.GiftDevice ||
+                    tenderDef.tenderAuthCategory === Constants_1.TenderAuthCategory.StoredValueCardService);
         });
         if ((_a = tenderDefs) === null || _a === void 0 ? void 0 : _a.length) {
             tenderDefs.forEach((tenderDef) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aptos-scp/scp-component-store-selling-features-domain-model",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "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",