@crystaldesign/web-planner-logic 24.14.0-beta.9 → 24.14.0-rc.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.
- package/build/cjs/{DivaBoxPlanner-b8c943f9.js → DivaBoxPlanner-4789bc0a.js} +8 -6
- package/build/cjs/{DivaStandardPlanner-d545a524.js → DivaStandardPlanner-dbdb4ba0.js} +4 -4
- package/build/cjs/{DoorPlanner-cbf256ac.js → DoorPlanner-e05bdec4.js} +3 -3
- package/build/cjs/{Host3DSignalR-38042dd4.js → Host3DSignalR-908946a2.js} +10 -11
- package/build/cjs/{LiviqueWWSHandler-5968a440.js → LiviqueWWSHandler-4bad8cba.js} +5 -2
- package/build/cjs/{PfisterWWSHandler-a19fb640.js → PfisterWWSHandler-93d9fb4d.js} +69 -18
- package/build/cjs/{PlannerHandler2D-104c25e8.js → PlannerHandler2D-593db35b.js} +1 -1
- package/build/cjs/{SeriousBasketHandler-afe39b25.js → SeriousBasketHandler-f1feae09.js} +5 -2
- package/build/cjs/{ShelfPlanner-b68a936a.js → ShelfPlanner-47d446eb.js} +3 -3
- package/build/cjs/{StandardWWSHandler-d56e153f.js → StandardWWSHandler-1e7710d3.js} +5 -2
- package/build/cjs/{index-fc73236c.js → index-5f530bbb.js} +1102 -892
- package/build/cjs/index.js +2 -2
- package/build/esm/{DivaBoxPlanner-d5cb2761.js → DivaBoxPlanner-11ab03fc.js} +8 -6
- package/build/esm/{DivaStandardPlanner-7b4a2363.js → DivaStandardPlanner-fcc8d692.js} +4 -4
- package/build/esm/{DoorPlanner-d637db66.js → DoorPlanner-36d5e093.js} +3 -3
- package/build/esm/{Host3DSignalR-cc8579c6.js → Host3DSignalR-9222f4e5.js} +10 -11
- package/build/esm/{LiviqueWWSHandler-36b3f3bf.js → LiviqueWWSHandler-b01ffddd.js} +5 -2
- package/build/esm/{PfisterWWSHandler-55960acc.js → PfisterWWSHandler-327b06c0.js} +69 -18
- package/build/esm/{PlannerHandler2D-c5f068a9.js → PlannerHandler2D-4ca09229.js} +1 -1
- package/build/esm/{SeriousBasketHandler-6c11ee06.js → SeriousBasketHandler-36a1b987.js} +5 -2
- package/build/esm/{ShelfPlanner-ab85b5ea.js → ShelfPlanner-a08089d2.js} +3 -3
- package/build/esm/{StandardWWSHandler-4f44c130.js → StandardWWSHandler-96622950.js} +5 -2
- package/build/esm/{index-21a4713a.js → index-16bf1098.js} +1102 -892
- package/build/esm/index.js +2 -2
- package/build/types/web-planner-logic/src/interface/API/TemplateConfigType.d.ts +1 -1
- package/build/types/web-planner-logic/src/interface/API/TemplateConfigType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/API/ViewConfigDataType.d.ts +4 -7
- package/build/types/web-planner-logic/src/interface/API/ViewConfigDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/Articles/ArticleDataType.d.ts +1 -1
- package/build/types/web-planner-logic/src/interface/Articles/ArticleDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/Articles/CatalogArticleDataType.d.ts +3 -1
- package/build/types/web-planner-logic/src/interface/Articles/CatalogArticleDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/Basket/IDivaWWSHandler.d.ts +1 -0
- package/build/types/web-planner-logic/src/interface/Basket/IDivaWWSHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/Configuration.d.ts +1 -1
- package/build/types/web-planner-logic/src/interface/Configuration.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/CoreTypes/index.d.ts +5 -0
- package/build/types/web-planner-logic/src/interface/CoreTypes/index.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/DivaCatalogDataType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/FunctionTypes/index.d.ts +1 -0
- package/build/types/web-planner-logic/src/interface/FunctionTypes/index.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/interface/OptionTypes/DecisionType.d.ts +1 -0
- package/build/types/web-planner-logic/src/interface/OptionTypes/DecisionType.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/ArticleOptionState.d.ts +2 -1
- package/build/types/web-planner-logic/src/logic/Article/ArticleOptionState.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/DivaArticle.d.ts +9 -5
- package/build/types/web-planner-logic/src/logic/Article/DivaArticle.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Article/DivaArticleHandler.d.ts +0 -3
- package/build/types/web-planner-logic/src/logic/Article/DivaArticleHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Basket/DivaBasketHandler.d.ts +4 -1
- package/build/types/web-planner-logic/src/logic/Basket/DivaBasketHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Basket/LiviqueWWSHandler.d.ts +1 -0
- package/build/types/web-planner-logic/src/logic/Basket/LiviqueWWSHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Basket/PfisterWWSHandler.d.ts +2 -1
- package/build/types/web-planner-logic/src/logic/Basket/PfisterWWSHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Basket/SeriousBasketHandler.d.ts +1 -0
- package/build/types/web-planner-logic/src/logic/Basket/SeriousBasketHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Basket/StandardWWSHandler.d.ts +1 -0
- package/build/types/web-planner-logic/src/logic/Basket/StandardWWSHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/DoorPlanner/DoorPlanner.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/ConfigTree/Shelfplanner/ShelfPlanner.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/DivaApiHandler.d.ts +4 -7
- package/build/types/web-planner-logic/src/logic/DivaApiHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/DivaCatalogHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/DivaWebPlanner.d.ts +8 -3
- package/build/types/web-planner-logic/src/logic/DivaWebPlanner.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/DivaPlannerHandler.d.ts +3 -1
- package/build/types/web-planner-logic/src/logic/Planner/DivaPlannerHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/Host3DSignalR.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/PlannerHandler3D.d.ts +4 -2
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/PlannerHandler3D.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/Rendering.d.ts +2 -0
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/Rendering.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/types.d.ts +35 -6
- package/build/types/web-planner-logic/src/logic/Planner/Rendering/types.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Product/DivaProductHandler.d.ts +26 -2
- package/build/types/web-planner-logic/src/logic/Product/DivaProductHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Set/DivaSet.d.ts +12 -16
- package/build/types/web-planner-logic/src/logic/Set/DivaSet.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/logic/Set/DivaSetHandler.d.ts +6 -11
- package/build/types/web-planner-logic/src/logic/Set/DivaSetHandler.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Articles/CatalogArticleData.d.ts +10 -3
- package/build/types/web-planner-logic/src/model/Articles/CatalogArticleData.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/DivaCatalogData.d.ts +1 -0
- package/build/types/web-planner-logic/src/model/DivaCatalogData.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/model/Options/ArticleOptionValueData.d.ts +1 -1
- package/build/types/web-planner-logic/src/model/Options/ArticleOptionValueData.d.ts.map +1 -1
- package/build/types/web-planner-logic/src/test/datas/environments/testing/pfister-dev.d.ts.map +1 -1
- package/package.json +2 -2
package/build/cjs/index.js
CHANGED
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
Object.defineProperty(exports, '__esModule', { value: true });
|
|
4
4
|
|
|
5
|
-
var index = require('./index-
|
|
5
|
+
var index = require('./index-5f530bbb.js');
|
|
6
|
+
require('@babel/runtime/helpers/slicedToArray');
|
|
6
7
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
7
8
|
require('@babel/runtime/helpers/classCallCheck');
|
|
8
9
|
require('@babel/runtime/helpers/createClass');
|
|
9
10
|
require('@babel/runtime/helpers/defineProperty');
|
|
10
11
|
require('@babel/runtime/regenerator');
|
|
11
12
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
12
|
-
require('@babel/runtime/helpers/slicedToArray');
|
|
13
13
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
14
14
|
require('axios');
|
|
15
15
|
require('@crystaldesign/diva-utils');
|
|
@@ -3,12 +3,12 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
|
3
3
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
4
4
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
5
5
|
import _regeneratorRuntime from '@babel/runtime/regenerator';
|
|
6
|
-
import { V as Vector3, B as BoundingBox } from './index-
|
|
6
|
+
import { V as Vector3, B as BoundingBox } from './index-16bf1098.js';
|
|
7
7
|
import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
|
|
8
8
|
import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
|
|
9
|
-
import { d as dockingPointHandlerInst, P as PlannerElementData, h as handler2D } from './PlannerHandler2D-
|
|
10
|
-
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
9
|
+
import { d as dockingPointHandlerInst, P as PlannerElementData, h as handler2D } from './PlannerHandler2D-4ca09229.js';
|
|
11
10
|
import '@babel/runtime/helpers/slicedToArray';
|
|
11
|
+
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
12
12
|
import 'axios';
|
|
13
13
|
import '@crystaldesign/basket-model';
|
|
14
14
|
import '@crystaldesign/basket-handler';
|
|
@@ -4217,11 +4217,13 @@ var DivaBoxPlanner = /*#__PURE__*/function () {
|
|
|
4217
4217
|
value: function getPlannerElementsInfluencedByDeletion(elementId) {
|
|
4218
4218
|
if (this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
|
|
4219
4219
|
var index = this.boxPlannerGrid.getIndexInGridByElementId(elementId);
|
|
4220
|
-
if (index.row == 0) return [
|
|
4220
|
+
if (index.row == 0) return []; //In the base row only delete the actual element, not the whole row
|
|
4221
4221
|
var result = this.boxPlannerGrid.getAllElementsInSameRowByElementId(elementId);
|
|
4222
|
-
return result.elementIds
|
|
4222
|
+
return result.elementIds.filter(function (eId) {
|
|
4223
|
+
return eId != elementId;
|
|
4224
|
+
});
|
|
4223
4225
|
} else {
|
|
4224
|
-
return [
|
|
4226
|
+
return [];
|
|
4225
4227
|
}
|
|
4226
4228
|
}
|
|
4227
4229
|
/**
|
|
@@ -3,11 +3,11 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
|
3
3
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
4
4
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
5
5
|
import _regeneratorRuntime from '@babel/runtime/regenerator';
|
|
6
|
-
import { V as Vector3, c as Vector2, B as BoundingBox } from './index-
|
|
7
|
-
import { d as dockingPointHandlerInst, h as handler2D, P as PlannerElementData } from './PlannerHandler2D-
|
|
6
|
+
import { V as Vector3, c as Vector2, B as BoundingBox } from './index-16bf1098.js';
|
|
7
|
+
import { d as dockingPointHandlerInst, h as handler2D, P as PlannerElementData } from './PlannerHandler2D-4ca09229.js';
|
|
8
8
|
import DivaUtils, { DivaError, md5 } from '@crystaldesign/diva-utils';
|
|
9
|
-
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
10
9
|
import '@babel/runtime/helpers/slicedToArray';
|
|
10
|
+
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
11
11
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
12
12
|
import 'axios';
|
|
13
13
|
import '@crystaldesign/basket-model';
|
|
@@ -1238,7 +1238,7 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
|
|
|
1238
1238
|
}, {
|
|
1239
1239
|
key: "getPlannerElementsInfluencedByDeletion",
|
|
1240
1240
|
value: function getPlannerElementsInfluencedByDeletion(elementId) {
|
|
1241
|
-
return [
|
|
1241
|
+
return [];
|
|
1242
1242
|
}
|
|
1243
1243
|
}, {
|
|
1244
1244
|
key: "getPlannerElementsInfluencedByCopy",
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
2
2
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
3
3
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
4
|
-
import './index-
|
|
4
|
+
import './index-16bf1098.js';
|
|
5
5
|
import DivaUtils from '@crystaldesign/diva-utils';
|
|
6
|
+
import '@babel/runtime/helpers/slicedToArray';
|
|
6
7
|
import '@babel/runtime/helpers/asyncToGenerator';
|
|
7
8
|
import '@babel/runtime/regenerator';
|
|
8
9
|
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
9
|
-
import '@babel/runtime/helpers/slicedToArray';
|
|
10
10
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
11
11
|
import 'axios';
|
|
12
12
|
import '@crystaldesign/basket-model';
|
|
@@ -100,7 +100,7 @@ var DoorPlanner = /*#__PURE__*/function () {
|
|
|
100
100
|
for (var i = 0; i < data.Doors.length; i++) {
|
|
101
101
|
this.doorsOnArticles[basketId].push(new Door(data.Doors[i], basketId, i));
|
|
102
102
|
}
|
|
103
|
-
if (data.DoShowDoorsOnRule) this.doShowDoorsOnRule[basketId] = DivaUtils.getRuleByFormula(data.DoShowDoorsOnRule);else {
|
|
103
|
+
if (data.DoShowDoorsOnRule) this.doShowDoorsOnRule[basketId] = DivaUtils.getRuleByFormula(data.DoShowDoorsOnRule, article.catalogCodex, article.CatalogData.multiselectOptions);else {
|
|
104
104
|
this.doShowDoorsOnRule[basketId] = 'true';
|
|
105
105
|
}
|
|
106
106
|
}
|
|
@@ -3,13 +3,13 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
|
3
3
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
4
4
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
5
5
|
import _regeneratorRuntime from '@babel/runtime/regenerator';
|
|
6
|
-
import { R as Rendering, H as HQRenderScript } from './index-
|
|
6
|
+
import { R as Rendering, H as HQRenderScript } from './index-16bf1098.js';
|
|
7
7
|
import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
|
|
8
8
|
import { HubConnectionBuilder, LogLevel } from '@microsoft/signalr';
|
|
9
9
|
import io from 'socket.io-client';
|
|
10
10
|
import { MessagePackHubProtocol } from '@microsoft/signalr-protocol-msgpack';
|
|
11
|
-
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
12
11
|
import '@babel/runtime/helpers/slicedToArray';
|
|
12
|
+
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
13
13
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
14
14
|
import 'axios';
|
|
15
15
|
import '@crystaldesign/basket-model';
|
|
@@ -420,7 +420,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
|
|
|
420
420
|
var functionType = '';
|
|
421
421
|
if (params.requestRenderingParams && params.requestRenderingParams.functionType) functionType = params.requestRenderingParams.functionType;
|
|
422
422
|
var articleCodices = '[]';
|
|
423
|
-
if (params !== null && params !== void 0 && params.doRequestRendering && params.requestRenderingParams.articleCodices) {
|
|
423
|
+
if (params !== null && params !== void 0 && params.doRequestRendering && (_params$requestRender18 = params.requestRenderingParams) !== null && _params$requestRender18 !== void 0 && _params$requestRender18.articleCodices) {
|
|
424
424
|
articleCodices = '[';
|
|
425
425
|
for (var i = 0; i < params.requestRenderingParams.articleCodices.length; i++) {
|
|
426
426
|
articleCodices += '"' + params.requestRenderingParams.articleCodices[i] + '"' + (i < params.requestRenderingParams.articleCodices.length - 1 ? ',' : '');
|
|
@@ -430,24 +430,23 @@ var Host3DSignalR = /*#__PURE__*/function () {
|
|
|
430
430
|
var options = {
|
|
431
431
|
rendering: params === null || params === void 0 ? void 0 : params.doRequestRendering,
|
|
432
432
|
hqrenderscript: params.doRequestHqRenderScript,
|
|
433
|
-
VPName: (_params$
|
|
433
|
+
VPName: (_params$requestRender19 = (_params$requestRender20 = params.requestRenderingParams) === null || _params$requestRender20 === void 0 ? void 0 : _params$requestRender20.viewPointName) !== null && _params$requestRender19 !== void 0 ? _params$requestRender19 : '',
|
|
434
434
|
VPSize: size,
|
|
435
435
|
VPFilename: params.renderHash,
|
|
436
436
|
PlanningHash: params.planningHash,
|
|
437
437
|
RenderHash: params.renderHash,
|
|
438
|
-
plannerMeasureDigits: (_params$
|
|
438
|
+
plannerMeasureDigits: (_params$requestRender21 = (_params$requestRender22 = params.requestRenderingParams) === null || _params$requestRender22 === void 0 ? void 0 : _params$requestRender22.plannerMeasureDigits) !== null && _params$requestRender21 !== void 0 ? _params$requestRender21 : 0,
|
|
439
439
|
Format: 'JPG',
|
|
440
440
|
BG: bgMode,
|
|
441
441
|
MSSM: signalRSavingMode,
|
|
442
442
|
OrgId: this.renderSettings.OrganizationId,
|
|
443
443
|
FunctionType: functionType,
|
|
444
|
-
CatalogCodex: (_params$
|
|
445
|
-
CatalogGuid: (_params$
|
|
446
|
-
ArticleCodices: (_params$
|
|
444
|
+
CatalogCodex: (_params$requestRender23 = (_params$requestRender24 = params.requestRenderingParams) === null || _params$requestRender24 === void 0 ? void 0 : _params$requestRender24.catalogData.catalogCodex) !== null && _params$requestRender23 !== void 0 ? _params$requestRender23 : '',
|
|
445
|
+
CatalogGuid: (_params$requestRender25 = (_params$requestRender26 = params.requestRenderingParams) === null || _params$requestRender26 === void 0 ? void 0 : _params$requestRender26.catalogData.catalogGUID) !== null && _params$requestRender25 !== void 0 ? _params$requestRender25 : '',
|
|
446
|
+
ArticleCodices: (_params$requestRender27 = (_params$requestRender28 = params.requestRenderingParams) === null || _params$requestRender28 === void 0 ? void 0 : _params$requestRender28.articleCodices) !== null && _params$requestRender27 !== void 0 ? _params$requestRender27 : [],
|
|
447
447
|
UserSessionId: DivaUtils.SessionId,
|
|
448
|
-
v: (_params$
|
|
449
|
-
|
|
450
|
-
forceUseCam: !!((_params$requestRender31 = params.requestRenderingParams) !== null && _params$requestRender31 !== void 0 && _params$requestRender31.forceUseCam)
|
|
448
|
+
v: (_params$requestRender29 = (_params$requestRender30 = params.requestRenderingParams) === null || _params$requestRender30 === void 0 ? void 0 : _params$requestRender30.catalogData.catalogGUID) !== null && _params$requestRender29 !== void 0 ? _params$requestRender29 : '',
|
|
449
|
+
hybrid3DInfo: (_params$requestRender31 = params.requestRenderingParams) === null || _params$requestRender31 === void 0 ? void 0 : _params$requestRender31.hybrid3DInfo
|
|
451
450
|
};
|
|
452
451
|
return options;
|
|
453
452
|
}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
2
2
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
3
|
-
import './index-
|
|
3
|
+
import './index-16bf1098.js';
|
|
4
|
+
import '@babel/runtime/helpers/slicedToArray';
|
|
4
5
|
import '@babel/runtime/helpers/asyncToGenerator';
|
|
5
6
|
import '@babel/runtime/helpers/defineProperty';
|
|
6
7
|
import '@babel/runtime/regenerator';
|
|
7
8
|
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
8
|
-
import '@babel/runtime/helpers/slicedToArray';
|
|
9
9
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
10
10
|
import 'axios';
|
|
11
11
|
import '@crystaldesign/diva-utils';
|
|
@@ -103,6 +103,9 @@ var LiviqueWWSHandler = /*#__PURE__*/function () {
|
|
|
103
103
|
orderlines: orderlines
|
|
104
104
|
};
|
|
105
105
|
}
|
|
106
|
+
}, {
|
|
107
|
+
key: "getCustomIdsForProductsMatch",
|
|
108
|
+
value: function getCustomIdsForProductsMatch(set) {}
|
|
106
109
|
}]);
|
|
107
110
|
}();
|
|
108
111
|
|
|
@@ -1,13 +1,13 @@
|
|
|
1
1
|
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
2
2
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
3
|
-
import './index-
|
|
3
|
+
import { a as articleHandlerInstance } from './index-16bf1098.js';
|
|
4
4
|
import { SAPOrderLineData } from '@crystaldesign/basket-model';
|
|
5
5
|
import DivaUtils, { DivaError } from '@crystaldesign/diva-utils';
|
|
6
|
+
import '@babel/runtime/helpers/slicedToArray';
|
|
6
7
|
import '@babel/runtime/helpers/asyncToGenerator';
|
|
7
8
|
import '@babel/runtime/helpers/defineProperty';
|
|
8
9
|
import '@babel/runtime/regenerator';
|
|
9
10
|
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
10
|
-
import '@babel/runtime/helpers/slicedToArray';
|
|
11
11
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
12
12
|
import 'axios';
|
|
13
13
|
import '@crystaldesign/basket-handler';
|
|
@@ -90,7 +90,7 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
90
90
|
}
|
|
91
91
|
}, {
|
|
92
92
|
key: "getWWSData",
|
|
93
|
-
value: function getWWSData(basket, set, orderSet, orderlines) {
|
|
93
|
+
value: function getWWSData(basket, set, orderSet, orderlines, ignoreSap) {
|
|
94
94
|
/*SendToSAP Orderlines
|
|
95
95
|
"" - normale Orderline - generiert keine SAP Orderline
|
|
96
96
|
"0" - Grundelemente bei Jutzler sind Hülsenartikel und dürfen nicht explizit als SAPOrderLine generiert werden, da diese über Optionsbaum definiert werden
|
|
@@ -142,11 +142,28 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
142
142
|
// }
|
|
143
143
|
|
|
144
144
|
//jetzt alle Orderlines analysieren und schauen, ob es SAP Orderline gibt
|
|
145
|
+
|
|
146
|
+
if (orderSet.SetArticleNr && orderSet.SetArticleNrPrefix == 'SAP' && !ignoreSap) {
|
|
147
|
+
sapOrderlines.push(new SAPOrderLineData(orderSet.SetID, orderSet.SetArticleNr, orderSet.SetArticleNrPrefix, DivaUtils.stripTags(orderlines.map(function (ol) {
|
|
148
|
+
return ol.Name;
|
|
149
|
+
}).join(', ')), '1', orderSet.SetPrice, 1, false, orderlines.map(function (ol) {
|
|
150
|
+
return ol.BasketID;
|
|
151
|
+
})));
|
|
152
|
+
return {
|
|
153
|
+
SAPOrderLines: sapOrderlines,
|
|
154
|
+
orderlines: orderlines
|
|
155
|
+
};
|
|
156
|
+
}
|
|
145
157
|
for (var j = 0; j < orderlines.length; j++) {
|
|
158
|
+
var _orderLineItem$VKPric, _orderLineItem$VKPric2;
|
|
146
159
|
var orderLineItem = orderlines[j];
|
|
147
160
|
var found = -1;
|
|
148
|
-
var
|
|
149
|
-
var
|
|
161
|
+
var article = articles[orderLineItem.BasketID];
|
|
162
|
+
var orderLinePrice = (_orderLineItem$VKPric = (_orderLineItem$VKPric2 = orderLineItem.VKPrice) === null || _orderLineItem$VKPric2 === void 0 ? void 0 : _orderLineItem$VKPric2.BruttoPrice) !== null && _orderLineItem$VKPric !== void 0 ? _orderLineItem$VKPric : orderLineItem.Price;
|
|
163
|
+
if (orderLineItem.HasPartlistArticle) {
|
|
164
|
+
var _article$mainBruttoPr;
|
|
165
|
+
orderLinePrice = (_article$mainBruttoPr = article.mainBruttoPrice) !== null && _article$mainBruttoPr !== void 0 ? _article$mainBruttoPr : article.mainPrice;
|
|
166
|
+
}
|
|
150
167
|
if (orderLineItem.IsPartlistArticle && orderSet.CatalogCodex != 'ATLANTIS_2019') {
|
|
151
168
|
hasPartListArticles = true;
|
|
152
169
|
}
|
|
@@ -155,7 +172,7 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
155
172
|
//SendTo SAP über Optionsbaum "1" oder explizit beim Artikel "2" (wird z.B. bei Hoppekits)
|
|
156
173
|
//if (debugPlArticleHandler) debug("AddOrderAndSAPline: " + this.Name + " SendToSAP:" + this.SendToSAP);
|
|
157
174
|
|
|
158
|
-
if ((!orderLineItem.HasPartlistArticle || !!
|
|
175
|
+
if ((!orderLineItem.HasPartlistArticle || !!orderLinePrice) && !orderLineItem.NoPrice) {
|
|
159
176
|
//bei Partlist Hauptartikel welche keinen Preis haben, diese nicht in die SAP Orderline geben
|
|
160
177
|
|
|
161
178
|
if (orderLineItem.SendToSAP && orderLineItem.SendToSAP != '') {
|
|
@@ -165,21 +182,22 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
165
182
|
hasSapOrderline = true;
|
|
166
183
|
for (var i = 0; i < sapOrderlines.length; i++) {
|
|
167
184
|
//jedes anzeigen
|
|
168
|
-
if (orderLineItem.SetID == sapOrderlines[i].SetID && orderLineItem.ConfigArticleCodex == sapOrderlines[i].ArticleNr && (orderLineItem.Name == sapOrderlines[i].Name &&
|
|
185
|
+
if (orderLineItem.SetID == sapOrderlines[i].SetID && orderLineItem.ConfigArticleCodex == sapOrderlines[i].ArticleNr && (orderLineItem.Name == sapOrderlines[i].Name && orderLinePrice == sapOrderlines[i].Price || orderLineItem.SendToSAP != '3')) {
|
|
169
186
|
found = i;
|
|
170
187
|
}
|
|
171
188
|
}
|
|
172
189
|
if (found == -1) {
|
|
173
190
|
var _articleNrPrefix = orderLineItem.SendToSAP == '3' ? 'ZKAT' : 'SAP';
|
|
174
191
|
mySapPosNr++;
|
|
175
|
-
var newSapOrderLine = new SAPOrderLineData(orderLineItem.SetID, orderLineItem.ConfigArticleCodex ? orderLineItem.ConfigArticleCodex : orderLineItem.ArticleCodex, _articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(
|
|
192
|
+
var newSapOrderLine = new SAPOrderLineData(orderLineItem.SetID, orderLineItem.ConfigArticleCodex ? orderLineItem.ConfigArticleCodex : orderLineItem.ArticleCodex, _articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(orderLinePrice * (_articleNrPrefix == 'ZKAT' ? orderLineItem.Quantity : 1)),
|
|
176
193
|
//bei zakt nummern die quantity nicht in die saporderlines schrieben da diese aus oder
|
|
177
194
|
//Orderlines in den EK Text übernommen werden und so die quantity bereits als info übernommen wurde
|
|
178
|
-
_articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, false);
|
|
195
|
+
_articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, false, [orderLineItem.BasketID]);
|
|
179
196
|
sapOrderlines.push(newSapOrderLine);
|
|
180
197
|
} else {
|
|
181
|
-
if (
|
|
198
|
+
if (orderLinePrice != 0 && orderLinePrice != undefined || orderLineItem.RelatedToSubItem != 'OPTAUFDOPP') {
|
|
182
199
|
sapOrderlines[found].addQuantity(orderLineItem.Quantity);
|
|
200
|
+
sapOrderlines[found].basketIds.push(orderLineItem.BasketID);
|
|
183
201
|
}
|
|
184
202
|
}
|
|
185
203
|
}
|
|
@@ -204,28 +222,29 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
204
222
|
for (var i = 0; i < blindSAPOrderLines.length; i++) {
|
|
205
223
|
//jedes anzeigen
|
|
206
224
|
if (orderLineItem.SetID == blindSAPOrderLines[i].SetID && orderLineItem.RetailArticleNr == blindSAPOrderLines[i].ArticleNr) {
|
|
207
|
-
|
|
225
|
+
found = i;
|
|
208
226
|
}
|
|
209
227
|
}
|
|
210
228
|
if (orderLineItem.RetailArticleNr == undefined) {
|
|
211
229
|
LOG.debug('Fehler beim speichern! RetailArticleNr ist nicht definiert', 'WC_0008');
|
|
212
230
|
}
|
|
213
|
-
if (
|
|
231
|
+
if (found == -1) {
|
|
214
232
|
mySapPosNr++;
|
|
215
|
-
var newSapOrderLine = new SAPOrderLineData(orderLineItem.SetID, orderLineItem.RetailArticleNr, articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(
|
|
233
|
+
var newSapOrderLine = new SAPOrderLineData(orderLineItem.SetID, orderLineItem.RetailArticleNr, articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(orderLinePrice * (articleNrPrefix == 'ZKAT' ? orderLineItem.Quantity : 1)),
|
|
216
234
|
//bei zakt nummern die quantity nicht in die saporderlines schrieben da diese aus oder
|
|
217
235
|
//Orderlines in den EK Text übernommen werden und so die quantity bereits als info übernommen wurde
|
|
218
|
-
articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, useSAPArticleNumberInEKText);
|
|
236
|
+
articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, useSAPArticleNumberInEKText, [orderLineItem.BasketID]);
|
|
219
237
|
blindSAPOrderLines.push(newSapOrderLine);
|
|
220
238
|
} else {
|
|
221
239
|
if (!orderLineItem.ArticlePlaceholder) {
|
|
222
240
|
if (articleNrPrefix == 'SAP') {
|
|
223
|
-
if (
|
|
224
|
-
blindSAPOrderLines[
|
|
241
|
+
if (orderLinePrice != 0 && orderLinePrice != undefined || orderLineItem.RelatedToSubItem != 'OPTAUFDOPP') {
|
|
242
|
+
blindSAPOrderLines[found].Quantity += orderLineItem.Quantity;
|
|
225
243
|
}
|
|
226
244
|
} else {
|
|
227
|
-
if (
|
|
245
|
+
if (orderLinePrice != 0 && orderLinePrice != undefined) blindSAPOrderLines[found].Price += Math.round(orderLinePrice * orderLineItem.Quantity);
|
|
228
246
|
}
|
|
247
|
+
blindSAPOrderLines[found].basketIds.push(orderLineItem.BasketID);
|
|
229
248
|
}
|
|
230
249
|
}
|
|
231
250
|
for (var i = 0; i < orderlines.length; i++) {
|
|
@@ -245,17 +264,49 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
245
264
|
//z.B. Hasena wir über diese Methodic in die SAPOrderline geschalten
|
|
246
265
|
if (sapOrderlines.length == 0 && orderSet.SetArticleNr && blindSAPOrderLines.length == 0) {
|
|
247
266
|
// wenn keine SapOrderline generiert wurde und wenn aktuelles Set eine ZKAT Nummer hat
|
|
248
|
-
var newSapOrderLine = new SAPOrderLineData(orderSet.SetID, orderSet.SetArticleNr, orderSet.SetArticleNrPrefix, '', '1', Math.round(orderSet.SetPrice), orderSet.SetQuantity, false)
|
|
267
|
+
var newSapOrderLine = new SAPOrderLineData(orderSet.SetID, orderSet.SetArticleNr, orderSet.SetArticleNrPrefix, '', '1', Math.round(orderSet.SetPrice), orderSet.SetQuantity, false, orderlines.map(function (ol) {
|
|
268
|
+
return ol.BasketID;
|
|
269
|
+
}));
|
|
249
270
|
sapOrderlines.push(newSapOrderLine);
|
|
250
271
|
} else {
|
|
251
272
|
sapOrderlines = sapOrderlines.concat(blindSAPOrderLines);
|
|
252
273
|
}
|
|
253
274
|
}
|
|
275
|
+
if (orderSet.BruttoSetPrice) orderSet.SetPrice = orderSet.BruttoSetPrice;
|
|
254
276
|
return {
|
|
255
277
|
SAPOrderLines: sapOrderlines,
|
|
256
278
|
orderlines: orderlines
|
|
257
279
|
};
|
|
258
280
|
}
|
|
281
|
+
}, {
|
|
282
|
+
key: "getCustomIdsForProductsMatch",
|
|
283
|
+
value: function getCustomIdsForProductsMatch(set) {
|
|
284
|
+
var _set$basketConfigVari;
|
|
285
|
+
var articles = set.getDivaArticles();
|
|
286
|
+
var ols = articleHandlerInstance.getOrderLinesOfArticles(articles, false, !!((_set$basketConfigVari = set.basketConfigVariants) !== null && _set$basketConfigVari !== void 0 && _set$basketConfigVari.length));
|
|
287
|
+
if (!(ols !== null && ols !== void 0 && ols.length)) return [];
|
|
288
|
+
var orderlines = this.repairWWSFlags(articles, ols);
|
|
289
|
+
var _ref = this.getWWSData({}, set, {
|
|
290
|
+
SetQuantity: 1,
|
|
291
|
+
SetPrice: set.getSetPrice(),
|
|
292
|
+
SetID: set.getSetId(),
|
|
293
|
+
CatalogCodex: set.getCatalogCodex(),
|
|
294
|
+
SetArticleNr: set.SetArticleNr ? set.SetArticleNr : set.CatalogData.retailArticleNr,
|
|
295
|
+
SetArticleNrPrefix: set.SetArticleNrPrefix
|
|
296
|
+
}, orderlines, true),
|
|
297
|
+
SAPOrderLines = _ref.SAPOrderLines;
|
|
298
|
+
return {
|
|
299
|
+
customProductNrsPair: SAPOrderLines.filter(function (sapOl) {
|
|
300
|
+
return sapOl.ArticleNrPrefix === 'ZKAT';
|
|
301
|
+
}).map(function (sapOl) {
|
|
302
|
+
return {
|
|
303
|
+
customProductNrs: sapOl.ArticleNr,
|
|
304
|
+
basketIds: sapOl.basketIds
|
|
305
|
+
};
|
|
306
|
+
}),
|
|
307
|
+
matchPrefix: 'SAP'
|
|
308
|
+
};
|
|
309
|
+
}
|
|
259
310
|
}]);
|
|
260
311
|
}();
|
|
261
312
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
2
2
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
3
3
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
4
|
-
import { V as Vector3, c as Vector2, D as DockingPoint } from './index-
|
|
4
|
+
import { V as Vector3, c as Vector2, D as DockingPoint } from './index-16bf1098.js';
|
|
5
5
|
import DivaUtils, { md5, DivaError } from '@crystaldesign/diva-utils';
|
|
6
6
|
import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
|
|
7
7
|
import _regeneratorRuntime from '@babel/runtime/regenerator';
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
2
2
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
3
3
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
4
|
-
import { s as summaryHandlerInstance } from './index-
|
|
4
|
+
import { s as summaryHandlerInstance } from './index-16bf1098.js';
|
|
5
5
|
import DivaUtils from '@crystaldesign/diva-utils';
|
|
6
|
+
import '@babel/runtime/helpers/slicedToArray';
|
|
6
7
|
import '@babel/runtime/helpers/asyncToGenerator';
|
|
7
8
|
import '@babel/runtime/regenerator';
|
|
8
9
|
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
9
|
-
import '@babel/runtime/helpers/slicedToArray';
|
|
10
10
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
11
11
|
import 'axios';
|
|
12
12
|
import '@crystaldesign/basket-model';
|
|
@@ -311,6 +311,9 @@ var StandardWWSHandler = /*#__PURE__*/function () {
|
|
|
311
311
|
}
|
|
312
312
|
return formattedOptions;
|
|
313
313
|
}
|
|
314
|
+
}, {
|
|
315
|
+
key: "getCustomIdsForProductsMatch",
|
|
316
|
+
value: function getCustomIdsForProductsMatch(set) {}
|
|
314
317
|
}]);
|
|
315
318
|
}();
|
|
316
319
|
|
|
@@ -4,10 +4,10 @@ import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
|
4
4
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
5
5
|
import _defineProperty from '@babel/runtime/helpers/defineProperty';
|
|
6
6
|
import _regeneratorRuntime from '@babel/runtime/regenerator';
|
|
7
|
-
import { G as Grid,
|
|
7
|
+
import { G as Grid, b as setHandlerInstance, a as articleHandlerInstance } from './index-16bf1098.js';
|
|
8
8
|
import DivaUtils from '@crystaldesign/diva-utils';
|
|
9
|
-
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
10
9
|
import '@babel/runtime/helpers/slicedToArray';
|
|
10
|
+
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
11
11
|
import 'axios';
|
|
12
12
|
import '@crystaldesign/basket-model';
|
|
13
13
|
import '@crystaldesign/basket-handler';
|
|
@@ -45,7 +45,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
|
|
|
45
45
|
this.disableCellsByElement = data.DisableCells;
|
|
46
46
|
this.data = data;
|
|
47
47
|
this.showAfterOPT = data.ShowAfterOPT;
|
|
48
|
-
this.showOnRule = data.ShowOnRule ? DivaUtils.getRuleByFormula(data.ShowOnRule) : undefined;
|
|
48
|
+
this.showOnRule = data.ShowOnRule ? DivaUtils.getRuleByFormula(data.ShowOnRule, article.catalogCodex, article.CatalogData.multiselectOptions) : undefined;
|
|
49
49
|
this.gridAllowedOnCells = data.GridAllowedOnCells;
|
|
50
50
|
this.gridAllowedOntoArticles = data.GridAllowedOntoArticles;
|
|
51
51
|
this.takePlaceOnOtherGrids = data.TakePlaceOnOtherGrids;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import _classCallCheck from '@babel/runtime/helpers/classCallCheck';
|
|
2
2
|
import _createClass from '@babel/runtime/helpers/createClass';
|
|
3
|
-
import './index-
|
|
3
|
+
import './index-16bf1098.js';
|
|
4
|
+
import '@babel/runtime/helpers/slicedToArray';
|
|
4
5
|
import '@babel/runtime/helpers/asyncToGenerator';
|
|
5
6
|
import '@babel/runtime/helpers/defineProperty';
|
|
6
7
|
import '@babel/runtime/regenerator';
|
|
7
8
|
import '@babel/runtime/helpers/objectWithoutProperties';
|
|
8
|
-
import '@babel/runtime/helpers/slicedToArray';
|
|
9
9
|
import '@babel/runtime/helpers/toConsumableArray';
|
|
10
10
|
import 'axios';
|
|
11
11
|
import '@crystaldesign/diva-utils';
|
|
@@ -38,6 +38,9 @@ var StandardWWSHandler = /*#__PURE__*/function () {
|
|
|
38
38
|
orderlines: orderlines
|
|
39
39
|
};
|
|
40
40
|
}
|
|
41
|
+
}, {
|
|
42
|
+
key: "getCustomIdsForProductsMatch",
|
|
43
|
+
value: function getCustomIdsForProductsMatch(set) {}
|
|
41
44
|
}]);
|
|
42
45
|
}();
|
|
43
46
|
|