@veloceapps/sdk 7.0.2-77 → 7.0.2-79

package/fesm2020/veloceapps-sdk-core.mjs

@@ -1,6 +1,6 @@
 import * as i0 from '@angular/core';
 import { Injectable, InjectionToken, NgModule, inject, Directive, Input, LOCALE_ID, Pipe } from '@angular/core';
-import { UUID, ConfigurationContextMode, ConfigurationContext, RuntimeModel, getUIDefinitionProperties, isLegacyUIDefinition, SalesforceIdUtils, ConfigurationMode, ConfigurationTranslatorUtils, EntityUtil, ChargeGroupUtils, DEFAULT_CURRENCY_ISO_CODE, DEFAULT_CURRENCY_SYMBOL, validateDateFormat, DEFAULT_DATE_FORMAT, DEFAULT_DECIMAL_SEPARATOR, DEFAULT_THOUSANDS_SEPARATOR, getSupportedDateFormats, DEFAULT_DECIMALS_COUNT, parseJsonSafely, formatNumber } from '@veloceapps/core';
+import { UUID, ConfigurationContextMode, ConfigurationContext, RuntimeModel, getUIDefinitionProperties, isLegacyUIDefinition, SalesforceIdUtils, ConfigurationMode, ConfigurationTranslatorUtils, EntityUtil, ChargeGroupUtils, DEFAULT_CURRENCY_ISO_CODE, DEFAULT_CURRENCY_SYMBOL, validateDateFormat, DEFAULT_DATE_FORMAT, DEFAULT_DECIMALS_COUNT, getSupportedDateFormats, DEFAULT_DECIMAL_SEPARATOR, DEFAULT_THOUSANDS_SEPARATOR, parseJsonSafely, formatNumber } from '@veloceapps/core';
 import * as i1 from '@veloceapps/api';
 import { PriceApiService, ContextApiService, ProductModelApiService, ConfigurationApiService } from '@veloceapps/api';
 import { BehaviorSubject, combineLatest, zip, noop, throwError, shareReplay as shareReplay$1, switchMap as switchMap$1, of, tap as tap$1, map as map$2, catchError as catchError$1, Subject, take as take$1, distinctUntilChanged } from 'rxjs';
@@ -1542,16 +1542,23 @@ class RuntimeSettingsService {
         const currencySettings = this.getCurrencySettings();
         const dateFormat = (validateDateFormat(shoppingCartSettings?.DATE_FORMAT ?? '') && shoppingCartSettings?.DATE_FORMAT) ||
             DEFAULT_DATE_FORMAT;
-        const decimalSeparator = shoppingCartSettings?.DECIMAL_SEPARATOR ?? DEFAULT_DECIMAL_SEPARATOR;
-        const thousandsSeparator = shoppingCartSettings?.THOUSANDS_SEPARATOR ?? DEFAULT_THOUSANDS_SEPARATOR;
+        const decimalSeparator = shoppingCartSettings?.DECIMAL_SEPARATOR;
+        const thousandsSeparator = shoppingCartSettings?.THOUSANDS_SEPARATOR;
+        // the number of decimal places can be 0
+        const priceScale = shoppingCartSettings?.PRICE_SCALE;
+        const decimalsCount = priceScale !== null && priceScale !== '' && !isNaN(Number(priceScale)) && Number(priceScale) >= 0
+            ? Number(priceScale)
+            : DEFAULT_DECIMALS_COUNT;
         return {
             currencySymbol: currencySettings.symbol,
             dateFormats: getSupportedDateFormats(dateFormat),
-            decimalSeparator: (['.', ','].includes(decimalSeparator) && decimalSeparator) || DEFAULT_DECIMAL_SEPARATOR,
-            decimalsCount: (!isNaN(Number(shoppingCartSettings?.PRICE_SCALE)) && Number(shoppingCartSettings?.PRICE_SCALE)) ||
-                DEFAULT_DECIMALS_COUNT,
-            thousandsSeparator: ['.', ',', ''].includes(thousandsSeparator)
-                ? thousandsSeparator
+            decimalsCount,
+            decimalSeparator: decimalSeparator !== undefined && ['.', ','].includes(decimalSeparator)
+                ? decimalSeparator
+                : DEFAULT_DECIMAL_SEPARATOR,
+            // thousands separator can be a blank value, so it can also be null
+            thousandsSeparator: thousandsSeparator !== undefined && ['.', ',', '', null].includes(thousandsSeparator)
+                ? thousandsSeparator || ''
                 : DEFAULT_THOUSANDS_SEPARATOR,
         };
     }