@crystaldesign/diva-seller 26.12.0-beta.9 → 26.13.0-beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1200,7 +1200,7 @@ function apiLoadEnricherArticles(_x13) {
1200
1200
  }
1201
1201
  function _apiLoadEnricherArticles() {
1202
1202
  _apiLoadEnricherArticles = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee10(_ref9) {
1203
- var serieNo, enricherId, organizationId, enricherUrl, jwt, language, t, fullUrl, response, articleList, i, _jsonArticle$widthBas, _jsonArticle$heightBa, _jsonArticle$depthBas, _jsonArticle$detailIn, _DivaUtils$getLocals, jsonArticle;
1203
+ var serieNo, enricherId, organizationId, enricherUrl, jwt, language, t, fullUrl, response, articleList, i, _jsonArticle$widthBas, _jsonArticle$heightBa, _jsonArticle$depthBas, _jsonArticle$detailIn, _jsonArticle$flatPric, _DivaUtils$getLocals, jsonArticle;
1204
1204
  return _regeneratorRuntime.wrap(function _callee10$(_context10) {
1205
1205
  while (1) switch (_context10.prev = _context10.next) {
1206
1206
  case 0:
@@ -1230,7 +1230,7 @@ function _apiLoadEnricherArticles() {
1230
1230
  guid: jsonArticle.GUID,
1231
1231
  name: DivaUtils.getLocals(jsonArticle.shortText, language),
1232
1232
  longDescription: DivaUtils.getLocals(jsonArticle.fullText, language),
1233
- articleType: jsonArticle.featureClassRefNo === undefined ? 'FLAT' : 'OPTIONTREE',
1233
+ articleType: jsonArticle.flat ? 'FLAT' : 'OPTIONTREE',
1234
1234
  width: jsonArticle.widthBasicShapeNominalValue !== undefined ? Math.floor(((_jsonArticle$widthBas = jsonArticle.widthBasicShapeNominalValue) !== null && _jsonArticle$widthBas !== void 0 ? _jsonArticle$widthBas : 0) / 10) : undefined,
1235
1235
  //idm gives values in mm
1236
1236
  height: jsonArticle.heightBasicShapeNominalValue !== undefined ? Math.floor(((_jsonArticle$heightBa = jsonArticle.heightBasicShapeNominalValue) !== null && _jsonArticle$heightBa !== void 0 ? _jsonArticle$heightBa : 0) / 10) : undefined,
@@ -1241,7 +1241,7 @@ function _apiLoadEnricherArticles() {
1241
1241
  return d.functionType == 'CAT_ART';
1242
1242
  })) === null || _jsonArticle$detailIn === void 0 ? void 0 : _jsonArticle$detailIn.url,
1243
1243
  templateCodex: jsonArticle.featureClassRefNo,
1244
- price: 0,
1244
+ price: jsonArticle.flat ? (_jsonArticle$flatPric = jsonArticle.flatPrice) !== null && _jsonArticle$flatPric !== void 0 ? _jsonArticle$flatPric : 0 : 0,
1245
1245
  priceGroup: jsonArticle.priceTypeRef,
1246
1246
  // a named enricher group replaces the type key label, an unnamed one only reorders the palette
1247
1247
  groupName: (_DivaUtils$getLocals = DivaUtils.getLocals(jsonArticle.groupName, language)) !== null && _DivaUtils$getLocals !== void 0 ? _DivaUtils$getLocals : t('configuration.group.' + jsonArticle.typeKey, jsonArticle.typeKey)
@@ -2579,7 +2579,10 @@ function useSellerStateData(_ref) {
2579
2579
  var getPrintOptions = function getPrintOptions(currentPrintOptions, hasSetImage) {
2580
2580
  var _state$catalogData;
2581
2581
  if (!(configData !== null && configData !== void 0 && configData.reportConfig)) {
2582
- return currentPrintOptions || {};
2582
+ // same reason as below: a basket saved before the flag existed must not stay unmasked
2583
+ return _objectSpread$F(_objectSpread$F({}, currentPrintOptions || {}), {}, {
2584
+ UseMaskFields: true
2585
+ });
2583
2586
  }
2584
2587
  var reportConfig = configData.reportConfig;
2585
2588
  return {
@@ -2599,7 +2602,11 @@ function useSellerStateData(_ref) {
2599
2602
  PrintDate: reportConfig.printWithDate != undefined ? reportConfig.printWithDate : currentPrintOptions === null || currentPrintOptions === void 0 ? void 0 : currentPrintOptions.PrintDate,
2600
2603
  arQrCode: !!((_state$catalogData = state.catalogData) !== null && _state$catalogData !== void 0 && _state$catalogData.every(function (cd) {
2601
2604
  return cd.arReady;
2602
- }) && configData) && (reportConfig.printWithArQrCode || (currentPrintOptions === null || currentPrintOptions === void 0 ? void 0 : currentPrintOptions.printWithArQrCode))
2605
+ }) && configData) && (reportConfig.printWithArQrCode || (currentPrintOptions === null || currentPrintOptions === void 0 ? void 0 : currentPrintOptions.printWithArQrCode)),
2606
+ // the PDF prints the option texts the customer saw, i.e. the mask (enricher) names when a catalog mask renamed them.
2607
+ // Set unconditionally like DivaApiHandler.getPrintOptions does - this object replaces the basket's own print
2608
+ // options, so passing the stored value through would leave every basket saved before the flag existed unmasked.
2609
+ UseMaskFields: true
2603
2610
  };
2604
2611
  };
2605
2612
  var getBasketStatusArr = function getBasketStatusArr() {
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/provider/hooks/useSellerStateData/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../src/provider/hooks/useSellerStateData/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@crystaldesign/diva-seller",
3
- "version": "26.12.0-beta.9",
3
+ "version": "26.13.0-beta.1",
4
4
  "description": "Seller-facing UI section with its own state provider and services.",
5
5
  "scripts": {
6
6
  "test": "echo \"Error: no test specified\" && exit 1"
@@ -29,9 +29,9 @@
29
29
  "react-dom": "^18.3.1"
30
30
  },
31
31
  "dependencies": {
32
- "@crystaldesign/analytics": "26.12.0-beta.9",
33
- "@crystaldesign/products-component": "26.12.0-beta.9",
34
- "@crystaldesign/real-time-viewer": "26.12.0-beta.9",
32
+ "@crystaldesign/analytics": "26.13.0-beta.1",
33
+ "@crystaldesign/products-component": "26.13.0-beta.1",
34
+ "@crystaldesign/real-time-viewer": "26.13.0-beta.1",
35
35
  "@emotion/react": "^11.13.3",
36
36
  "@emotion/styled": "^11.13.0",
37
37
  "@mui/icons-material": "7.3.11",
@@ -42,5 +42,5 @@
42
42
  },
43
43
  "types": "./build/types/seller/src/index.d.ts",
44
44
  "module": "build/esm/index.js",
45
- "gitHead": "62f51ceee2ea71c54b990c666eb7ae864f13d374"
45
+ "gitHead": "b38715cf22885313d39435130631ab8993ac8dc5"
46
46
  }