@crystaldesign/web-planner-logic 24.14.0-beta.9 → 24.14.0-rc.0
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
|
@@ -5,12 +5,12 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
8
|
+
var index = require('./index-5f530bbb.js');
|
|
9
9
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
10
10
|
var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
|
|
11
|
-
var PlannerHandler2D = require('./PlannerHandler2D-
|
|
12
|
-
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
11
|
+
var PlannerHandler2D = require('./PlannerHandler2D-593db35b.js');
|
|
13
12
|
require('@babel/runtime/helpers/slicedToArray');
|
|
13
|
+
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
14
14
|
require('axios');
|
|
15
15
|
require('@crystaldesign/basket-model');
|
|
16
16
|
require('@crystaldesign/basket-handler');
|
|
@@ -4229,11 +4229,13 @@ var DivaBoxPlanner = /*#__PURE__*/function () {
|
|
|
4229
4229
|
value: function getPlannerElementsInfluencedByDeletion(elementId) {
|
|
4230
4230
|
if (this.constructionRulesHandler.getForceWholePlanningSameHeight()) {
|
|
4231
4231
|
var index = this.boxPlannerGrid.getIndexInGridByElementId(elementId);
|
|
4232
|
-
if (index.row == 0) return [
|
|
4232
|
+
if (index.row == 0) return []; //In the base row only delete the actual element, not the whole row
|
|
4233
4233
|
var result = this.boxPlannerGrid.getAllElementsInSameRowByElementId(elementId);
|
|
4234
|
-
return result.elementIds
|
|
4234
|
+
return result.elementIds.filter(function (eId) {
|
|
4235
|
+
return eId != elementId;
|
|
4236
|
+
});
|
|
4235
4237
|
} else {
|
|
4236
|
-
return [
|
|
4238
|
+
return [];
|
|
4237
4239
|
}
|
|
4238
4240
|
}
|
|
4239
4241
|
/**
|
|
@@ -5,11 +5,11 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
9
|
-
var PlannerHandler2D = require('./PlannerHandler2D-
|
|
8
|
+
var index = require('./index-5f530bbb.js');
|
|
9
|
+
var PlannerHandler2D = require('./PlannerHandler2D-593db35b.js');
|
|
10
10
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
11
|
-
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
12
11
|
require('@babel/runtime/helpers/slicedToArray');
|
|
12
|
+
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
13
13
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
14
14
|
require('axios');
|
|
15
15
|
require('@crystaldesign/basket-model');
|
|
@@ -1249,7 +1249,7 @@ var DivaStandardPlanner = /*#__PURE__*/function () {
|
|
|
1249
1249
|
}, {
|
|
1250
1250
|
key: "getPlannerElementsInfluencedByDeletion",
|
|
1251
1251
|
value: function getPlannerElementsInfluencedByDeletion(elementId) {
|
|
1252
|
-
return [
|
|
1252
|
+
return [];
|
|
1253
1253
|
}
|
|
1254
1254
|
}, {
|
|
1255
1255
|
key: "getPlannerElementsInfluencedByCopy",
|
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
|
-
require('./index-
|
|
6
|
+
require('./index-5f530bbb.js');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
|
+
require('@babel/runtime/helpers/slicedToArray');
|
|
8
9
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
9
10
|
require('@babel/runtime/regenerator');
|
|
10
11
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
11
|
-
require('@babel/runtime/helpers/slicedToArray');
|
|
12
12
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
13
13
|
require('axios');
|
|
14
14
|
require('@crystaldesign/basket-model');
|
|
@@ -109,7 +109,7 @@ var DoorPlanner = /*#__PURE__*/function () {
|
|
|
109
109
|
for (var i = 0; i < data.Doors.length; i++) {
|
|
110
110
|
this.doorsOnArticles[basketId].push(new Door(data.Doors[i], basketId, i));
|
|
111
111
|
}
|
|
112
|
-
if (data.DoShowDoorsOnRule) this.doShowDoorsOnRule[basketId] = DivaUtils__default["default"].getRuleByFormula(data.DoShowDoorsOnRule);else {
|
|
112
|
+
if (data.DoShowDoorsOnRule) this.doShowDoorsOnRule[basketId] = DivaUtils__default["default"].getRuleByFormula(data.DoShowDoorsOnRule, article.catalogCodex, article.CatalogData.multiselectOptions);else {
|
|
113
113
|
this.doShowDoorsOnRule[basketId] = 'true';
|
|
114
114
|
}
|
|
115
115
|
}
|
|
@@ -5,13 +5,13 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
5
5
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
6
6
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
7
7
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
8
|
-
var index = require('./index-
|
|
8
|
+
var index = require('./index-5f530bbb.js');
|
|
9
9
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
10
10
|
var signalr = require('@microsoft/signalr');
|
|
11
11
|
var io = require('socket.io-client');
|
|
12
12
|
var signalrProtocolMsgpack = require('@microsoft/signalr-protocol-msgpack');
|
|
13
|
-
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
14
13
|
require('@babel/runtime/helpers/slicedToArray');
|
|
14
|
+
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
15
15
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
16
16
|
require('axios');
|
|
17
17
|
require('@crystaldesign/basket-model');
|
|
@@ -432,7 +432,7 @@ var Host3DSignalR = /*#__PURE__*/function () {
|
|
|
432
432
|
var functionType = '';
|
|
433
433
|
if (params.requestRenderingParams && params.requestRenderingParams.functionType) functionType = params.requestRenderingParams.functionType;
|
|
434
434
|
var articleCodices = '[]';
|
|
435
|
-
if (params !== null && params !== void 0 && params.doRequestRendering && params.requestRenderingParams.articleCodices) {
|
|
435
|
+
if (params !== null && params !== void 0 && params.doRequestRendering && (_params$requestRender18 = params.requestRenderingParams) !== null && _params$requestRender18 !== void 0 && _params$requestRender18.articleCodices) {
|
|
436
436
|
articleCodices = '[';
|
|
437
437
|
for (var i = 0; i < params.requestRenderingParams.articleCodices.length; i++) {
|
|
438
438
|
articleCodices += '"' + params.requestRenderingParams.articleCodices[i] + '"' + (i < params.requestRenderingParams.articleCodices.length - 1 ? ',' : '');
|
|
@@ -442,24 +442,23 @@ var Host3DSignalR = /*#__PURE__*/function () {
|
|
|
442
442
|
var options = {
|
|
443
443
|
rendering: params === null || params === void 0 ? void 0 : params.doRequestRendering,
|
|
444
444
|
hqrenderscript: params.doRequestHqRenderScript,
|
|
445
|
-
VPName: (_params$
|
|
445
|
+
VPName: (_params$requestRender19 = (_params$requestRender20 = params.requestRenderingParams) === null || _params$requestRender20 === void 0 ? void 0 : _params$requestRender20.viewPointName) !== null && _params$requestRender19 !== void 0 ? _params$requestRender19 : '',
|
|
446
446
|
VPSize: size,
|
|
447
447
|
VPFilename: params.renderHash,
|
|
448
448
|
PlanningHash: params.planningHash,
|
|
449
449
|
RenderHash: params.renderHash,
|
|
450
|
-
plannerMeasureDigits: (_params$
|
|
450
|
+
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,
|
|
451
451
|
Format: 'JPG',
|
|
452
452
|
BG: bgMode,
|
|
453
453
|
MSSM: signalRSavingMode,
|
|
454
454
|
OrgId: this.renderSettings.OrganizationId,
|
|
455
455
|
FunctionType: functionType,
|
|
456
|
-
CatalogCodex: (_params$
|
|
457
|
-
CatalogGuid: (_params$
|
|
458
|
-
ArticleCodices: (_params$
|
|
456
|
+
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 : '',
|
|
457
|
+
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 : '',
|
|
458
|
+
ArticleCodices: (_params$requestRender27 = (_params$requestRender28 = params.requestRenderingParams) === null || _params$requestRender28 === void 0 ? void 0 : _params$requestRender28.articleCodices) !== null && _params$requestRender27 !== void 0 ? _params$requestRender27 : [],
|
|
459
459
|
UserSessionId: DivaUtils__default["default"].SessionId,
|
|
460
|
-
v: (_params$
|
|
461
|
-
|
|
462
|
-
forceUseCam: !!((_params$requestRender31 = params.requestRenderingParams) !== null && _params$requestRender31 !== void 0 && _params$requestRender31.forceUseCam)
|
|
460
|
+
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 : '',
|
|
461
|
+
hybrid3DInfo: (_params$requestRender31 = params.requestRenderingParams) === null || _params$requestRender31 === void 0 ? void 0 : _params$requestRender31.hybrid3DInfo
|
|
463
462
|
};
|
|
464
463
|
return options;
|
|
465
464
|
}
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
|
-
require('./index-
|
|
5
|
+
require('./index-5f530bbb.js');
|
|
6
|
+
require('@babel/runtime/helpers/slicedToArray');
|
|
6
7
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
7
8
|
require('@babel/runtime/helpers/defineProperty');
|
|
8
9
|
require('@babel/runtime/regenerator');
|
|
9
10
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
10
|
-
require('@babel/runtime/helpers/slicedToArray');
|
|
11
11
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
12
12
|
require('axios');
|
|
13
13
|
require('@crystaldesign/diva-utils');
|
|
@@ -110,6 +110,9 @@ var LiviqueWWSHandler = /*#__PURE__*/function () {
|
|
|
110
110
|
orderlines: orderlines
|
|
111
111
|
};
|
|
112
112
|
}
|
|
113
|
+
}, {
|
|
114
|
+
key: "getCustomIdsForProductsMatch",
|
|
115
|
+
value: function getCustomIdsForProductsMatch(set) {}
|
|
113
116
|
}]);
|
|
114
117
|
}();
|
|
115
118
|
|
|
@@ -2,14 +2,14 @@
|
|
|
2
2
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
|
-
require('./index-
|
|
5
|
+
var index = require('./index-5f530bbb.js');
|
|
6
6
|
var basketModel = require('@crystaldesign/basket-model');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
|
+
require('@babel/runtime/helpers/slicedToArray');
|
|
8
9
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
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/basket-handler');
|
|
@@ -98,7 +98,7 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
98
98
|
}
|
|
99
99
|
}, {
|
|
100
100
|
key: "getWWSData",
|
|
101
|
-
value: function getWWSData(basket, set, orderSet, orderlines) {
|
|
101
|
+
value: function getWWSData(basket, set, orderSet, orderlines, ignoreSap) {
|
|
102
102
|
/*SendToSAP Orderlines
|
|
103
103
|
"" - normale Orderline - generiert keine SAP Orderline
|
|
104
104
|
"0" - Grundelemente bei Jutzler sind Hülsenartikel und dürfen nicht explizit als SAPOrderLine generiert werden, da diese über Optionsbaum definiert werden
|
|
@@ -150,11 +150,28 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
150
150
|
// }
|
|
151
151
|
|
|
152
152
|
//jetzt alle Orderlines analysieren und schauen, ob es SAP Orderline gibt
|
|
153
|
+
|
|
154
|
+
if (orderSet.SetArticleNr && orderSet.SetArticleNrPrefix == 'SAP' && !ignoreSap) {
|
|
155
|
+
sapOrderlines.push(new basketModel.SAPOrderLineData(orderSet.SetID, orderSet.SetArticleNr, orderSet.SetArticleNrPrefix, DivaUtils__default["default"].stripTags(orderlines.map(function (ol) {
|
|
156
|
+
return ol.Name;
|
|
157
|
+
}).join(', ')), '1', orderSet.SetPrice, 1, false, orderlines.map(function (ol) {
|
|
158
|
+
return ol.BasketID;
|
|
159
|
+
})));
|
|
160
|
+
return {
|
|
161
|
+
SAPOrderLines: sapOrderlines,
|
|
162
|
+
orderlines: orderlines
|
|
163
|
+
};
|
|
164
|
+
}
|
|
153
165
|
for (var j = 0; j < orderlines.length; j++) {
|
|
166
|
+
var _orderLineItem$VKPric, _orderLineItem$VKPric2;
|
|
154
167
|
var orderLineItem = orderlines[j];
|
|
155
168
|
var found = -1;
|
|
156
|
-
var
|
|
157
|
-
var
|
|
169
|
+
var article = articles[orderLineItem.BasketID];
|
|
170
|
+
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;
|
|
171
|
+
if (orderLineItem.HasPartlistArticle) {
|
|
172
|
+
var _article$mainBruttoPr;
|
|
173
|
+
orderLinePrice = (_article$mainBruttoPr = article.mainBruttoPrice) !== null && _article$mainBruttoPr !== void 0 ? _article$mainBruttoPr : article.mainPrice;
|
|
174
|
+
}
|
|
158
175
|
if (orderLineItem.IsPartlistArticle && orderSet.CatalogCodex != 'ATLANTIS_2019') {
|
|
159
176
|
hasPartListArticles = true;
|
|
160
177
|
}
|
|
@@ -163,7 +180,7 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
163
180
|
//SendTo SAP über Optionsbaum "1" oder explizit beim Artikel "2" (wird z.B. bei Hoppekits)
|
|
164
181
|
//if (debugPlArticleHandler) debug("AddOrderAndSAPline: " + this.Name + " SendToSAP:" + this.SendToSAP);
|
|
165
182
|
|
|
166
|
-
if ((!orderLineItem.HasPartlistArticle || !!
|
|
183
|
+
if ((!orderLineItem.HasPartlistArticle || !!orderLinePrice) && !orderLineItem.NoPrice) {
|
|
167
184
|
//bei Partlist Hauptartikel welche keinen Preis haben, diese nicht in die SAP Orderline geben
|
|
168
185
|
|
|
169
186
|
if (orderLineItem.SendToSAP && orderLineItem.SendToSAP != '') {
|
|
@@ -173,21 +190,22 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
173
190
|
hasSapOrderline = true;
|
|
174
191
|
for (var i = 0; i < sapOrderlines.length; i++) {
|
|
175
192
|
//jedes anzeigen
|
|
176
|
-
if (orderLineItem.SetID == sapOrderlines[i].SetID && orderLineItem.ConfigArticleCodex == sapOrderlines[i].ArticleNr && (orderLineItem.Name == sapOrderlines[i].Name &&
|
|
193
|
+
if (orderLineItem.SetID == sapOrderlines[i].SetID && orderLineItem.ConfigArticleCodex == sapOrderlines[i].ArticleNr && (orderLineItem.Name == sapOrderlines[i].Name && orderLinePrice == sapOrderlines[i].Price || orderLineItem.SendToSAP != '3')) {
|
|
177
194
|
found = i;
|
|
178
195
|
}
|
|
179
196
|
}
|
|
180
197
|
if (found == -1) {
|
|
181
198
|
var _articleNrPrefix = orderLineItem.SendToSAP == '3' ? 'ZKAT' : 'SAP';
|
|
182
199
|
mySapPosNr++;
|
|
183
|
-
var newSapOrderLine = new basketModel.SAPOrderLineData(orderLineItem.SetID, orderLineItem.ConfigArticleCodex ? orderLineItem.ConfigArticleCodex : orderLineItem.ArticleCodex, _articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(
|
|
200
|
+
var newSapOrderLine = new basketModel.SAPOrderLineData(orderLineItem.SetID, orderLineItem.ConfigArticleCodex ? orderLineItem.ConfigArticleCodex : orderLineItem.ArticleCodex, _articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(orderLinePrice * (_articleNrPrefix == 'ZKAT' ? orderLineItem.Quantity : 1)),
|
|
184
201
|
//bei zakt nummern die quantity nicht in die saporderlines schrieben da diese aus oder
|
|
185
202
|
//Orderlines in den EK Text übernommen werden und so die quantity bereits als info übernommen wurde
|
|
186
|
-
_articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, false);
|
|
203
|
+
_articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, false, [orderLineItem.BasketID]);
|
|
187
204
|
sapOrderlines.push(newSapOrderLine);
|
|
188
205
|
} else {
|
|
189
|
-
if (
|
|
206
|
+
if (orderLinePrice != 0 && orderLinePrice != undefined || orderLineItem.RelatedToSubItem != 'OPTAUFDOPP') {
|
|
190
207
|
sapOrderlines[found].addQuantity(orderLineItem.Quantity);
|
|
208
|
+
sapOrderlines[found].basketIds.push(orderLineItem.BasketID);
|
|
191
209
|
}
|
|
192
210
|
}
|
|
193
211
|
}
|
|
@@ -212,28 +230,29 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
212
230
|
for (var i = 0; i < blindSAPOrderLines.length; i++) {
|
|
213
231
|
//jedes anzeigen
|
|
214
232
|
if (orderLineItem.SetID == blindSAPOrderLines[i].SetID && orderLineItem.RetailArticleNr == blindSAPOrderLines[i].ArticleNr) {
|
|
215
|
-
|
|
233
|
+
found = i;
|
|
216
234
|
}
|
|
217
235
|
}
|
|
218
236
|
if (orderLineItem.RetailArticleNr == undefined) {
|
|
219
237
|
LOG.debug('Fehler beim speichern! RetailArticleNr ist nicht definiert', 'WC_0008');
|
|
220
238
|
}
|
|
221
|
-
if (
|
|
239
|
+
if (found == -1) {
|
|
222
240
|
mySapPosNr++;
|
|
223
|
-
var newSapOrderLine = new basketModel.SAPOrderLineData(orderLineItem.SetID, orderLineItem.RetailArticleNr, articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(
|
|
241
|
+
var newSapOrderLine = new basketModel.SAPOrderLineData(orderLineItem.SetID, orderLineItem.RetailArticleNr, articleNrPrefix, orderLineItem.Name, mySapPosNr.toString(), Math.round(orderLinePrice * (articleNrPrefix == 'ZKAT' ? orderLineItem.Quantity : 1)),
|
|
224
242
|
//bei zakt nummern die quantity nicht in die saporderlines schrieben da diese aus oder
|
|
225
243
|
//Orderlines in den EK Text übernommen werden und so die quantity bereits als info übernommen wurde
|
|
226
|
-
articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, useSAPArticleNumberInEKText);
|
|
244
|
+
articleNrPrefix == 'ZKAT' ? 1 : orderLineItem.Quantity, useSAPArticleNumberInEKText, [orderLineItem.BasketID]);
|
|
227
245
|
blindSAPOrderLines.push(newSapOrderLine);
|
|
228
246
|
} else {
|
|
229
247
|
if (!orderLineItem.ArticlePlaceholder) {
|
|
230
248
|
if (articleNrPrefix == 'SAP') {
|
|
231
|
-
if (
|
|
232
|
-
blindSAPOrderLines[
|
|
249
|
+
if (orderLinePrice != 0 && orderLinePrice != undefined || orderLineItem.RelatedToSubItem != 'OPTAUFDOPP') {
|
|
250
|
+
blindSAPOrderLines[found].Quantity += orderLineItem.Quantity;
|
|
233
251
|
}
|
|
234
252
|
} else {
|
|
235
|
-
if (
|
|
253
|
+
if (orderLinePrice != 0 && orderLinePrice != undefined) blindSAPOrderLines[found].Price += Math.round(orderLinePrice * orderLineItem.Quantity);
|
|
236
254
|
}
|
|
255
|
+
blindSAPOrderLines[found].basketIds.push(orderLineItem.BasketID);
|
|
237
256
|
}
|
|
238
257
|
}
|
|
239
258
|
for (var i = 0; i < orderlines.length; i++) {
|
|
@@ -253,17 +272,49 @@ var PfisterWWSHandler = /*#__PURE__*/function () {
|
|
|
253
272
|
//z.B. Hasena wir über diese Methodic in die SAPOrderline geschalten
|
|
254
273
|
if (sapOrderlines.length == 0 && orderSet.SetArticleNr && blindSAPOrderLines.length == 0) {
|
|
255
274
|
// wenn keine SapOrderline generiert wurde und wenn aktuelles Set eine ZKAT Nummer hat
|
|
256
|
-
var newSapOrderLine = new basketModel.SAPOrderLineData(orderSet.SetID, orderSet.SetArticleNr, orderSet.SetArticleNrPrefix, '', '1', Math.round(orderSet.SetPrice), orderSet.SetQuantity, false)
|
|
275
|
+
var newSapOrderLine = new basketModel.SAPOrderLineData(orderSet.SetID, orderSet.SetArticleNr, orderSet.SetArticleNrPrefix, '', '1', Math.round(orderSet.SetPrice), orderSet.SetQuantity, false, orderlines.map(function (ol) {
|
|
276
|
+
return ol.BasketID;
|
|
277
|
+
}));
|
|
257
278
|
sapOrderlines.push(newSapOrderLine);
|
|
258
279
|
} else {
|
|
259
280
|
sapOrderlines = sapOrderlines.concat(blindSAPOrderLines);
|
|
260
281
|
}
|
|
261
282
|
}
|
|
283
|
+
if (orderSet.BruttoSetPrice) orderSet.SetPrice = orderSet.BruttoSetPrice;
|
|
262
284
|
return {
|
|
263
285
|
SAPOrderLines: sapOrderlines,
|
|
264
286
|
orderlines: orderlines
|
|
265
287
|
};
|
|
266
288
|
}
|
|
289
|
+
}, {
|
|
290
|
+
key: "getCustomIdsForProductsMatch",
|
|
291
|
+
value: function getCustomIdsForProductsMatch(set) {
|
|
292
|
+
var _set$basketConfigVari;
|
|
293
|
+
var articles = set.getDivaArticles();
|
|
294
|
+
var ols = index.articleHandlerInstance.getOrderLinesOfArticles(articles, false, !!((_set$basketConfigVari = set.basketConfigVariants) !== null && _set$basketConfigVari !== void 0 && _set$basketConfigVari.length));
|
|
295
|
+
if (!(ols !== null && ols !== void 0 && ols.length)) return [];
|
|
296
|
+
var orderlines = this.repairWWSFlags(articles, ols);
|
|
297
|
+
var _ref = this.getWWSData({}, set, {
|
|
298
|
+
SetQuantity: 1,
|
|
299
|
+
SetPrice: set.getSetPrice(),
|
|
300
|
+
SetID: set.getSetId(),
|
|
301
|
+
CatalogCodex: set.getCatalogCodex(),
|
|
302
|
+
SetArticleNr: set.SetArticleNr ? set.SetArticleNr : set.CatalogData.retailArticleNr,
|
|
303
|
+
SetArticleNrPrefix: set.SetArticleNrPrefix
|
|
304
|
+
}, orderlines, true),
|
|
305
|
+
SAPOrderLines = _ref.SAPOrderLines;
|
|
306
|
+
return {
|
|
307
|
+
customProductNrsPair: SAPOrderLines.filter(function (sapOl) {
|
|
308
|
+
return sapOl.ArticleNrPrefix === 'ZKAT';
|
|
309
|
+
}).map(function (sapOl) {
|
|
310
|
+
return {
|
|
311
|
+
customProductNrs: sapOl.ArticleNr,
|
|
312
|
+
basketIds: sapOl.basketIds
|
|
313
|
+
};
|
|
314
|
+
}),
|
|
315
|
+
matchPrefix: 'SAP'
|
|
316
|
+
};
|
|
317
|
+
}
|
|
267
318
|
}]);
|
|
268
319
|
}();
|
|
269
320
|
|
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
|
-
var index = require('./index-
|
|
6
|
+
var index = require('./index-5f530bbb.js');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
8
|
var _asyncToGenerator = require('@babel/runtime/helpers/asyncToGenerator');
|
|
9
9
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
@@ -3,12 +3,12 @@
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
5
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
6
|
-
var index = require('./index-
|
|
6
|
+
var index = require('./index-5f530bbb.js');
|
|
7
7
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
8
|
+
require('@babel/runtime/helpers/slicedToArray');
|
|
8
9
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
9
10
|
require('@babel/runtime/regenerator');
|
|
10
11
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
11
|
-
require('@babel/runtime/helpers/slicedToArray');
|
|
12
12
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
13
13
|
require('axios');
|
|
14
14
|
require('@crystaldesign/basket-model');
|
|
@@ -320,6 +320,9 @@ var StandardWWSHandler = /*#__PURE__*/function () {
|
|
|
320
320
|
}
|
|
321
321
|
return formattedOptions;
|
|
322
322
|
}
|
|
323
|
+
}, {
|
|
324
|
+
key: "getCustomIdsForProductsMatch",
|
|
325
|
+
value: function getCustomIdsForProductsMatch(set) {}
|
|
323
326
|
}]);
|
|
324
327
|
}();
|
|
325
328
|
|
|
@@ -6,10 +6,10 @@ var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
|
6
6
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
7
7
|
var _defineProperty = require('@babel/runtime/helpers/defineProperty');
|
|
8
8
|
var _regeneratorRuntime = require('@babel/runtime/regenerator');
|
|
9
|
-
var index = require('./index-
|
|
9
|
+
var index = require('./index-5f530bbb.js');
|
|
10
10
|
var DivaUtils = require('@crystaldesign/diva-utils');
|
|
11
|
-
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
12
11
|
require('@babel/runtime/helpers/slicedToArray');
|
|
12
|
+
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
13
13
|
require('axios');
|
|
14
14
|
require('@crystaldesign/basket-model');
|
|
15
15
|
require('@crystaldesign/basket-handler');
|
|
@@ -57,7 +57,7 @@ var ShelfPlanner = /*#__PURE__*/function () {
|
|
|
57
57
|
this.disableCellsByElement = data.DisableCells;
|
|
58
58
|
this.data = data;
|
|
59
59
|
this.showAfterOPT = data.ShowAfterOPT;
|
|
60
|
-
this.showOnRule = data.ShowOnRule ? DivaUtils__default["default"].getRuleByFormula(data.ShowOnRule) : undefined;
|
|
60
|
+
this.showOnRule = data.ShowOnRule ? DivaUtils__default["default"].getRuleByFormula(data.ShowOnRule, article.catalogCodex, article.CatalogData.multiselectOptions) : undefined;
|
|
61
61
|
this.gridAllowedOnCells = data.GridAllowedOnCells;
|
|
62
62
|
this.gridAllowedOntoArticles = data.GridAllowedOntoArticles;
|
|
63
63
|
this.takePlaceOnOtherGrids = data.TakePlaceOnOtherGrids;
|
|
@@ -2,12 +2,12 @@
|
|
|
2
2
|
|
|
3
3
|
var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
|
|
4
4
|
var _createClass = require('@babel/runtime/helpers/createClass');
|
|
5
|
-
require('./index-
|
|
5
|
+
require('./index-5f530bbb.js');
|
|
6
|
+
require('@babel/runtime/helpers/slicedToArray');
|
|
6
7
|
require('@babel/runtime/helpers/asyncToGenerator');
|
|
7
8
|
require('@babel/runtime/helpers/defineProperty');
|
|
8
9
|
require('@babel/runtime/regenerator');
|
|
9
10
|
require('@babel/runtime/helpers/objectWithoutProperties');
|
|
10
|
-
require('@babel/runtime/helpers/slicedToArray');
|
|
11
11
|
require('@babel/runtime/helpers/toConsumableArray');
|
|
12
12
|
require('axios');
|
|
13
13
|
require('@crystaldesign/diva-utils');
|
|
@@ -45,6 +45,9 @@ var StandardWWSHandler = /*#__PURE__*/function () {
|
|
|
45
45
|
orderlines: orderlines
|
|
46
46
|
};
|
|
47
47
|
}
|
|
48
|
+
}, {
|
|
49
|
+
key: "getCustomIdsForProductsMatch",
|
|
50
|
+
value: function getCustomIdsForProductsMatch(set) {}
|
|
48
51
|
}]);
|
|
49
52
|
}();
|
|
50
53
|
|