@citygross/components 0.8.14 → 0.8.16

package/build/cjs/components/src/components/CartSubTotal/CartSubTotal.js

@@ -21,12 +21,11 @@ exports.ECartSubTotalTypes = void 0;
 var CartSubTotal = function (_a) {
     var _b;
     var label = _a.label, value = _a.value, children = _a.children, info = _a.info, type = _a.type, fromPriceLabel = _a.fromPriceLabel, infoOnBottom = _a.infoOnBottom, _c = _a.priceColor, priceColor = _c === void 0 ? (_b = designTokens.theme.palette) === null || _b === void 0 ? void 0 : _b.darkest : _c;
-    var formattedPrice = utils.formatPriceWithDecimalsReduced(value);
+    var formattedPrice = utils.formatPriceWithNoZero(value);
     var _d = React.useState(false), infoOpen = _d[0], setInfoOpen = _d[1];
     var toggleInfoOpen = function () {
         setInfoOpen(!infoOpen);
     };
-    console.log('formattedPrice', formattedPrice);
     return info !== undefined ? (React__default["default"].createElement(CartSubTotal_styles.CartSubTotalContainer, { type: type },
         React__default["default"].createElement(CartSubTotal_styles.SubTotalLabel, null,
             label,
@@ -35,19 +34,14 @@ var CartSubTotal = function (_a) {
                 React__default["default"].createElement(icons.Icons.Info, { height: 16, width: 16 }))),
         React__default["default"].createElement(CartSubTotal_styles.Price, { priceColor: priceColor }, (value !== 0 && !value) || isNaN(value)
             ? '-'
-            : "".concat(fromPriceLabel || '', " ").concat("".concat(formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.value).concat((formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.decimal) !== '00'
-                ? ",".concat(formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.decimal)
-                : ''), " kr")),
+            : "".concat(fromPriceLabel || '', " ").concat(formattedPrice, " kr")),
         infoOpen && (React__default["default"].createElement(ToolTipDialog.ToolTipDialog, { onBottom: infoOnBottom, info: info, toggle: toggleInfoOpen })))) : (React__default["default"].createElement(CartSubTotal_styles.CartSubTotalContainer, { type: type },
         React__default["default"].createElement(CartSubTotal_styles.SubTotalLabel, null,
             label,
             children),
-        value !== undefined ? (React__default["default"].createElement(CartSubTotal_styles.Price, { priceColor: priceColor }, formattedPrice === null || formattedPrice === void 0 ? void 0 :
-            formattedPrice.value, "".concat((formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.decimal) !== '00'
-            ? ",".concat(formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.decimal)
-            : ''),
-            ' ',
-            "kr")) : null));
+        value !== undefined ? (React__default["default"].createElement(CartSubTotal_styles.Price, { priceColor: priceColor },
+            formattedPrice,
+            " kr")) : null));
 };
 
 exports.CartSubTotal = CartSubTotal;

package/build/cjs/components/src/components/CartSubTotal/CartSubTotal.js.map

@@ -1 +1 @@
-{"version":3,"file":"CartSubTotal.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}
+{"version":3,"file":"CartSubTotal.js","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;"}

package/build/cjs/utils/build/index.js

@@ -24,7 +24,10 @@ var formatPrice = function (price, withParenthesis) {
     }
     var formattedPrice = price === 0
         ? 0
-        : (Math.round(price * 100) / 100).toFixed(2).replace('.', ',');
+        : (Math.round(price * 100) / 100)
+            .toFixed(2)
+            .replace('.', ',')
+            .replace(',00', '');
     return "".concat(withParenthesis ? "(".concat(formattedPrice, " kr)") : "".concat(formattedPrice, " kr"));
 };
 
@@ -49,6 +52,14 @@ var formatPriceWithDecimalsReduced = function (price) {
     };
 };
 
+var formatPriceWithNoZero = function (price) {
+    if ((price !== 0 && !price) || isNaN(price)) {
+        return null;
+    }
+    var formattedPrice = formatPriceWithDecimalsReduced(price);
+    return "".concat(formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.value).concat("".concat((formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.decimal) !== '00' ? ",".concat(formattedPrice === null || formattedPrice === void 0 ? void 0 : formattedPrice.decimal) : ''));
+};
+
 var capitalizeFirstLetter = function (string) {
     if (string.length > 1) {
         return string.charAt(0).toUpperCase() + string.slice(1);
@@ -18715,6 +18726,7 @@ index.__exports.formatLeadingZero = formatLeadingZero;
 index.__exports.formatPostalCode = formatPostalCode;
 index.__exports.formatPrice = formatPrice;
 index.__exports.formatPriceWithDecimalsReduced = formatPriceWithDecimalsReduced;
+index.__exports.formatPriceWithNoZero = formatPriceWithNoZero;
 index.__exports.getCountryFromLanguageCode = getCountryFromLanguageCode;
 index.__exports.languageCodeToCountryMap = languageCodeToCountryMap;
 index.__exports.makeCateringPortionsString = makeCateringPortionsString;