@colijnit/articleapi 262.1.3 → 262.1.5

package/build/articles-auth.d.ts

@@ -48,6 +48,7 @@ export declare class ArticlesAuth extends IoneApiArticles {
     getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     getCatalogDefinitions(showLoader?: boolean): Promise<DataServiceResponseData>;
     getExternalSource(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getExternalSourceInfo(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFullObject(id: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     getWarehouses(goodId: number): Promise<DataServiceResponseData>;

package/build/articles-auth.js

@@ -283,6 +283,17 @@ export class ArticlesAuth extends IoneApiArticles {
             return this._call(DataServiceMethod.SelectSingleObject, data, BackendServiceName.DataService, showLoader);
         });
     }
+    getExternalSourceInfo(externalSourceId_1) {
+        return __awaiter(this, arguments, void 0, function* (externalSourceId, showLoader = true) {
+            const data = {
+                moduleName: ModuleName.MasterData,
+                objectName: MasterDataObjectName.ExternalSourceInfo,
+                refCursorAsArray: true,
+                objectId: externalSourceId
+            };
+            return this._call(DataServiceMethod.SelectSingleObject, data, BackendServiceName.DataService, showLoader);
+        });
+    }
     getArticleFullObject(id, showLoader = true) {
         const data = {
             moduleName: ModuleName.Articles,

package/build/articles-public.d.ts

@@ -48,6 +48,7 @@ export declare class ArticlesPublic extends IoneApiArticles {
     getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     getCatalogDefinitions(showLoader?: boolean): Promise<DataServiceResponseData>;
     getExternalSource(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getExternalSourceInfo(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getGoodIdFromArticleNr(sku: string): Promise<DataServiceResponseData>;
     getArticleFullObject(goodId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFlat(sku: string): Promise<DataServiceResponseData>;

package/build/articles-public.js

@@ -132,6 +132,13 @@ export class ArticlesPublic extends IoneApiArticles {
             return this._call(PublicServiceMethod.GetExternalSource, data, showLoader);
         });
     }
+    getExternalSourceInfo(externalSourceId_1) {
+        return __awaiter(this, arguments, void 0, function* (externalSourceId, showLoader = true) {
+            const params = { id: externalSourceId };
+            const data = Object.assign(Object.assign({}, this.createServiceRequestData()), { parameterValues: params });
+            return this._call(PublicServiceMethod.GetExternalSourceInfo, data, showLoader);
+        });
+    }
     getGoodIdFromArticleNr(sku) {
         return __awaiter(this, void 0, void 0, function* () {
             const params = { artikelnr: sku };

package/build/articles.d.ts

@@ -69,6 +69,7 @@ export declare class Articles {
     getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     getCatalogDefinitions(showLoader?: boolean): Promise<DataServiceResponseData>;
     getExternalSource(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
+    getExternalSourceInfo(externalSourceId: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFullObject(id: number, showLoader?: boolean): Promise<DataServiceResponseData>;
     getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     getWarehouses(goodId: number): Promise<DataServiceResponseData>;
@@ -118,6 +119,7 @@ export declare class Articles {
     getArticleListWithBarcodeArticleNrEanCode(searchString: string, showLoader?: boolean): Promise<DataServiceResponseData>;
     getCategoryTypes(): Promise<DataServiceResponseData>;
     getCategoryDesigns(): Promise<DataServiceResponseData>;
+    prepareArticleForCart(userType: string, transactionType: string, domain: string, goodId: number, shouldGetArticleTree?: boolean, quantity?: number, instanceId?: string, showLoader?: boolean): Promise<DataServiceResponseData>;
     getJsonConfiguredArticles(configuratorStatistics?: ConfiguratorStatisticsEnvironment, showLoader?: boolean, instanceId?: string): Promise<DataServiceResponseData>;
     getJsonArticleFlatTree(goodId: number, goodType: string, quantity: number, externalSource?: boolean, showLoader?: boolean, instanceId?: string, configuratorStatistics?: ConfiguratorStatisticsEnvironment): Promise<string>;
     getGeneratedArtDirectly(goodId: number, showLoader: boolean): Promise<string>;
@@ -129,8 +131,10 @@ export declare class Articles {
     getFileUploadComplete(uploadId: string, uploadType: string): Promise<DataServiceResponseData>;
     cancelFileUpload(uploadId: string, uploadType: string): Promise<DataServiceResponseData>;
     getConversionUnitsForDefaultArticleUnitByGoodIdAndTransactionKind(goodId: number, transactionKind: string): Promise<DataServiceResponseData>;
+    private _getJSONFromArticleObject;
     convertAmountByUnitCodeToDefaultUnitOfArticle(request: ConvertQuantityToDefaultUnitRequest): Promise<DataServiceResponseData>;
     private _getFrozenArticle;
     private _getArticleFlatTree;
     private _getGeneratedArtDirectly;
+    private _getArticleFullObject;
 }

package/build/articles.js

@@ -11,9 +11,13 @@ import { ArticlesAuth } from './articles-auth';
 import { Subject } from 'rxjs';
 import { ArticlesPublic } from './articles-public';
 import { Connector } from '@colijnit/ioneconnector/build/connector';
+import { ConfiguratorStatisticsEnvironment } from './model/configurator-statistics-environment';
 import { SelectorArticle } from './model/selector-article';
+import { DataServiceResponseData } from '@colijnit/ioneconnector/build/model/data-service-response-data';
 import { BusinessObjectFactory } from '@colijnit/ioneconnector/build/service/business-object-factory';
 import { ArticleFlatTreeDTO } from './model/article-flat-tree.bo';
+import { ArticleFullObject } from './model/article-full-object';
+import { GoodType } from './enum/refcode/good-type.enum';
 export class Articles {
     constructor(options) {
         this.showLoader = new Subject();
@@ -129,6 +133,9 @@ export class Articles {
     getExternalSource(externalSourceId, showLoader = true) {
         return this.articles.getExternalSource(externalSourceId, showLoader);
     }
+    getExternalSourceInfo(externalSourceId, showLoader = true) {
+        return this.articles.getExternalSourceInfo(externalSourceId, showLoader);
+    }
     getArticleFullObject(id, showLoader = true) {
         return this.articles.getArticleFullObject(id, showLoader);
     }
@@ -276,6 +283,35 @@ export class Articles {
     getCategoryDesigns() {
         return this.articles.getCategoryDesigns();
     }
+    prepareArticleForCart(userType_1, transactionType_1, domain_1, goodId_1) {
+        return __awaiter(this, arguments, void 0, function* (userType, transactionType, domain, goodId, shouldGetArticleTree = false, quantity = 1, instanceId = undefined, showLoader = true) {
+            if (goodId) {
+                const article = yield this._getArticleFullObject(goodId, showLoader);
+                const goodType = article.goodType;
+                let returnArticle;
+                if (goodType === GoodType.BaseArticle) {
+                    if (article.isConfigurable) {
+                        returnArticle = yield this._getJSONFromArticleObject(userType, transactionType, domain, article, quantity, shouldGetArticleTree, showLoader, instanceId);
+                    }
+                    else {
+                        returnArticle = this.boFactory.makeWithRawBackendData(ArticleFullObject, article);
+                    }
+                }
+                else {
+                    if (shouldGetArticleTree) {
+                        returnArticle = yield this._getJSONFromArticleObject(userType, transactionType, domain, article, quantity, shouldGetArticleTree, showLoader);
+                    }
+                    else {
+                        returnArticle = this.boFactory.makeWithRawBackendData(ArticleFullObject, article);
+                    }
+                }
+                if (returnArticle) {
+                    return Promise.resolve(new DataServiceResponseData({ resultObject: returnArticle, validationResult: { success: true } }));
+                }
+            }
+            return Promise.resolve(new DataServiceResponseData({ validationResult: { success: false, messages: ['UNKNOWN_ERROR'] } }));
+        });
+    }
     getJsonConfiguredArticles(configuratorStatistics, showLoader = true, instanceId = undefined) {
         return this.articles.getFrozenArticle(configuratorStatistics, showLoader, instanceId);
     }
@@ -350,6 +386,18 @@ export class Articles {
     getConversionUnitsForDefaultArticleUnitByGoodIdAndTransactionKind(goodId, transactionKind) {
         return this.articles.getConversionUnitsForDefaultArticleUnitByGoodIdAndTransactionKind(goodId, transactionKind);
     }
+    _getJSONFromArticleObject(userType_1, transactionType_1, domain_1, article_1, quantity_1) {
+        return __awaiter(this, arguments, void 0, function* (userType, transactionType, domain, article, quantity, shouldGetArticleTree = false, showLoader = true, instanceId = undefined) {
+            const configuratorStatistics = new ConfiguratorStatisticsEnvironment();
+            configuratorStatistics.userType = userType;
+            configuratorStatistics.transactionType = transactionType;
+            configuratorStatistics.actionDomain = domain;
+            configuratorStatistics.sessionId = this._connector.getSessionId() ? this._connector.getSessionId() : 'unknown';
+            configuratorStatistics.webHost = window.location.host;
+            configuratorStatistics.bundleHost = window.location.host;
+            return yield this.getJsonArticleFlatTree(article.goodId, article.goodType, quantity, shouldGetArticleTree, showLoader, instanceId, configuratorStatistics);
+        });
+    }
     convertAmountByUnitCodeToDefaultUnitOfArticle(request) {
         return this.articles.convertAmountByUnitCodeToDefaultUnitOfArticle(request);
     }
@@ -402,4 +450,15 @@ export class Articles {
             return;
         });
     }
+    _getArticleFullObject(goodId, showLoader) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const response = yield this.articles.getArticleFullObject(goodId, showLoader);
+            if (response && response.validationResult && response.validationResult.success) {
+                if (response.resultObject) {
+                    return this.boFactory.makeWithRawBackendData(ArticleFullObject, response.resultObject);
+                }
+            }
+            return;
+        });
+    }
 }

package/build/articles.unit.test.js

@@ -21,10 +21,10 @@ import { ArticleFlat } from "./model/article-flat.bo";
 const localOptions = {
     url: "https://develop.colijn-it.nl/",
     schema: "815",
-    version: "259",
+    version: "300",
     useLoginEncryption: true,
-    username: "elske",
-    password: "elske1"
+    username: "patrick",
+    password: "vankeulen1234567890!"
 };
 const remoteOptions = {
     url: "http://130.62.7.55:8888/ione",
@@ -240,6 +240,11 @@ describe("ArticlesAPI", () => {
         const result = yield articles.getExternalSource(94);
         expect(result).toBeDefined();
     }));
+    it('getExternalSourceInfo', () => __awaiter(void 0, void 0, void 0, function* () {
+        yield articles.connect();
+        const result = yield articles.getExternalSourceInfo(148);
+        expect(result).toBeDefined();
+    }));
     it('getTurnoverGroupImages', () => __awaiter(void 0, void 0, void 0, function* () {
         const result = yield articles.getTurnoverGroups();
         expect(result).toBeDefined();

package/build/enum/master-data-object-name.enum.d.ts

@@ -10,6 +10,7 @@ export declare enum MasterDataObjectName {
     DeliveryMethod = "DeliveryMethod",
     DeliveryOption = "DeliveryOption",
     ExternalSource = "ExternalSource",
+    ExternalSourceInfo = "ExternalSourceInfo",
     MarketingCode = "MarketingCode",
     PrivacySettingDTO = "PrivacySettingDTO",
     SuperArticle = "SuperArticle",

package/build/enum/master-data-object-name.enum.js

@@ -11,6 +11,7 @@ export var MasterDataObjectName;
     MasterDataObjectName["DeliveryMethod"] = "DeliveryMethod";
     MasterDataObjectName["DeliveryOption"] = "DeliveryOption";
     MasterDataObjectName["ExternalSource"] = "ExternalSource";
+    MasterDataObjectName["ExternalSourceInfo"] = "ExternalSourceInfo";
     MasterDataObjectName["MarketingCode"] = "MarketingCode";
     MasterDataObjectName["PrivacySettingDTO"] = "PrivacySettingDTO";
     MasterDataObjectName["SuperArticle"] = "SuperArticle";

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

@@ -87,6 +87,7 @@ export declare enum PublicServiceMethod {
     getBrandsUsedInArticles = "getBrandsUsedInArticles",
     GetCatalogDefinitions = "getCatalogDefinitions",
     GetExternalSource = "getExternalSource",
+    GetExternalSourceInfo = "getExternalSourceInfo",
     getGeneratedArtDirectly = "getGeneratedArtDirectly",
     StorePreset = "storePreset"
 }

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

@@ -88,6 +88,7 @@ export var PublicServiceMethod;
     PublicServiceMethod["getBrandsUsedInArticles"] = "getBrandsUsedInArticles";
     PublicServiceMethod["GetCatalogDefinitions"] = "getCatalogDefinitions";
     PublicServiceMethod["GetExternalSource"] = "getExternalSource";
+    PublicServiceMethod["GetExternalSourceInfo"] = "getExternalSourceInfo";
     PublicServiceMethod["getGeneratedArtDirectly"] = "getGeneratedArtDirectly";
     PublicServiceMethod["StorePreset"] = "storePreset";
 })(PublicServiceMethod || (PublicServiceMethod = {}));

package/build/interface/external-source-article-add.interface.d.ts

@@ -1,9 +1,9 @@
 import { CatalogDefinition } from '../model/catalog-definition.bo';
-import { ExternalSource } from '../model/external-source.bo';
-import { ArticleListObjectExtended } from '../model/article-list-object-extended.bo';
+import { ArticleFullObject } from '../model/article-full-object';
+import { ExternalSourceInfo } from '../model/external-source-info.bo';
 export interface ExternalSourceArticleAddInterface {
     quantity: number;
-    article: string | ArticleListObjectExtended;
+    article: string | ArticleFullObject;
     catalogDefinition: CatalogDefinition;
-    externalSource: ExternalSource;
+    externalSource: ExternalSourceInfo;
 }

package/build/interface/external-source-article-click.interface.d.ts

@@ -1,10 +1,10 @@
 import { ArticleListObjectExtended } from '../model/article-list-object-extended.bo';
 import { CatalogDefinition } from '../model/catalog-definition.bo';
-import { ExternalSource } from '../model/external-source.bo';
 import { ExternalSettingsInterface } from './external-settings.interface';
+import { ExternalSourceInfo } from '../model/external-source-info.bo';
 export interface ExternalSourceArticleClickInterface {
     article: string | ArticleListObjectExtended;
     settings: ExternalSettingsInterface;
     catalogDefinition: CatalogDefinition;
-    externalSource: ExternalSource;
+    externalSource: ExternalSourceInfo;
 }

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

@@ -54,6 +54,7 @@ export declare abstract class IoneApiArticles {
     abstract getBrandsFilter(request: ArticleExtendedRequest): Promise<DataServiceResponseData>;
     abstract getCatalogDefinitions(showLoader: boolean): Promise<DataServiceResponseData>;
     abstract getExternalSource(externalSourceId: number, showLoader: boolean): Promise<DataServiceResponseData>;
+    abstract getExternalSourceInfo(externalSourceId: number, showLoader: boolean): Promise<DataServiceResponseData>;
     abstract getArticleFullObject(id: number, showLoader: boolean): Promise<DataServiceResponseData>;
     abstract getArticleFlat(sku: string): Promise<DataServiceResponseData>;
     abstract getWarehouses(goodId: number): Promise<DataServiceResponseData>;

package/build/model/external-catalog-startup-info.d.ts

@@ -1,7 +1,7 @@
-import { BusinessObject } from "@colijnit/ioneconnector/build/model/business-object";
-import { ExternalSource } from "./external-source.bo";
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+import { ExternalSourceInfo } from './external-source-info.bo';
 export declare class ExternalCatalogStartupInfo extends BusinessObject {
-    externalSource: ExternalSource;
+    externalSource: ExternalSourceInfo;
     username: string;
     password: string;
     token: string;

package/build/model/external-catalog-startup-info.js

@@ -1,3 +1,3 @@
-import { BusinessObject } from "@colijnit/ioneconnector/build/model/business-object";
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
 export class ExternalCatalogStartupInfo extends BusinessObject {
 }

package/build/model/external-source-info.bo.d.ts

@@ -0,0 +1,18 @@
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+import { ExternalSourceParameter } from './external-source-parameter.bo';
+export declare class ExternalSourceInfo extends BusinessObject {
+    sourceId: number;
+    type: string;
+    branchNr: string;
+    description: string;
+    url: string;
+    domain: string;
+    schema: string;
+    language: string;
+    retailFormulas: string[];
+    parameters: ExternalSourceParameter[];
+    supplierNr: number;
+    constructor();
+    getId(): number;
+    setId(value: number): void;
+}

package/build/model/external-source-info.bo.js

@@ -0,0 +1,25 @@
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+import { BusinessObject } from '@colijnit/ioneconnector/build/model/business-object';
+import { ComplexArray } from '@colijnit/ioneconnector/build/factory/decorators/complex-array.decorator';
+import { ExternalSourceParameter } from './external-source-parameter.bo';
+export class ExternalSourceInfo extends BusinessObject {
+    constructor() {
+        super();
+        this.retailFormulas = [];
+        this.parameters = [];
+    }
+    getId() {
+        return this.sourceId;
+    }
+    setId(value) {
+        this.sourceId = value;
+    }
+}
+__decorate([
+    ComplexArray(ExternalSourceParameter)
+], ExternalSourceInfo.prototype, "parameters", void 0);

package/package.json

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