@crystaldesign/diva-seller 24.15.0-beta.40 → 24.15.0-beta.41

package/build/esm/index.js

@@ -7931,10 +7931,16 @@ function Priceedit (_ref) {
     discount.percentageDiscount = isPercentage ? value : undefined;
     var price = (_productData$addedPri = productData.addedPrice) !== null && _productData$addedPri !== void 0 ? _productData$addedPri : 0;
     if (isPercentage) {
-      var discountPrice = (discount.percentageDiscount || 0) / 100 * price;
-      discount = _objectSpread$i(_objectSpread$i({}, discount), {}, {
-        calcDiscountPrice: formatTwoDecimals(price - discountPrice)
-      });
+      if (discount.percentageDiscount == 0 || discount.percentageDiscount == undefined) {
+        discount = _objectSpread$i(_objectSpread$i({}, discount), {}, {
+          calcDiscountPrice: ''
+        });
+      } else {
+        var discountPrice = (discount.percentageDiscount || 0) / 100 * price;
+        discount = _objectSpread$i(_objectSpread$i({}, discount), {}, {
+          calcDiscountPrice: formatTwoDecimals(price - discountPrice)
+        });
+      }
     } else {
       discount = _objectSpread$i(_objectSpread$i({}, discount), {}, {
         percentageDiscount: formatOneDecimals((price - value || 0) / price * 100)
@@ -7942,8 +7948,8 @@ function Priceedit (_ref) {
     }
     setDiscount(discount);
     update(_objectSpread$i(_objectSpread$i({}, productData), {}, {
-      discountedPrice: isPercentage ? formatTwoDecimals(discount.calcDiscountPrice) : value,
-      percentageDiscount: discount.percentageDiscount
+      discountedPrice: isPercentage ? discount.calcDiscountPrice ? formatTwoDecimals(discount.calcDiscountPrice) : undefined : value,
+      percentageDiscount: discount.percentageDiscount > 0 ? discount.percentageDiscount : undefined
     }));
   }, [productData, update]);
   function formatTwoDecimals(value) {
@@ -10156,8 +10162,14 @@ function _preUpdateData(field, value, row) {
       var calcedValue = (price - myValue || 0) / price * 100;
       if (fieldName === 'percentageDiscount') {
         calcedField = 'discountedPrice';
-        var discountedPrice = Math.round((myValue || 0) / 100 * price);
-        calcedValue = price - discountedPrice;
+        myValue = isNaN(myValue) ? 0 : myValue;
+        if (myValue > 0) {
+          var discountedPrice = Math.round(myValue / 100 * price);
+          calcedValue = price - discountedPrice;
+        } else {
+          myValue = 0;
+          calcedValue = undefined;
+        }
       }
       return _objectSpread$7(_objectSpread$7({}, row.original), {}, _defineProperty(_defineProperty({}, fieldName, myValue), calcedField, calcedValue));
     }
@@ -11600,6 +11612,12 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
       if (field == 'shortDescription' || field == ' customData') {
         //updated shortDescription as last value
         continue;
+      } else if (field == 'discountedPrice' && (newVariant === null || newVariant === void 0 ? void 0 : newVariant['percentageDiscount']) === 0 && (newVariant === null || newVariant === void 0 ? void 0 : newVariant[field]) === undefined) {
+        finalVariant[field] = undefined;
+        newModified[field] = variant[field] !== undefined;
+      } else if (field == 'percentageDiscount' && (newVariant === null || newVariant === void 0 ? void 0 : newVariant[field]) === 0) {
+        finalVariant[field] = 0;
+        newModified[field] = variant[field] !== 0;
       } else if (field == 'addedPrice' || field == 'calculatedPrice') {
         var _currentState$modifie;
         var _ProductHandler$calcu = ProductHandler.calculateComputedValue(variant[field], newVariant === null || newVariant === void 0 ? void 0 : newVariant[field], currentState.baseData[field], (_currentState$modifie = currentState.modified.variantData[_i]) === null || _currentState$modifie === void 0 ? void 0 : _currentState$modifie[field]),

package/build/types/seller/src/components/ProductCreator/components/Priceedit.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Priceedit.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/ProductCreator/components/Priceedit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA6B,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAA2C,MAAM,OAAO,CAAC;AAIhE,MAAM,CAAC,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;IAAE,WAAW,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,IAAI,CAAA;CAAE,qBAmH/G"}
+{"version":3,"file":"Priceedit.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/ProductCreator/components/Priceedit.tsx"],"names":[],"mappings":"AAAA,OAAO,EAA6B,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAClF,OAAO,KAA2C,MAAM,OAAO,CAAC;AAIhE,MAAM,CAAC,OAAO,WAAW,EAAE,WAAW,EAAE,MAAM,EAAE,EAAE;IAAE,WAAW,EAAE,WAAW,CAAC;IAAC,MAAM,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,IAAI,CAAA;CAAE,qBAuH/G"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-seller",
-  "version": "24.15.0-beta.40",
+  "version": "24.15.0-beta.41",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"
@@ -29,9 +29,9 @@
     "react-dom": "^18.3.1"
   },
   "dependencies": {
-    "@crystaldesign/analytics": "24.15.0-beta.40",
-    "@crystaldesign/products-component": "24.15.0-beta.40",
-    "@crystaldesign/real-time-viewer": "24.15.0-beta.40",
+    "@crystaldesign/analytics": "24.15.0-beta.41",
+    "@crystaldesign/products-component": "24.15.0-beta.41",
+    "@crystaldesign/real-time-viewer": "24.15.0-beta.41",
     "@emotion/react": "^11.4.1",
     "@emotion/styled": "^11.3.0",
     "@mui/icons-material": "^6.1.5",
@@ -43,5 +43,5 @@
   },
   "types": "./build/types/seller/src/index.d.ts",
   "module": "build/esm/index.js",
-  "gitHead": "ed900e671d4442ebd8a0dc07ebf3b1013fc20dce"
+  "gitHead": "2aeb96e27cc6aba71d7a6221333b800fe3068b88"
 }