@colijnit/ioneconnector 1.0.139 → 1.0.141

package/build/connector-auth.d.ts

@@ -53,6 +53,7 @@ export declare class ConnectorAuth implements IoneApiConnection {
     getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
     getGoodIdFromArticleNr(skuOrId: string): Promise<number>;
     getQuestionAndAnswers(): Promise<any>;
+    getSelectorStructurePrices(): Promise<any>;
     getDeliveryPrognosis(goodId: number, branchNr: string): Promise<any>;
     getDeliveryPrognosisForArticle(goodId: number): Promise<any>;
     getSelectorActiveOptionValuesPrices(): Promise<any>;

package/build/connector-auth.js

@@ -64,6 +64,9 @@ class ConnectorAuth {
     getQuestionAndAnswers() {
         return this.dataRepository.getQuestionAndAnswers();
     }
+    getSelectorStructurePrices() {
+        return this.dataRepository.getSelectorStructurePrices();
+    }
     getDeliveryPrognosis(goodId, branchNr) {
         return this.dataRepository.getDeliveryPrognosis(goodId);
     }

package/build/connector-public.d.ts

@@ -48,6 +48,7 @@ export declare class ConnectorPublic implements IoneApiConnection {
     getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
     getGoodIdFromArticleNr(skuOrId: string): Promise<number>;
     getQuestionAndAnswers(): Promise<any>;
+    getSelectorStructurePrices(): Promise<any>;
     getDeliveryPrognosis(goodId: number, branchNr: string): Promise<any>;
     getDeliveryPrognosisForArticle(goodId: number): Promise<any>;
     getSelectorActiveOptionValuesPrices(): Promise<any>;

package/build/connector-public.js

@@ -60,6 +60,9 @@ class ConnectorPublic {
     getQuestionAndAnswers() {
         return this.dataService.getSelectorActiveOptionValues();
     }
+    getSelectorStructurePrices() {
+        return this.dataService.getSelectorStructurePrices();
+    }
     getDeliveryPrognosis(goodId, branchNr) {
         return this.dataService.getDeliveryPrognosis(goodId, branchNr);
     }

package/build/connector.d.ts

@@ -36,6 +36,7 @@ import { ArticleExtendedDto } from "./model/article-extended-dto";
 import { InternalParam } from "./enum/internal-param.enum";
 import { QuestionAndAnswer } from "./model/question-and-answer";
 import { ConfiguratorStatisticsEnvironment } from "./model/configurator-statistics-environment";
+import { SelectorStructurePrice } from "./model/selector-structure-price";
 export declare class Connector {
     goodId: number;
     useWebsocket: boolean;
@@ -83,6 +84,7 @@ export declare class Connector {
     getFullArticle(skuOrId: string): Promise<ArticleFullObject>;
     getQuestionAndAnswers(): void;
     getQuestionAndAnswersAsync(): Promise<QuestionAndAnswer>;
+    getSelectorStructurePrices(): Promise<SelectorStructurePrice[]>;
     getSkipButtonImageAndText(goodId?: number): Promise<SkipButtonInfo>;
     getDeliveryPrognosisForArticle(goodId: number): Promise<{}>;
     getAnswersPrices(): Promise<AnswerPrice[]>;
@@ -137,4 +139,5 @@ export declare class Connector {
     private _prepareAnswersAndImages;
     private _handleSelectionAnswers;
     private _applicationClose;
+    private _handleSeparatePrices;
 }

package/build/connector.js

@@ -193,6 +193,7 @@ class Connector {
                     answers.push(answer);
                 }
             }
+            this._handleSeparatePrices(answers);
             const rawQuestion = rawDatas.data && rawDatas.data.length > 0 ? rawDatas.data[0] : null;
             const question = rawQuestion ? this.boFactory.makeWithRawBackendData(question_1.Question, rawQuestion) : null;
             result.question = question;
@@ -200,6 +201,18 @@ class Connector {
         }
         return result;
     }
+    async getSelectorStructurePrices() {
+        const rawData = await this.connection.getSelectorStructurePrices();
+        if (rawData) {
+            if (rawData.data && rawData.data.resultObjects && rawData.data.resultObjects.length > 0) {
+                return rawData.data.resultObjects;
+            }
+            else if (rawData[''] && rawData[''].length > 0) {
+                return rawData[''];
+            }
+        }
+        return [];
+    }
     getSkipButtonImageAndText(goodId) {
         return this.connection.getSkipButtonImageAndText(goodId);
     }
@@ -645,5 +658,12 @@ class Connector {
         });
         selection.answerTree = JSON.stringify(answerTree);
     }
+    _handleSeparatePrices(answers) {
+        this.getSelectorStructurePrices().then((results) => {
+            results.forEach((price) => {
+                answers.find((node) => node.id === price.id).price = price.salesAdditionalPrice;
+            });
+        });
+    }
 }
 exports.Connector = Connector;

package/build/connector.unit.test.js

@@ -14,6 +14,14 @@ const options = {
     password: "patrick",
     useLoginEncryption: true
 };
+const developRemoteOptions = {
+    url: "http://130.62.7.55:8888/ione/",
+    schema: "815",
+    version: "252",
+    username: "patrick",
+    password: "patrick",
+    useLoginEncryption: true
+};
 describe("Connector", () => {
     let connector;
     beforeEach(() => {
@@ -136,4 +144,8 @@ describe("Connector", () => {
         const catalogDefinitions = await connector.getCatalogDefinitions();
         expect(catalogDefinitions).toBeDefined();
     });
+    it('getSelectorStructurePrices', async () => {
+        const prices = await connector.getSelectorStructurePrices();
+        expect(prices).toBeDefined();
+    });
 });

package/build/enum/article-object-name.enum.d.ts

@@ -2,6 +2,7 @@ export declare enum ArticledObjectName {
     SelectorStructure = "SelectorStructure",
     SelectorDeco = "SelectorDeco",
     SelectorSelections = "SelectorSelections",
+    SelectorStructurePrices = "SelectorStructurePrices",
     SelectorActiveOptionValuesPrices = "SelectorActiveOptionValuesPrices",
     CoText = "CoText",
     ArticleListObjectExtended = "ArticleListObjectExtended",

package/build/enum/article-object-name.enum.js

@@ -5,6 +5,7 @@ var ArticledObjectName;
     ArticledObjectName["SelectorStructure"] = "SelectorStructure";
     ArticledObjectName["SelectorDeco"] = "SelectorDeco";
     ArticledObjectName["SelectorSelections"] = "SelectorSelections";
+    ArticledObjectName["SelectorStructurePrices"] = "SelectorStructurePrices";
     ArticledObjectName["SelectorActiveOptionValuesPrices"] = "SelectorActiveOptionValuesPrices";
     ArticledObjectName["CoText"] = "CoText";
     ArticledObjectName["ArticleListObjectExtended"] = "ArticleListObjectExtended";

package/build/enum/hd-service-method.d.ts

@@ -22,6 +22,7 @@ export declare enum HdServiceMethod {
     SelectorActiveNodes = "selectorActiveNodes",
     SelectorActiveNodesPr = "selectorActiveNodesPr",
     SelectorStructure = "selectorStructure",
+    SelectorStructurePrices = "SelectorStructurePrices",
     GetSelectorDeliveryDate = "getSelectorDeliveryDate",
     GetDeliveryDate2 = "getDeliveryDate2",
     GetStockForArtNode = "getStockForArtNode",

package/build/enum/hd-service-method.js

@@ -25,6 +25,7 @@ var HdServiceMethod;
     HdServiceMethod["SelectorActiveNodes"] = "selectorActiveNodes";
     HdServiceMethod["SelectorActiveNodesPr"] = "selectorActiveNodesPr";
     HdServiceMethod["SelectorStructure"] = "selectorStructure";
+    HdServiceMethod["SelectorStructurePrices"] = "SelectorStructurePrices";
     HdServiceMethod["GetSelectorDeliveryDate"] = "getSelectorDeliveryDate";
     HdServiceMethod["GetDeliveryDate2"] = "getDeliveryDate2";
     HdServiceMethod["GetStockForArtNode"] = "getStockForArtNode";

package/build/ione-api-connection.d.ts

@@ -38,6 +38,7 @@ export interface IoneApiConnection {
     getGoodIdFromArticleNr(skuOrId: string): Promise<number>;
     getArticleFullObject(goodId: number): Promise<ArticleFullObject>;
     getQuestionAndAnswers(): Promise<any>;
+    getSelectorStructurePrices(): Promise<any>;
     getDeliveryPrognosis(goodId: number, branchNr: string): Promise<any>;
     getDeliveryPrognosisForArticle(goodId: number): Promise<any>;
     getSelectorActiveOptionValuesPrices(): Promise<any>;

package/build/model/selector-structure-price.d.ts

@@ -0,0 +1,5 @@
+import { BusinessObject } from "./business-object";
+export declare class SelectorStructurePrice extends BusinessObject {
+    id: number;
+    salesAdditionalPrice: number;
+}

package/build/model/selector-structure-price.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const business_object_1 = require("./business-object");
+class SelectorStructurePrice extends business_object_1.BusinessObject {
+}
+exports.SelectorStructurePrice = SelectorStructurePrice;

package/build/provider/data-repository.service.d.ts

@@ -54,6 +54,7 @@ export declare class DataRepositoryService {
     getCatalogDefinitions(showLoader?: boolean): Promise<any>;
     getInternalParameter(parameter: InternalParam): Promise<string>;
     getQuestionAndAnswers(): Promise<any>;
+    getSelectorStructurePrices(): Promise<DataServiceResponseRoot>;
     initNode(id: any): Promise<any>;
     initNodeInstance(id: any): Promise<any>;
     changeConnection(oldConnection: string, newConnection: string): Promise<any>;

package/build/provider/data-repository.service.js

@@ -331,6 +331,14 @@ class DataRepositoryService {
     getQuestionAndAnswers() {
         return this.getSelectorActiveOptionValues();
     }
+    getSelectorStructurePrices() {
+        const data = {
+            objectName: article_object_name_enum_1.ArticledObjectName.SelectorStructurePrices,
+            moduleName: module_name_enum_1.ModuleName.Articles,
+            refCursorAsArray: true
+        };
+        return this.call(data, data_service_method_enum_1.DataServiceMethod.SelectMultipleObjects);
+    }
     initNode(id) {
         return new Promise((resolve, reject) => {
             const params = { goodId: id, pubicationCode: 4 };
@@ -841,6 +849,9 @@ class DataRepositoryService {
             moduleName: module_name_enum_1.ModuleName.Articles,
             refCursorAsArray: true
         };
+        data.parameterValues = {
+            doCalculatePrices: false
+        };
         return this.call(data, data_service_method_enum_1.DataServiceMethod.SelectMultipleObjects);
     }
     callSelectorSelections() {

package/build/service/hd-data.service.d.ts

@@ -57,6 +57,7 @@ export declare class HdDataService {
     getSelectorActiveOptionValues(): Promise<any>;
     getSelectorActiveOptionValuesPrices(): Promise<any>;
     private getSelectorStructure;
+    getSelectorStructurePrices(): Promise<string>;
     getDeliveryPrognosis(goodId: number, branchNr?: string): Promise<any>;
     getDeliveryDate2(params: any, branchNr?: string): Promise<any>;
     getStockForArtNode(branchNo: string, selNodeId: number): Promise<number>;

package/build/service/hd-data.service.js

@@ -312,7 +312,7 @@ class HdDataService {
         });
         const result = response.data;
         if (result.validationResult && result.validationResult.success) {
-            return result;
+            return result.resultObject['activeNodesPr'];
         }
         else {
             console.error("Error getting selector action prices (" + response.message + ")");
@@ -320,7 +320,7 @@ class HdDataService {
         }
     }
     async getSelectorStructure() {
-        const params = { instanceId: this._instanceId };
+        const params = { instanceId: this._instanceId, doCalculatePrices: false };
         const data = { ...this.createServiceRequestData(), parameterValues: params };
         const response = await this._sessionService.call(hd_service_method_1.HdServiceMethod.SelectorStructure, data)
             .catch((e) => {
@@ -335,6 +335,21 @@ class HdDataService {
             return null;
         }
     }
+    async getSelectorStructurePrices() {
+        const params = { instanceId: this._instanceId };
+        const data = { ...this.createServiceRequestData(), parameterValues: params };
+        const response = await this._sessionService.call(hd_service_method_1.HdServiceMethod.SelectorStructurePrices, data)
+            .catch((e) => {
+            return Promise.reject(e);
+        });
+        const result = response.data;
+        if (result.validationResult && result.validationResult.success) {
+            return result.resultObject;
+        }
+        else {
+            return null;
+        }
+    }
     async getDeliveryPrognosis(goodId, branchNr) {
         const params = { instanceId: this._instanceId };
         const data = { ...this.createServiceRequestData(), parameterValues: params };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@colijnit/ioneconnector",
-  "version": "1.0.139",
+  "version": "1.0.141",
   "scripts": {
     "build": "grunt clean && tsc",
     "browserify": "browserify build/connector.js --s colijn -o dist/out-tsc/bundle.js",