@esolve/ng-esolve-connect 0.5.0 → 0.6.2

package/fesm2015/esolve-ng-esolve-connect.js

@@ -1,13 +1,20 @@
 import * as i0 from '@angular/core';
 import { InjectionToken, Injectable, Inject, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
-import * as i1 from '@angular/common/http';
-import { HttpParams, HTTP_INTERCEPTORS, HttpClientModule, HttpHeaders, HttpErrorResponse } from '@angular/common/http';
-import { iif, throwError, BehaviorSubject, of } from 'rxjs';
-import { map, catchError, tap, switchMap } from 'rxjs/operators';
-import * as i1$1 from '@angular/platform-browser';
+import * as i1$1 from '@angular/common/http';
+import { HttpParams, HTTP_INTERCEPTORS, HttpClientModule, HttpErrorResponse, HttpHeaders } from '@angular/common/http';
+import { BehaviorSubject, throwError, iif, of } from 'rxjs';
+import * as i1 from '@angular/platform-browser';
+import { map, tap, catchError, switchMap } from 'rxjs/operators';
 
-const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
+const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
+// For future development
+// export const GLOBAL_CONFIG = {
+//     images_url: '',
+//     media_path: '/media',
+//     stock_path: '/stock',
+//     banner_path: '/banners'
+// };
 
 class EsolveSession {
     constructor(id = -1, _key = '', _key_expiration_date) {
@@ -36,89 +43,13 @@ class EsolveSession {
     }
 }
 
-class EsolveAddress {
-    constructor(id, recipient, address_type, pobox, place_name, street_number, street, suburb, city, province, country, postal_code, latitude, longitude) {
-        this.id = id;
-        this.recipient = recipient;
-        this.address_type = address_type;
-        this.pobox = pobox;
-        this.place_name = place_name;
-        this.street_number = street_number;
-        this.street = street;
-        this.suburb = suburb;
-        this.city = city;
-        this.province = province;
-        this.country = country;
-        this.postal_code = postal_code;
-        this.latitude = latitude;
-        this.longitude = longitude;
-    }
-}
-
-class EsolveAccountService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
-        this._user_id = 0;
-    }
-    get user_id() {
-        return this._user_id;
-    }
-    set user_id(value) {
-        value = ((value > 0) ? value : 0);
-        if (this._user_id !== value) {
-            this._user_id = value;
-        }
-    }
-    processUserAddress(records) {
-        const user_addesses = [];
-        if (records && (this._user_id > 0)) {
-            for (const record of records) {
-                if (+record.userid === this._user_id) {
-                    user_addesses.push(new EsolveAddress(+record.id, record.recipient, record.address_type, record.pobox, record.place_name, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude));
-                }
-            }
-        }
-        return user_addesses;
-    }
-    getAddress() {
-        let params = new HttpParams();
-        params = params.set('ws_id', this.config.wsid);
-        params = params.set('user_id', this.user_id.toString());
-        return iif(() => (this.user_id > 0), this.http.get(`${this.config.api_url}/service/get-addresses.php`, { params }).pipe(map(response => {
-            if (response.records === undefined) {
-                throw response;
-            }
-            return this.processUserAddress(response.records);
-        }), catchError((err) => {
-            return throwError(err);
-        })), throwError('Log in is required'));
-    }
-}
-EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAccountService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
-
 class EsolveSessionService {
-    constructor(config, account) {
+    constructor(config) {
         this.config = config;
         this.storage_key = 'ngEslvUserSession';
         this.setStorageKey();
         this._session = new BehaviorSubject(new EsolveSession(0, ''));
         this.session = this._session.asObservable();
-        this._session.subscribe((session) => {
-            if (session.key !== '') {
-                account.user_id = session.id;
-            }
-        });
     }
     get currentSession() {
         return this._session.value;
@@ -174,7 +105,7 @@ class EsolveSessionService {
         }
     }
 }
-EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSessionService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: EsolveAccountService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSessionService, deps: [{ token: ESOLVE_CONNECT_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveSessionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSessionService, decorators: [{
             type: Injectable,
@@ -184,7 +115,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: EsolveAccountService }]; } });
+                }] }]; } });
 
 class EsolveAuthInterceptorService {
     constructor(config, session) {
@@ -194,7 +125,7 @@ class EsolveAuthInterceptorService {
     intercept(req, next) {
         if (req.url.startsWith(`${this.config.api_url}/service/`)) {
             const service_identifier = req.url.replace(`${this.config.api_url}/service/`, '');
-            const old_parms_keys = req.params.keys();
+            const old_params_keys = req.params.keys();
             const modified_url = req.url;
             let params = new HttpParams();
             const session = this.session.currentSession;
@@ -203,7 +134,7 @@ class EsolveAuthInterceptorService {
                     params = params.set('key', session.key);
                 }
             }
-            old_parms_keys.forEach(key => {
+            old_params_keys.forEach(key => {
                 params = params.set(key, req.params.get(key) || '');
             });
             const modified_req = req.clone({
@@ -261,6 +192,67 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
                 }]
         }] });
 
+class EsolveHttpError {
+    constructor(type, message, error_code) {
+        this.type = type;
+        this.message = message;
+        this.error_code = error_code;
+    }
+}
+
+class EsolveErrorHandlerService {
+    constructor() { }
+    parseException(exception) {
+        const error = new EsolveHttpError('exception', exception.message || 'Unknown exception has occurred', exception.additional_data.exception_type || 'unknown');
+        return error;
+    }
+    parseErrors(response) {
+        const error = new EsolveHttpError('error', 'Unknown error has occurred', 'unknown');
+        if ((response.status.state === 'none') && (response.log.length > 0)) {
+            error.error_code = 'no_response';
+            error.message = 'Response was provided';
+        }
+        else if (response.status.state === 'error') {
+            const login_error_log = response.log[0];
+            error.error_code = login_error_log.message_code;
+            error.message = login_error_log.message;
+        }
+        return error;
+    }
+    handleHttpError(service_type, errorRes) {
+        if (errorRes instanceof HttpErrorResponse) {
+            if (errorRes.status === 500) {
+                const server_error = errorRes.error;
+                if ((server_error.service_type === service_type) ||
+                    (server_error.type !== undefined) ||
+                    (server_error.message !== undefined) ||
+                    (server_error.additional_data !== undefined)) {
+                    return throwError(this.parseException(server_error));
+                }
+            }
+        }
+        else {
+            if (errorRes.type !== undefined) {
+                if (errorRes.type === 'exception') {
+                    return throwError(this.parseException(errorRes));
+                }
+            }
+            else if (errorRes.transaction_type !== undefined) {
+                return throwError(this.parseErrors(errorRes));
+            }
+        }
+        return throwError(errorRes);
+    }
+}
+EsolveErrorHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveErrorHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return []; } });
+
 /**
  * Search Engine Optimization information.
  */
@@ -369,7 +361,7 @@ class EsolveSeoService {
         this.setPageKeywordsTags(seoInfo.keywords);
     }
 }
-EsolveSeoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSeoService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.Title }, { token: i1$1.Meta }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveSeoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSeoService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.Title }, { token: i1.Meta }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveSeoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSeoService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveSeoService, decorators: [{
             type: Injectable,
@@ -379,13 +371,42 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$1.Title }, { type: i1$1.Meta }]; } });
+                }] }, { type: i1.Title }, { type: i1.Meta }]; } });
+
+class EsolveAddress {
+    constructor(id, recipient, address_type, pobox, place_name, street_number, street, suburb, city, province, country, postal_code, latitude, longitude) {
+        this.id = id;
+        this.recipient = recipient;
+        this.address_type = address_type;
+        this.pobox = pobox;
+        this.place_name = place_name;
+        this.street_number = street_number;
+        this.street = street;
+        this.suburb = suburb;
+        this.city = city;
+        this.province = province;
+        this.country = country;
+        this.postal_code = postal_code;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+}
+
+class EsolveRegistrationResult {
+    constructor(user_id, guest, authentication_required, auto_login) {
+        this.user_id = user_id;
+        this.guest = guest;
+        this.authentication_required = authentication_required;
+        this.auto_login = auto_login;
+    }
+}
 
 class EsolveAuthService {
-    constructor(config, http, session) {
+    constructor(config, http, session, errorHandler) {
         this.config = config;
         this.http = http;
         this.session = session;
+        this.errorHandler = errorHandler;
     }
     checkAccessToken(session) {
         var _a;
@@ -403,7 +424,9 @@ class EsolveAuthService {
                 'Accept-Language': '*'
             })
         }).pipe(map(responseData => {
-            if ((responseData.type === 'error') || (responseData.type === 'exception') || (!responseData.additional_data.key_okay)) {
+            if ((responseData.type === 'error') ||
+                (responseData.type === 'exception') ||
+                (!responseData.additional_data.key_okay)) {
                 throw responseData;
             }
             responseData.additional_data.key = token;
@@ -428,7 +451,8 @@ class EsolveAuthService {
                 'Accept-Language': '*'
             })
         }).pipe(tap(responseData => {
-            if ((responseData.type === 'error') || (responseData.type === 'exception')) {
+            if ((responseData.type === 'error') ||
+                (responseData.type === 'exception')) {
                 throw responseData;
             }
         }), catchError(this.handleError), tap(responseData => {
@@ -459,11 +483,13 @@ class EsolveAuthService {
             responseType: 'json',
             observe: 'body'
         }).pipe(map(response => {
-            if ((response.responses === undefined) || (response.responses.length <= 0)) {
+            if ((response.responses === undefined) ||
+                (response.responses.length <= 0)) {
                 throw response;
             }
             const login_response = response.responses[0];
-            if ((login_response.status.state !== 'success') && (login_response.status.state !== 'warning')) {
+            if ((login_response.status.state !== 'success') &&
+                (login_response.status.state !== 'warning')) {
                 throw login_response;
             }
             for (const response_log of login_response.log) {
@@ -474,54 +500,7 @@ class EsolveAuthService {
             }
             throw login_response;
         }), catchError((errorRes) => {
-            const parseException = (exception) => {
-                const exception_type = exception.additional_data.exception_type;
-                const error = {
-                    type: 'exception',
-                    message: exception.message || '',
-                    error_code: exception_type || 'unknown'
-                };
-                return error;
-            };
-            const parseLoginErrors = (login_response) => {
-                const error = {
-                    type: 'error',
-                    message: 'Unknown error has occured',
-                    error_code: 'unknown'
-                };
-                if ((login_response.status.state === 'none') && (login_response.log.length > 0)) {
-                    error.error_code = 'no_response';
-                    error.message = 'Response was provided';
-                }
-                else if (login_response.status.state === 'error') {
-                    const login_error_log = login_response.log[0];
-                    error.error_code = login_error_log.message_code;
-                    error.message = login_error_log.message;
-                }
-                return error;
-            };
-            if (errorRes instanceof HttpErrorResponse) {
-                if (errorRes.status === 500) {
-                    const server_error = errorRes.error;
-                    if ((server_error.service_type === 'set-login') ||
-                        (server_error.type !== undefined) ||
-                        (server_error.message !== undefined) ||
-                        (server_error.additional_data !== undefined)) {
-                        return throwError(parseException(server_error));
-                    }
-                }
-            }
-            else {
-                if (errorRes.type !== undefined) {
-                    if (errorRes.type === 'exception') {
-                        return throwError(parseException(errorRes));
-                    }
-                }
-                else if (errorRes.transaction_type === 'Login') {
-                    return throwError(parseLoginErrors(errorRes));
-                }
-            }
-            return throwError(errorRes);
+            return this.errorHandler.handleHttpError('set-login', errorRes);
         }));
     }
     logout() {
@@ -530,6 +509,7 @@ class EsolveAuthService {
             console.log(error);
         });
     }
+    // Handlers
     handleExpiration() {
         return (session) => {
             this.checkAccessToken(session).then((response) => {
@@ -549,7 +529,9 @@ class EsolveAuthService {
             message: 'An unknown error occurred',
             data: {}
         };
-        if ((!errorRes.type) || (!errorRes.service_type) || (!errorRes.message)) {
+        if ((!errorRes.type) ||
+            (!errorRes.service_type) ||
+            (!errorRes.message)) {
             return throwError(error);
         }
         if (errorRes.message.trim() !== '') {
@@ -561,7 +543,7 @@ class EsolveAuthService {
         return throwError(error);
     }
 }
-EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }, { token: EsolveSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAuthService, decorators: [{
             type: Injectable,
@@ -571,7 +553,104 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }, { type: EsolveSessionService }]; } });
+                }] }, { type: i1$1.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }]; } });
+
+class EsolveAccountService {
+    constructor(config, http, sessionService, errorHandler) {
+        this.config = config;
+        this.http = http;
+        this.sessionService = sessionService;
+        this.errorHandler = errorHandler;
+        this._user_id = 0;
+        this.sessionService.session.subscribe((session) => {
+            if (session.key !== '') {
+                this.user_id = session.id;
+            }
+        });
+    }
+    get user_id() {
+        return this._user_id;
+    }
+    set user_id(value) {
+        value = ((value > 0) ? value : 0);
+        if (this._user_id !== value) {
+            this._user_id = value;
+        }
+    }
+    processUserAddress(records) {
+        const user_addresses = [];
+        if (records && (this._user_id > 0)) {
+            for (const record of records) {
+                if (+record.userid === this._user_id) {
+                    user_addresses.push(new EsolveAddress(+record.id, record.recipient, record.address_type, record.pobox, record.place_name, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude));
+                }
+            }
+        }
+        return user_addresses;
+    }
+    getAddress() {
+        let params = new HttpParams();
+        params = params.set('ws_id', this.config.wsid);
+        params = params.set('user_id', this.user_id.toString());
+        return iif(() => (this.user_id > 0), this.http.get(`${this.config.api_url}/service/get-addresses.php`, { params }).pipe(map(response => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return this.processUserAddress(response.records);
+        }), catchError((err) => {
+            return throwError(err);
+        })), throwError('Log in is required'));
+    }
+    register(user_registration) {
+        const body = {
+            user: user_registration
+        };
+        return this.http.post(`${this.config.api_url}/service/set-registration.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
+            },
+            params: {
+                ws_id: this.config.wsid
+            },
+            responseType: 'json',
+            observe: 'body'
+        }).pipe(map(response => {
+            if ((response.responses === undefined) ||
+                (response.responses.length <= 0)) {
+                throw response;
+            }
+            const registration_response = response.responses[0];
+            if ((registration_response.status.state !== 'success') &&
+                (registration_response.status.state !== 'warning')) {
+                throw registration_response;
+            }
+            for (const response_log of registration_response.log) {
+                if ((response_log.type === 'success') && (response_log.message_code === 'registration_success')) {
+                    let user_id = 0;
+                    if (registration_response.auto_login) {
+                        user_id = registration_response.esolve_id;
+                        this.sessionService.handleUpdateSession(user_id);
+                    }
+                    return new EsolveRegistrationResult(user_id, registration_response.guest, registration_response.authentication_required, registration_response.auto_login);
+                }
+            }
+            throw registration_response;
+        }), catchError((errorRes) => {
+            return this.errorHandler.handleHttpError('set-registration', errorRes);
+        }));
+    }
+}
+EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveAccountService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root'
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$1.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }]; } });
 
 class EsolveMediaArticle {
     constructor(identifier, title, article, image_url = '', tags = [], topics = [], seo_title = '', seo_keywords = '', seo_description = '') {
@@ -679,7 +758,7 @@ class EsolveMediaService {
         }));
     }
 }
-EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMediaService, decorators: [{
             type: Injectable,
@@ -689,7 +768,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveNewsArticle {
     constructor(id, title, sef_title, article, short_description, txdate, active, image, featured, author, seo_title = '', seo_keywords = '') {
@@ -821,7 +900,7 @@ class EsolveNewsService {
         return new EsolveNewsArticle(newsRecord.id, newsRecord.title, newsRecord.sef_title, newsRecord.article, newsRecord.short_description, newsRecord.txdate, newsRecord.active, newsRecord.image, newsRecord.featured, author, newsRecord.seo_page_title, newsRecord.seo_keywords);
     }
 }
-EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveNewsService, decorators: [{
             type: Injectable,
@@ -831,7 +910,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveBanner {
     constructor(id, banner_display_container, identifier, type, title, article, sort_priority, link, images) {
@@ -964,7 +1043,7 @@ class EsolveBannerService {
         }));
     }
 }
-EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveBannerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveBannerService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveBannerService, decorators: [{
             type: Injectable,
@@ -974,7 +1053,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveMenuItem {
     constructor(url, name, target, children = []) {
@@ -1014,7 +1093,7 @@ class EsolveMenuService {
         return menu;
     }
 }
-EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMenuService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMenuService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveMenuService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMenuService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveMenuService, decorators: [{
             type: Injectable,
@@ -1024,7 +1103,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveTopicService {
     constructor(config, http) {
@@ -1064,7 +1143,7 @@ class EsolveTopicService {
         }));
     }
 }
-EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveTopicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveTopicService, decorators: [{
             type: Injectable,
@@ -1074,7 +1153,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveStockBadge {
     constructor(id, text, identifier, font_colour, badge_colour, sort_priority) {
@@ -1199,7 +1278,15 @@ class EsolveStockItem {
     /**
      * Stock badges
      */
-    badges, seo_title = '', seo_keywords = '') {
+    badges, 
+    /**
+     * ID of default category linked to the stock item
+     */
+    category_id, 
+    /**
+     * ID of default subcategory linked to the stock item
+     */
+    subcategory_id, seo_title = '', seo_keywords = '') {
         this.id = id;
         this.code = code;
         this.name = name;
@@ -1212,6 +1299,8 @@ class EsolveStockItem {
         this.tags = tags;
         this.topics = topics;
         this.badges = badges;
+        this.category_id = category_id;
+        this.subcategory_id = subcategory_id;
         if (seo_title.trim() === '') {
             seo_title = this.name;
         }
@@ -1245,7 +1334,7 @@ class EsolveStockItem {
      * Path to original stock image
      */
     get original_image_src() {
-        return 'images/' + (this.image_name ? 'stock/original/' + this.image_name : 'no_image.jpg');
+        return '/images/' + (this.image_name ? 'stock/original/' + this.image_name : 'no_image.jpg');
     }
 }
 
@@ -1289,7 +1378,7 @@ class EsolveStockService {
             }
         }
         const price = new EsolveStockPrice(record.regular_sellprice, record.regular_sellprice_inclusive, record.sellprice, record.sellprice_inclusive);
-        return new EsolveStockItem(+record.id, record.code, record.name, record.sef_name, record.description, !!+record.is_active, !!+record.is_featured, record.image_name, price, tags, topics, badges, record.seo_page_title, record.seo_keywords);
+        return new EsolveStockItem(+record.id, record.code, record.name, record.sef_name, record.description, !!+record.is_active, !!+record.is_featured, record.image_name, price, tags, topics, badges, record.category_id, +record.subcategory_id, record.seo_page_title, record.seo_keywords);
     }
     /**
      * Retrieves stock records from HTTP params.
@@ -1382,7 +1471,7 @@ class EsolveStockService {
         }));
     }
 }
-EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveStockService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveStockService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveStockService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveStockService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveStockService, decorators: [{
             type: Injectable,
@@ -1392,7 +1481,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveCategoryTreeItem {
     constructor(type, esolve_id, parent_id, description, sef_description, short_description, sort_priority, active, display_only, image_name, seo_title, seo_keywords, seo_description, children) {
@@ -1547,7 +1636,7 @@ class EsolveCategoryTreeService {
         return throwError('Invalid options');
     }
 }
-EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveCategoryTreeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
             type: Injectable,
@@ -1557,7 +1646,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }]; } });
 
 class EsolveStockLocation {
     constructor(record) {
@@ -1842,9 +1931,10 @@ class EsolveCartStockItem {
 }
 
 class EsolveCartService {
-    constructor(config, http) {
+    constructor(config, http, errorHandler) {
         this.config = config;
         this.http = http;
+        this.errorHandler = errorHandler;
         this._cached_tracking = 0;
     }
     /**
@@ -2134,59 +2224,12 @@ class EsolveCartService {
                 }
                 return checkout_result.esolve_id;
             }), catchError((errorRes) => {
-                const parseException = (exception) => {
-                    const exception_type = exception.additional_data.exception_type;
-                    const error = {
-                        type: 'exception',
-                        message: exception.message || '',
-                        error_code: exception_type || 'unknown'
-                    };
-                    return error;
-                };
-                const parseCheckoutErrors = (response) => {
-                    const error = {
-                        type: 'error',
-                        message: 'Unknown error has occured',
-                        error_code: 'unknown'
-                    };
-                    if ((response.status.state === 'none') || (response.log.length === 0)) {
-                        error.error_code = 'no_response';
-                        error.message = 'Response was provided';
-                    }
-                    else if (response.status.state === 'error') {
-                        const error_log = response.log[0];
-                        error.error_code = error_log.message_code;
-                        error.message = error_log.message;
-                    }
-                    return error;
-                };
-                if (errorRes instanceof HttpErrorResponse) {
-                    if (errorRes.status === 500) {
-                        const server_error = errorRes.error;
-                        if ((server_error.service_type === 'set-checkout') ||
-                            (server_error.type !== undefined) ||
-                            (server_error.message !== undefined) ||
-                            (server_error.additional_data !== undefined)) {
-                            return throwError(parseException(server_error));
-                        }
-                    }
-                }
-                else {
-                    if (errorRes.type !== undefined) {
-                        if (errorRes.type === 'exception') {
-                            return throwError(parseException(errorRes));
-                        }
-                    }
-                    else if (errorRes.transaction_type !== undefined) {
-                        return throwError(parseCheckoutErrors(errorRes));
-                    }
-                }
-                return throwError(errorRes);
+                return this.errorHandler.handleHttpError('set-checkout', errorRes);
             }));
         }));
     }
 }
-EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveErrorHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveCartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCartService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImport: i0, type: EsolveCartService, decorators: [{
             type: Injectable,
@@ -2196,7 +2239,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1.HttpClient }]; } });
+                }] }, { type: i1$1.HttpClient }, { type: EsolveErrorHandlerService }]; } });
 
 /*
  * Public API Surface of ng-esolve-connect
@@ -2206,5 +2249,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "12.2.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { BankingDetails, EsolveAccountService, EsolveAddress, EsolveAuthService, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, NgEsolveConnectModule };
+export { BankingDetails, EsolveAccountService, EsolveAddress, EsolveAuthService, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveErrorHandlerService, EsolveHttpError, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolveRegistrationResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, NgEsolveConnectModule };
 //# sourceMappingURL=esolve-ng-esolve-connect.js.map