@crystaldesign/diva-seller 24.15.0-rc.8 → 24.15.0

package/build/esm/index.js

@@ -11043,7 +11043,7 @@ function useProductState (basket, divaNr) {
   }, [updateCategoriesInternal, state]);
   var save = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
-      var _state$classification, data, params, _productHandler$close, _productHandler$close2, _productHandler$close3, savedProducts;
+      var _state$classification, data, params, _productHandler$close, _savedProducts, _productHandler$close2, _productHandler$close3, savedProducts;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -11083,7 +11083,7 @@ function useProductState (basket, divaNr) {
             data = _context2.sent;
             setIsNew(false);
             if (!(originProductId || sendProductsToExternalService)) {
-              _context2.next = 34;
+              _context2.next = 35;
               break;
             }
             params = {
@@ -11092,49 +11092,50 @@ function useProductState (basket, divaNr) {
               parentProductId: originProductId ? originProductId : undefined
             };
             if (!(clientArticleHandler !== null && clientArticleHandler !== void 0 && clientArticleHandler.clientArticleService)) {
-              _context2.next = 29;
+              _context2.next = 30;
               break;
             }
             _context2.prev = 11;
             _context2.next = 14;
             return clientArticleHandler.saveProductsSMArticles(params, clientArticleHandler.clientArticleService, organization._id);
           case 14:
+            _savedProducts = _context2.sent;
             (_productHandler$close = productHandler.closeModal) === null || _productHandler$close === void 0 || _productHandler$close.call(productHandler);
-            _context2.next = 17;
-            return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, []);
-          case 17:
+            _context2.next = 18;
+            return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, _savedProducts);
+          case 18:
             if (originProductId) clearOriginProductId();
             return _context2.abrupt("return", true);
-          case 21:
-            _context2.prev = 21;
+          case 22:
+            _context2.prev = 22;
             _context2.t0 = _context2["catch"](11);
             (_productHandler$close2 = productHandler.closeModal) === null || _productHandler$close2 === void 0 || _productHandler$close2.call(productHandler);
-            _context2.next = 26;
+            _context2.next = 27;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket);
-          case 26:
-            throw new Error(_context2.t0.message);
           case 27:
-            _context2.next = 34;
+            throw new Error(_context2.t0.message);
+          case 28:
+            _context2.next = 35;
             break;
-          case 29:
+          case 30:
             (_productHandler$close3 = productHandler.closeModal) === null || _productHandler$close3 === void 0 || _productHandler$close3.call(productHandler);
             if (originProductId) clearOriginProductId();
             LOG$2.error(new DivaError("Articles cannot be saved - ClientArticleService or JWT not set"));
             setError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils.getCurrentTraceId() + ' ' + DivaUtils.formatDate(new Date(), true, undefined, true));
             return _context2.abrupt("return", false);
-          case 34:
-            _context2.next = 36;
+          case 35:
+            _context2.next = 37;
             return productHandler.saveProducts(_objectSpread$4(_objectSpread$4({}, data), {}, {
               awaitPDF: undefined
             }));
-          case 36:
+          case 37:
             savedProducts = _context2.sent;
-            _context2.next = 39;
+            _context2.next = 40;
             return reset(currentBasketState === null || currentBasketState === void 0 ? void 0 : currentBasketState.basket, savedProducts);
-          case 39:
+          case 40:
             return _context2.abrupt("return", true);
-          case 42:
-            _context2.prev = 42;
+          case 43:
+            _context2.prev = 43;
             _context2.t1 = _context2["catch"](2);
             LOG$2.error(new DivaError("Error saving product", {
               code: 'PROD_0002',
@@ -11146,7 +11147,7 @@ function useProductState (basket, divaNr) {
               setError(t('modal.general_error') + ' ' + t('modal.errorcode') + ':' + DivaUtils.getCurrentTraceId() + ' ' + DivaUtils.formatDate(new Date(), true, undefined, true));
             }
             if (!_context2.t1.message.includes('PRODSM_0001')) {
-              _context2.next = 51;
+              _context2.next = 52;
               break;
             }
             openModal({
@@ -11155,18 +11156,18 @@ function useProductState (basket, divaNr) {
               accept: true
             });
             return _context2.abrupt("return", false);
-          case 51:
+          case 52:
             openModal({
               title: t('errorcodes._source.labels.error.SELLER_0002'),
               text: t('grid.error'),
               accept: true
             });
             return _context2.abrupt("return", false);
-          case 53:
+          case 54:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[2, 42], [11, 21]]);
+      }, _callee2, null, [[2, 43], [11, 22]]);
     }));
     return function save() {
       return _ref.apply(this, arguments);
@@ -11658,6 +11659,8 @@ function updateVariants(prevState, currentState, configurationData, baseDataFiel
       } 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 == 'percentageDiscount' || field == 'discountedPrice') && (newVariant === null || newVariant === void 0 ? void 0 : newVariant[field]) === variant[field]) {
+        continue;
       } 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/hooks/useProductState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useProductState.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/ProductCreator/hooks/useProductState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,WAAW,EACX,KAAK,EAGN,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,aAAa,EAAyC,MAAM,gCAAgC,CAAC;AAKlJ,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAKvD,UAAU,KAAK;IACb,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,WAAW,CAAC;IACtB,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtD,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC/B,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,qBAAqB,CAAC,EAAE;QACtB,CAAC,SAAS,EAAE,MAAM,GAAG;YACnB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC;SACxB,CAAC;KACH,CAAC;IACF,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE;QACR,gBAAgB,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,GAAG,EAAE,CAAC;KACpB,CAAC;IACF,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB;AA6ED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAsJ3C,MAAM,GAAG,SAAS,iBAAiB,MAAM,GAAG,SAAS,gBAAgB,MAAM,GAAG,SAAS;2BAlE9F,WAAW;kCAaX,GAAG;2BAcH,GAAG,EAAE;wBAQL,QAAQ,EAAE,aAAa,MAAM,EAAE;wBAQ/B,KAAK,aAAa,MAAM,EAAE;sBAQ1B,MAAM,MAAM,MAAM,cAAc,OAAO,cAAc,MAAM;4BAQ3D,MAAM,MAAM,MAAM,oBAAoB,GAAG,EAAE,GAAG,SAAS;;qBA4HlC,UAAU,gBAAgB,GAAG,EAAE;yBAhLb;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE;;EAgZxF"}
+{"version":3,"file":"useProductState.d.ts","sourceRoot":"","sources":["../../../../../../../src/components/ProductCreator/hooks/useProductState.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EAKV,WAAW,EACX,KAAK,EAGN,MAAM,0BAA0B,CAAC;AAElC,OAAO,EAAE,cAAc,EAAE,mBAAmB,EAAE,KAAK,EAAE,aAAa,EAAyC,MAAM,gCAAgC,CAAC;AAKlJ,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAKvD,UAAU,KAAK;IACb,kBAAkB,EAAE,MAAM,EAAE,CAAC;IAC7B,WAAW,EAAE,MAAM,CAAC;IACpB,QAAQ,EAAE,WAAW,CAAC;IACtB,kBAAkB,CAAC,EAAE,GAAG,CAAC;IACzB,SAAS,EAAE,aAAa,EAAE,CAAC;IAC3B,WAAW,CAAC,EAAE;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE,CAAC;IACtD,qBAAqB,EAAE,KAAK,EAAE,CAAC;IAC/B,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAC7C,qBAAqB,CAAC,EAAE;QACtB,CAAC,SAAS,EAAE,MAAM,GAAG;YACnB,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC;SACxB,CAAC;KACH,CAAC;IACF,WAAW,EAAE,GAAG,EAAE,CAAC;IACnB,aAAa,EAAE,MAAM,EAAE,CAAC;IACxB,eAAe,EAAE,MAAM,EAAE,CAAC;IAC1B,QAAQ,EAAE;QACR,gBAAgB,EAAE,OAAO,CAAC;QAC1B,WAAW,EAAE,GAAG,EAAE,CAAC;KACpB,CAAC;IACF,YAAY,CAAC,EAAE,KAAK,EAAE,CAAC;CACxB;AA6ED,MAAM,CAAC,OAAO,WAAW,MAAM,CAAC,EAAE,UAAU,EAAE,MAAM,CAAC,EAAE,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;oCAsJ3C,MAAM,GAAG,SAAS,iBAAiB,MAAM,GAAG,SAAS,gBAAgB,MAAM,GAAG,SAAS;2BAlE9F,WAAW;kCAaX,GAAG;2BAcH,GAAG,EAAE;wBAQL,QAAQ,EAAE,aAAa,MAAM,EAAE;wBAQ/B,KAAK,aAAa,MAAM,EAAE;sBAQ1B,MAAM,MAAM,MAAM,cAAc,OAAO,cAAc,MAAM;4BAQ3D,MAAM,MAAM,MAAM,oBAAoB,GAAG,EAAE,GAAG,SAAS;;qBAgIlC,UAAU,gBAAgB,GAAG,EAAE;yBApLb;QAAE,CAAC,UAAU,EAAE,MAAM,GAAG,aAAa,CAAA;KAAE;;EAoZxF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-seller",
-  "version": "24.15.0-rc.8",
+  "version": "24.15.0",
   "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-rc.8",
-    "@crystaldesign/products-component": "24.15.0-rc.8",
-    "@crystaldesign/real-time-viewer": "24.15.0-rc.8",
+    "@crystaldesign/analytics": "24.15.0",
+    "@crystaldesign/products-component": "24.15.0",
+    "@crystaldesign/real-time-viewer": "24.15.0",
     "@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": "91c85de436a612b89fe15c5bf9b4f842a1145ab9"
+  "gitHead": "c278d5e4544907ea74555b4eecb863ebab7c1fac"
 }