@esolve/ng-esolve-connect 0.15.2 → 0.16.0

package/fesm2020/esolve-ng-esolve-connect.mjs

@@ -7,7 +7,7 @@ import * as i1 from 'ngx-cookie-service';
 import { CookieService } from 'ngx-cookie-service';
 import { BehaviorSubject, throwError, of, iif } from 'rxjs';
 import * as i1$1 from '@angular/platform-browser';
-import { map, tap, catchError, switchMap } from 'rxjs/operators';
+import { map, catchError, tap, switchMap } from 'rxjs/operators';
 
 const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 
@@ -682,162 +682,289 @@ class EsolveLinkedAsset {
     }
 }
 
-class EsolveAuthService {
-    constructor(config, http, session, errorHandler, cookieService) {
-        this.config = config;
-        this.http = http;
-        this.session = session;
-        this.errorHandler = errorHandler;
-        this.cookieService = cookieService;
-    }
-    getAccessToken(email, password, anonymous = false) {
-        let params = new HttpParams();
-        if (anonymous) {
-            params = params.set('anonymous', true);
+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) {
+        this.type = type;
+        this.esolve_id = esolve_id;
+        this.parent_id = parent_id;
+        this.description = description;
+        this.sef_description = sef_description;
+        this.short_description = short_description;
+        this.sort_priority = sort_priority;
+        this.active = active;
+        this.display_only = display_only;
+        this.image_name = image_name;
+        this.id = '';
+        this.image_path = '';
+        if (this.type === 'category') {
+            this.id = `<<CAT>>${this.esolve_id}`;
+            if (children != null) {
+                this.children = children;
+            }
+            this.image_path = '/images/categories/';
         }
-        if (email !== '') {
-            params = params.set('email', email);
+        else {
+            this.id = `<<SUB>>${this.esolve_id}`;
+            this.image_path = '/images/subcategories/';
         }
-        if (password !== '') {
-            params = params.set('password', password);
+        if (seo_title.trim() === '') {
+            seo_title = this.description;
         }
-        return this.http
-            .get(`${this.config.api_url}/get-access-token.php`, {
-            params,
-            headers: new HttpHeaders({
-                'Accept-Language': '*',
-            }),
-        })
-            .pipe(tap((responseData) => {
-            if ((responseData.type === 'error') ||
-                (responseData.type === 'exception')) {
-                throw responseData;
-            }
-        }), catchError(this.handleError), tap((responseData) => {
-            this.handleAuthentication(responseData.additional_data);
-        }));
+        this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
     }
-    autoLogin() {
-        this.session.restore(this.handleExpiration(), () => {
-            this.getAccessToken('', '', true).toPromise().then(() => { }, (error) => {
-                console.error(error);
-            });
-        });
+    get small_image_src() {
+        return this.getImagePath('small');
     }
-    login(email, password) {
-        const body = {
-            login: {
-                email,
-                password
-            }
-        };
+    get thumbnail_image_src() {
+        return this.getImagePath('thumb');
+    }
+    get tiny_image_src() {
+        return this.getImagePath('tiny');
+    }
+    getImagePath(image_size) {
+        if (this.image_name !== '') {
+            return `${this.image_path}${image_size}/${this.image_name}`;
+        }
+        return '';
+    }
+}
+
+class EsolveCategoryTreeService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
+    }
+    /**
+     * Retrieves the category tree from eSolve instance and coverts it to the correct format.
+     */
+    getCategoryTree() {
         return this.http
-            .post(`${this.config.api_url}/set-login.php`, body, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
-            },
-            responseType: 'json',
-            observe: 'body'
-        })
+            .get(`${this.config.api_url}/get-tree.php`)
             .pipe(map((response) => {
-            if ((response.responses === undefined) ||
-                (response.responses.length <= 0)) {
+            if (response.records === undefined) {
                 throw response;
             }
-            const login_response = response.responses[0];
-            if ((login_response.status.state !== 'success') &&
-                (login_response.status.state !== 'warning')) {
-                throw login_response;
-            }
-            for (const response_log of login_response.log) {
-                if ((response_log.type === 'success') &&
-                    (response_log.message_code === 'login_success')) {
-                    const session_data = login_response.session_data;
-                    const user_id = +login_response.esolve_id;
-                    const location_id = +session_data.location_id;
-                    this.session.handleUpdateSession({
-                        user_id: user_id,
-                        location_id: location_id
-                    });
-                    return user_id;
-                }
-            }
-            throw login_response;
-        }), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('set-login', errorRes);
+            return this.processTree(response.records);
         }));
     }
-    logout() {
-        this.session.clearTimer();
-        this.cookieService.delete('_ws_id');
-        return this.getAccessToken('', '', true).toPromise();
+    /**
+     * Retrieve the details of a category tree item from the eSolve instance and
+     * converts it to the correct format.
+     *
+     * @param options Filter options
+     */
+    getCategoryTreeItem(options) {
+        let type;
+        let esolve_id;
+        let sef_description;
+        if (options.id) {
+            const categoryIdentifier = this.processID(options.id);
+            if (categoryIdentifier) {
+                type = categoryIdentifier.type;
+                esolve_id = categoryIdentifier.esolve_id;
+            }
+        }
+        else if (options.type) {
+            type = options.type;
+            if (options.esolve_id) {
+                esolve_id = options.esolve_id;
+            }
+            else if (options.sef_description) {
+                sef_description = options.sef_description;
+            }
+        }
+        if (type && (esolve_id || sef_description)) {
+            let params = new HttpParams();
+            params = params.set('type', type);
+            if (esolve_id) {
+                params = params.set('id', esolve_id);
+            }
+            if (sef_description) {
+                params = params.set('sef_description', sef_description);
+            }
+            return this.http
+                .get(`${this.config.api_url}/get-tree-item.php`, { params })
+                .pipe(map((response) => {
+                if ((response.records === undefined) ||
+                    (response.records.length <= 0)) {
+                    throw response;
+                }
+                return this.processTreeItem(response.records[0]);
+            }));
+        }
+        return throwError('Invalid options');
     }
-    checkAccessToken(session) {
-        session = session || this.session.currentSession;
-        const token = session?.key ?? '';
-        return this.http
-            .get(`${this.config.api_url}/get-access-token.php`, {
-            params: { key: token },
-            headers: new HttpHeaders({
-                'Accept-Language': '*'
-            }),
-        })
-            .pipe(map((responseData) => {
-            if ((responseData.type === 'error') ||
-                (responseData.type === 'exception') ||
-                (!responseData.additional_data.key_okay)) {
-                throw responseData;
+    /**
+     * Processes the eSolve tree records and converts them into the correct format.
+     *
+     * @param tree_records Records to process
+     */
+    processTree(tree_records) {
+        const tree_items = [];
+        if (tree_records) {
+            for (const tree_record of tree_records) {
+                let esolve_id = '';
+                let parent_id = '';
+                let children = [];
+                if (tree_record.type === 'category') {
+                    children = this.processTree(tree_record.children);
+                    esolve_id = tree_record.menu_id;
+                    parent_id = tree_record.owner_menu_id;
+                }
+                else {
+                    esolve_id = tree_record.id;
+                    parent_id = tree_record.menu_id;
+                }
+                tree_items.push(new EsolveCategoryTreeItem(tree_record.type, esolve_id, parent_id, tree_record.description, tree_record.sef_description, tree_record.seo_description, tree_record.sort_priority, tree_record.active, tree_record.display_only, tree_record.image, tree_record.seo_page_title, tree_record.seo_keywords, tree_record.short_description, children));
             }
-            const additional_data = responseData.additional_data;
-            const result = {
-                key: token,
-                expires: additional_data.expires,
-                expiry_time: additional_data.expiry_time,
-                location_id: additional_data.location_id,
-                user_id: additional_data.user_id,
-            };
-            return result;
-        }))
-            .toPromise();
+        }
+        return tree_items;
     }
-    // Handlers
-    handleExpiration() {
-        return (session) => {
-            this.checkAccessToken(session).then((response) => {
-                this.handleAuthentication(response);
-            }, () => {
-                this.logout();
-            });
-        };
+    processTreeItem(record) {
+        return new EsolveCategoryTreeItem(record.type, record.id, record.parent_id, record.description, record.sef_description, record.short_description, record.sort_priority, record.active, record.display_only, record.image, record.seo_page_title, record.seo_keywords, record.seo_description);
     }
-    handleAuthentication(result) {
-        if (!result.key) {
-            return;
+    processID(id) {
+        let type;
+        let esolve_id;
+        const type_code_regex = /^\<\<(CAT|SUB)\>\>/g;
+        const match_results = id.match(type_code_regex);
+        if (match_results) {
+            const type_code = match_results[0];
+            type = (type_code === '<<CAT>>' ? 'category' : 'subcategory');
+            esolve_id = id.replace(type_code_regex, '');
+            return {
+                type,
+                esolve_id
+            };
         }
-        this.session.handleSession(+result.user_id, +result.location_id, result.key, +result.expiry_time, +result.expires, this.handleExpiration());
+        return null;
     }
-    handleError(errorRes) {
-        const error = {
-            message: 'An unknown error occurred',
-            data: {},
-        };
-        if ((!errorRes.type) ||
-            (!errorRes.service_type) ||
-            (!errorRes.message)) {
-            return throwError(error);
+}
+EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCategoryTreeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }]; } });
+
+class EsolveManufacturer {
+    constructor(record) {
+        this.id = 0;
+        this.manufacturer = '';
+        this.sef_manufacturer = '';
+        this.title = '';
+        this.article = '';
+        this.sort_priority = 0;
+        this.is_active = false;
+        this.featured = false;
+        this.image_name = '';
+        let seo_title = '';
+        let seo_keywords = '';
+        let seo_description = '';
+        if (record) {
+            this.id = +(record.id ?? 0);
+            this.manufacturer = record.manufacturer ?? '';
+            this.sef_manufacturer = record.sef_manufacturer ?? '';
+            this.title = record.title ?? '';
+            this.article = record.article ?? '';
+            this.sort_priority = +(record.sort_priority ?? 0);
+            this.image_name = record.image_name ?? '';
+            if (record.is_active) {
+                this.is_active = !!+record.is_active;
+            }
+            if (record.featured) {
+                this.featured = !!+record.featured;
+            }
         }
-        if (errorRes.message.trim() !== '') {
-            error.message = errorRes.message;
+        if (this.title.trim() === '') {
+            this.title = this.manufacturer;
         }
-        if (errorRes.additional_data) {
-            error.data = errorRes.additional_data;
+        if (seo_title.trim() === '') {
+            seo_title = this.title;
         }
-        return throwError(error);
+        this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
+    }
+    get original_image_src() {
+        return this.getImagePath('original');
+    }
+    get small_image_src() {
+        return this.getImagePath('small');
+    }
+    get thumbnail_image_src() {
+        return this.getImagePath('thumb');
+    }
+    get tiny_image_src() {
+        return this.getImagePath('tiny');
+    }
+    getImagePath(image_size) {
+        if (this.image_name !== '') {
+            return `/images/manufacturers/${image_size}/${this.image_name}`;
+        }
+        return '';
+    }
+}
+
+class EsolveManufacturersService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
+    }
+    getManufacturer(id) {
+        const params = new HttpParams({
+            fromObject: { manufacturers_id: id }
+        });
+        return this.getManufacturerSingle(params);
+    }
+    getManufacturerFromSEF(sef_manufacturer) {
+        const params = new HttpParams({
+            fromObject: { sef_manufacturer }
+        });
+        return this.getManufacturerSingle(params);
+    }
+    getManufacturers(options) {
+        let params = new HttpParams();
+        if (options?.featured_only) {
+            params = params.set('featured_only', options.featured_only);
+        }
+        return this.getManufacturerRecords(params).pipe(map((records) => {
+            const manufacturers = [];
+            for (const record of records) {
+                manufacturers.push(this.processManufacturer(record));
+            }
+            return manufacturers;
+        }), catchError(() => {
+            return of([]);
+        }));
+    }
+    getManufacturerSingle(params) {
+        return this.getManufacturerRecords(params).pipe(map((records) => {
+            const record = records[0];
+            return this.processManufacturer(record);
+        }));
+    }
+    getManufacturerRecords(params) {
+        return this.http
+            .get(`${this.config.api_url}/get-manufacturers.php`, { params })
+            .pipe(map((response) => {
+            if ((response.records === undefined) ||
+                (response.records.length <= 0)) {
+                throw response;
+            }
+            return response.records;
+        }));
+    }
+    processManufacturer(record) {
+        return new EsolveManufacturer(record);
     }
 }
-EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, decorators: [{
+EsolveManufacturersService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveManufacturersService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveManufacturersService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveManufacturersService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveManufacturersService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -845,270 +972,226 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveCookieService }]; } });
-
-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 EsolveAddressResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        this.id = response.esolve_id;
-        this.address_validated = response.address_validated;
-        this.geocode_status = response.geocode_status;
-        this.geocode_result = response.geocode_result;
-    }
-}
+                }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveUserAccount {
-    constructor(esolve_id, email, registration_type, title, first_name, last_name, initials, gender, identification_number) {
-        this.esolve_id = esolve_id;
-        this.email = email;
-        this.registration_type = registration_type;
-        this.title = title;
-        this.first_name = first_name;
-        this.last_name = last_name;
-        this.initials = initials;
-        this.gender = gender;
-        this.identification_number = identification_number;
-    }
-}
+// Types
 
-class EsolveUserAccountResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
+class EsolveRange {
+    constructor(record) {
         this.id = 0;
-        this.id = +response.esolve_id;
-    }
-}
-
-class EsolveUserAccountBusiness {
-    constructor(name, vat_number, description, type) {
-        this.name = name;
-        this.vat_number = vat_number;
-        this.description = description;
-        this.type = type;
-    }
-}
-
-class EsolveUserAccountContact {
-    constructor(tel_number, cell_number, fax_number) {
-        this.tel_number = tel_number;
-        this.cell_number = cell_number;
-        this.fax_number = fax_number;
+        this.range = '';
+        this.sef_range = '';
+        this.manufacturers_id = 0;
+        this.title = '';
+        this.article = '';
+        this.is_active = false;
+        this.featured = false;
+        this.sort_priority = 0;
+        this.image_name = '';
+        let seo_title = '';
+        let seo_keywords = '';
+        let seo_description = '';
+        if (record) {
+            this.id = +(record.id ?? 0);
+            this.range = record.range ?? '';
+            this.sef_range = record.sef_range ?? '';
+            this.manufacturers_id = +(record.manufacturers_id ?? 0);
+            this.title = record.title ?? '';
+            this.article = record.article ?? '';
+            this.sort_priority = +(record.sort_priority ?? 0);
+            this.image_name = record.image_name ?? '';
+            if (record.is_active) {
+                this.is_active = !!+record.is_active;
+            }
+            if (record.featured) {
+                this.featured = !!+record.featured;
+            }
+            seo_title = record.seo_page_title ?? '';
+            seo_keywords = record.seo_keywords ?? '';
+            seo_description = record.seo_description ?? '';
+        }
+        if (this.title.trim() === '') {
+            this.title = this.range;
+        }
+        if (seo_title.trim() === '') {
+            seo_title = this.title;
+        }
+        this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
     }
-}
-
-class EsolveTransactionAddress {
-    constructor(recipient, address_type, address_description, street_number, street, suburb, city, province, country, postal_code, pobox) {
-        this.recipient = recipient;
-        this.address_type = address_type;
-        this.address_description = address_description;
-        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.pobox = pobox;
+    get image_src() {
+        return this.getImagePath();
     }
-}
-
-class EsolveTransactionClient {
-    constructor(id, account, company_name, branch_code, email, first_name, last_name, contact_number) {
-        this.id = id;
-        this.account = account;
-        this.company_name = company_name;
-        this.branch_code = branch_code;
-        this.email = email;
-        this.first_name = first_name;
-        this.last_name = last_name;
-        this.contact_number = contact_number;
+    getImagePath() {
+        if (this.image_name !== '') {
+            return `/images/ranges/${this.image_name}`;
+        }
+        return '';
     }
 }
 
-class EsolveTransactionItem {
-    constructor(code, name, qty, discount, vat_rate, price, line_total) {
-        this.code = code;
-        this.name = name;
-        this.qty = qty;
-        this.discount = discount;
-        this.vat_rate = vat_rate;
-        this.price = price;
-        this.line_total = line_total;
+class EsolveRangesService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
     }
-}
-
-class EsolveTransactionItemPrice {
-    constructor(
-    /**
-     * Price without tax
-     */
-    price, 
-    /**
-     * Price with tax
-     */
-    price_with_tax, 
-    /**
-     * Price without tax and with discounts applied if applicable
-     */
-    price_discounted, 
-    /**
-     * Price with tax and with discounts applied if applicable
-     */
-    price_with_tax_discounted) {
-        this.price = price;
-        this.price_with_tax = price_with_tax;
-        this.price_discounted = price_discounted;
-        this.price_with_tax_discounted = price_with_tax_discounted;
+    getRange(id) {
+        const params = new HttpParams({
+            fromObject: { ranges_id: id }
+        });
+        return this.getRangeSingle(params);
     }
-}
-
-class EsolveLocationAddress {
-    constructor(street, suburb, city, province, country, postal_code, latitude, longitude) {
-        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;
+    getRangeFromSEF(sef_range) {
+        const params = new HttpParams({
+            fromObject: { sef_range }
+        });
+        return this.getRangeSingle(params);
     }
-}
-
-class EsolveLocationContactInfo {
-    constructor(telnumber, cellnumber, email, fax) {
-        this.telnumber = telnumber;
-        this.cellnumber = cellnumber;
-        this.email = email;
-        this.fax = fax;
+    getRanges(options) {
+        let params = new HttpParams();
+        if (options?.featured_only) {
+            params = params.set('featured_only', options.featured_only);
+        }
+        if (options?.manufacturers_id) {
+            params = params.set('manufacturers_id', options.manufacturers_id);
+        }
+        return this.getRangeRecords(params).pipe(map((records) => {
+            const ranges = [];
+            for (const record of records) {
+                ranges.push(this.processRange(record));
+            }
+            return ranges;
+        }), catchError(() => {
+            return of([]);
+        }));
     }
-}
-
-class EsolveLocationPOBoxAddress {
-    constructor(pobox, city, postal_code) {
-        this.pobox = pobox;
-        this.city = city;
-        this.postal_code = postal_code;
+    getRangeSingle(params) {
+        return this.getRangeRecords(params).pipe(map((records) => {
+            const record = records[0];
+            return this.processRange(record);
+        }));
     }
-}
-
-class EsolveLocationTradingTimes {
-    constructor(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, trading_hours_additional_info = '') {
-        this.monday = monday;
-        this.tuesday = tuesday;
-        this.wednesday = wednesday;
-        this.thursday = thursday;
-        this.friday = friday;
-        this.saturday = saturday;
-        this.sunday = sunday;
-        this.public_holiday = public_holiday;
-        this.trading_hours_additional_info = trading_hours_additional_info;
+    getRangeRecords(params) {
+        return this.http
+            .get(`${this.config.api_url}/get-ranges.php`, { params })
+            .pipe(map((response) => {
+            if ((response.records === undefined) ||
+                (response.records.length <= 0)) {
+                throw response;
+            }
+            return response.records;
+        }));
     }
-}
-
-class EsolveLocationTradingDay {
-    constructor(open, close) {
-        this.open = open;
-        this.close = close;
+    processRange(record) {
+        return new EsolveRange(record);
     }
-}
+}
+EsolveRangesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveRangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveLocation {
+class EsolveTag {
     constructor(record) {
-        this.id = +record.id;
-        this.identifier = record.identifier;
-        this.description = record.description;
-        this.head_office = record.head_office;
-        this.erp_identifier = record.erp_identifier;
-        this.external_system_code = record.external_system_code;
-        this.default_location_for_payment_methods = record.default_location_for_payment_methods;
-        this.userid = +record.userid;
-        this.importance = +record.importance;
-        this.active = record.is_active;
-        this.website_url = record.website_url;
-        this.address = new EsolveLocationAddress(record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude);
-        this.pobox_address = new EsolveLocationPOBoxAddress(record.pobox, record.pobox_city, record.pobox_postal_code);
-        const telnumbers = [];
-        if (record.branch_telnumber.length > 0) {
-            telnumbers.push(record.branch_telnumber);
-        }
-        if (record.branch_telnumber_2.length > 0) {
-            telnumbers.push(record.branch_telnumber_2);
+        this.id = 0;
+        this.phrase = '';
+        this.weight = 0;
+        this.description = '';
+        this.image_name = '';
+        if (record) {
+            this.id = +(record.id ?? 0);
+            this.phrase = record.tag_phrase ?? '';
+            this.weight = +(record.tag_weight ?? 0);
+            this.description = record.description ?? '';
+            this.image_name = record.image_name ?? '';
         }
-        if (record.branch_telnumber_3.length > 0) {
-            telnumbers.push(record.branch_telnumber_3);
+    }
+    /**
+     * @deprecated To be removed in the future. Use `EsolveTag.phrase` instead
+     */
+    get tag_phrase() {
+        return this.phrase;
+    }
+    /**
+     * @deprecated To be removed in the future. Use `EsolveTag.weight` instead
+     */
+    get tag_weight() {
+        return this.weight;
+    }
+    getImagePath() {
+        if (this.image_name !== '') {
+            return `/images/tags/${this.image_name}`;
         }
-        this.contact_info = new EsolveLocationContactInfo(telnumbers, record.branch_cellnumber, record.branch_email, record.branch_fax);
-        const monday = new EsolveLocationTradingDay(record.monday_open_time, record.monday_close_time);
-        const tuesday = new EsolveLocationTradingDay(record.tuesday_open_time, record.tuesday_close_time);
-        const wednesday = new EsolveLocationTradingDay(record.wednesday_open_time, record.wednesday_close_time);
-        const thursday = new EsolveLocationTradingDay(record.thursday_open_time, record.thursday_close_time);
-        const friday = new EsolveLocationTradingDay(record.friday_open_time, record.friday_close_time);
-        const saturday = new EsolveLocationTradingDay(record.saturday_open_time, record.saturday_close_time);
-        const sunday = new EsolveLocationTradingDay(record.sunday_open_time, record.sunday_close_time);
-        const public_holiday = new EsolveLocationTradingDay(record.public_holiday_open_time, record.public_holiday_close_time);
-        this.trading_times = new EsolveLocationTradingTimes(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, record.trading_hours_additional_info);
+        return '';
     }
 }
 
-class EsolveLocationsService {
+class EsolveTagsService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
     /**
-     * Retrieves a list of stock locations
+     * Retrieves active topics from the list of topic ID's. Note that inactive or expired
+     * topics will not be retrieved.
      *
-     * @returns An `Observable` with an array of stock locations
+     * @param options Tag filters
      */
-    getStockLocations() {
-        return this.http
-            .get(`${this.config.api_url}/get-locations.php`)
-            .pipe(map((response) => {
+    getTags(options) {
+        const params = this.parseOptions(options);
+        return this.http.get(`${this.config.api_url}/get-tags.php`, { params }).pipe(map(response => {
             if (response.records === undefined) {
                 throw response;
             }
-            return this.processStockLocations(response.records);
+            return this.processTags(response.records);
         }));
     }
-    /**
-     * Processes the eSolve stock location records.
-     *
-     * @param records Records to process
-     * @returns An array of processed stock location records
-     */
-    processStockLocations(records) {
-        const stock_locations = [];
+    parseOptions(options) {
+        let params = new HttpParams();
+        if (options) {
+            if (options.tags_id) {
+                if (Array.isArray(options.tags_id)) {
+                    const tag_list = options.tags_id;
+                    if (tag_list.length > 0) {
+                        params = params.append('tags_id', tag_list.join(','));
+                    }
+                }
+                else {
+                    params = params.append('tags_id', options.tags_id);
+                }
+            }
+            else {
+                if (options.phrase && options.phrase !== '') {
+                    params = params.append('phrase', options.phrase);
+                    const phrase_match_mode = options.phrase_match_mode;
+                    if (phrase_match_mode) {
+                        params = params.append('phrase_match_mode', phrase_match_mode);
+                    }
+                }
+            }
+        }
+        return params;
+    }
+    processTags(records) {
+        const tags = [];
         if (records) {
             for (const record of records) {
-                stock_locations.push(new EsolveLocation(record));
+                const tag = new EsolveTag(record);
+                tags.push(tag);
             }
         }
-        return stock_locations;
+        return tags;
     }
 }
-EsolveLocationsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveLocationsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, decorators: [{
+EsolveTagsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTagsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveTagsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTagsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTagsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1118,564 +1201,636 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveTransactionLocation extends EsolveLocation {
-}
-
-class EsolveTransactionPaymentMethod {
-    constructor(id, name, description, integration_type, service_provider) {
-        this.id = id;
-        this.name = name;
-        this.description = description;
-        this.integration_type = integration_type;
-        this.service_provider = service_provider;
-    }
-}
-
-class EsolveTransactionShippingMethod {
-    constructor(id, name, delivery_category, location, description, pricing, client_to_collect) {
-        this.id = id;
-        this.name = name;
-        this.delivery_category = delivery_category;
-        this.location = location;
-        this.description = description;
-        this.pricing = pricing;
-        this.client_to_collect = client_to_collect;
-    }
-}
-
-class EsolveTransactionUser {
-    constructor(id, email, first_name, last_name, tel_number, cell_number) {
-        this.id = id;
-        this.email = email;
-        this.first_name = first_name;
-        this.last_name = last_name;
-        this.tel_number = tel_number;
-        this.cell_number = cell_number;
-    }
-}
+// Types
 
-class EsolveTransaction {
+class EsolveTopic {
     constructor(record) {
-        // Transaction Items
-        this.items = [];
-        this.id = +record.id;
-        this.type = record.transaction_type;
-        this.status = record.status;
-        this.loyalty_number = record.loyaltynumber;
-        this.external_order_number = record.external_order_number;
-        this.external_invoice_number = record.external_invoice_number;
-        this.date = new Date(+record.txdate_timestamp * 1000);
-        this.expected_date = new Date(+record.expected_date_timestamp * 1000);
-        this.invoice_amount = +record.invoice_amount;
-        this.vat = +record.vat;
-        this.discount = +record.discount;
-        this.total = +record.total;
-        this.shipping_total = +record.shipping_total;
-        this.insurance_total = +record.insurance_total;
-        this.payment = +record.payment;
-        this.payment_reference = record.payment_reference;
-        this.payment_description = record.payment_description;
-        this.gateway_transaction_id = record.gateway_transaction_id;
-        this.address = new EsolveTransactionAddress(record.recipient, record.address_type, record.address_description, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, record.pobox);
-        if (record.user) {
-            this.user = new EsolveTransactionUser(+record.user.id, record.user.email, record.user.firstname, record.user.surname, record.user.telnumber, record.user.cellnumber);
-        }
-        if (record.client) {
-            this.client = new EsolveTransactionClient(+record.client.id, record.client.account, record.client.company_name, record.client.branch_code, record.client.email, record.client.firstname, record.client.surname, record.client.contact_number);
-        }
-        if (record.location_details) {
-            this.location = new EsolveTransactionLocation(record.location_details);
-        }
-        if (record.payment_method_details) {
-            this.payment_method = new EsolveTransactionPaymentMethod(record.payment_method_details.id, record.payment_method_details.paymethod_name, record.payment_method_details.description, record.payment_method_details.integration_type, record.payment_method_details.service_provider);
-        }
-        if (record.shipping_method_details) {
-            this.shipping_method = new EsolveTransactionShippingMethod(+record.shipping_method_details.id, record.shipping_method_details.carrier_name, record.shipping_method_details.delivery_category, record.shipping_method_details.location, record.shipping_method_details.description, record.shipping_method_details.pricing, !!record.shipping_method_details.client_to_collect);
-        }
-        this.parseTransactionItems(record.transaction_items);
-    }
-    parseTransactionItems(record_items) {
-        for (const record_item of record_items) {
-            const price = new EsolveTransactionItemPrice(+record_item.price_exclusive, +record_item.price_inclusive, +record_item.price_exclusive_after_discount, +record_item.price_inclusive_after_discount);
-            const line_total = new EsolveTransactionItemPrice(+record_item.line_total_exclusive, +record_item.line_total_inclusive, +record_item.line_total_exclusive_after_discount, +record_item.line_total_inclusive_after_discount);
-            const item = new EsolveTransactionItem(record_item.code, record_item.name, +record_item.qty, +record_item.discount, +record_item.vat_rate, price, line_total);
-            this.items.push(item);
+        this.id = 0;
+        this.name = '';
+        this.short_description = '';
+        this.sort_priority = 0;
+        if (record) {
+            this.id = +(record.id ?? 0);
+            this.name = record.name ?? '';
+            this.short_description = record.short_description ?? '';
+            this.sort_priority = +(record.sort_priority ?? 0);
         }
     }
 }
 
-class EsolveTransactionList extends EsolveList {
-}
-
-// Classes
-
-class EsolveChangePasswordResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        this.password_updated = (response.status.state === 'success');
+class EsolveTopicService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
     }
-}
-
-class EsolveResetPasswordResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        this.id = response.esolve_id;
-        this.reset_success = response.reset_success;
-        this.password_matches_old = response.password_matches_old;
-        this.login_required = response.login_required;
+    /**
+     * Retrieves active topics from the list of topic ID's. Note that inactive or expired
+     * topics will not be retrieved.
+     *
+     * @param topic_id_list List of topic ID's that need to be retrieved
+     */
+    getTopics(topic_id_list = []) {
+        let params = new HttpParams();
+        if (topic_id_list.length > 0) {
+            params = params.append('topic_id', topic_id_list.join(','));
+        }
+        return this.http.get(`${this.config.api_url}/get-topics.php`, { params }).pipe(map(response => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return this.processTopics(response.records);
+        }));
     }
-}
-
-class EsolveRegistrationResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        this.user_id = response.esolve_id;
-        this.guest = response.guest;
-        this.auto_login = response.auto_login;
-        this.authentication_required = response.authentication_required;
-        this.location_id = response.session_data.location_id;
+    processTopics(records) {
+        const topics = [];
+        if (records) {
+            for (const record of records) {
+                const topic = new EsolveTopic(record);
+                topics.push(topic);
+            }
+        }
+        return topics;
     }
-}
+}
+EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveTopicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveLocationUpdateResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        this.location_updated = (response.esolve_id > 0);
+class EsolveAsset {
+    constructor(record) {
+        this.id = 0;
+        this.src = '';
+        this.name = '';
+        this.description = '';
+        this.document_number = '';
+        this.document_type = '';
+        this.area_of_application = '';
+        this.asset_category = '';
+        this.asset_sub_category = '';
+        this.sort_priority = 0;
+        this.topics = [];
+        this.tags = [];
+        this.id = +record.id;
+        this.src = record.src;
+        this.name = record.name;
+        this.type = record.type;
+        this.description = record.description;
+        this.document_number = record.document_number ?? '';
+        this.document_type = record.document_type ?? '';
+        this.area_of_application = record.area_of_application ?? '';
+        this.asset_category = record.asset_category ?? '';
+        this.asset_sub_category = record.asset_sub_category ?? '';
+        this.sort_priority = +(record.sort_priority ?? '');
+        if (record.created) {
+            this.created = record.created;
+        }
+        if (record.category) {
+            this.category = new EsolveCategoryTreeItem(record.category.type, record.category.id, record.category.parent_id, record.category.description, record.category.sef_description, record.category.short_description, record.category.sort_priority, record.category.active, record.category.display_only, record.category.image, record.category.seo_page_title, record.category.seo_keywords, record.category.seo_description);
+        }
+        if (record.subcategory) {
+            this.subcategory = new EsolveCategoryTreeItem(record.subcategory.type, record.subcategory.id, record.subcategory.parent_id, record.subcategory.description, record.subcategory.sef_description, record.subcategory.short_description, record.subcategory.sort_priority, record.subcategory.active, record.subcategory.display_only, record.subcategory.image, record.subcategory.seo_page_title, record.subcategory.seo_keywords, record.subcategory.seo_description);
+        }
+        if (record.manufacturer) {
+            this.manufacturer = new EsolveManufacturer(record.manufacturer);
+        }
+        if (record.range) {
+            this.range = new EsolveRange(record.range);
+        }
+        if (record.topics && record.topics.length > 0) {
+            for (const topic of record.topics) {
+                this.topics.push(new EsolveTopic(topic));
+            }
+        }
+        if (record.tags && record.tags.length > 0) {
+            for (const tag of record.tags) {
+                this.tags.push(new EsolveTag(tag));
+            }
+        }
     }
 }
 
-class EsolveAccountService {
-    constructor(config, http, sessionService, errorHandler, responseHandler) {
+class EsolveAssetsService {
+    constructor(config, http) {
         this.config = config;
         this.http = http;
-        this.sessionService = sessionService;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
-        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;
-        }
-    }
-    updateUserAccount(user_account_data) {
-        const body = {
-            account: user_account_data
-        };
-        return this.http
-            .post(`${this.config.api_url}/set-user-account.php`, body, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
-            },
-            responseType: 'json',
-            observe: 'body'
-        })
-            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveUserAccountResult(response))), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('set-user-account', errorRes);
-        }));
     }
-    getUserAccount() {
-        return this.http
-            .get(`${this.config.api_url}/get-account.php`)
-            .pipe(map((response) => {
+    getAsset(id) {
+        const params = new HttpParams({ fromObject: { assets_id: id } });
+        return this.getAssetRecords(params).pipe(map((response) => {
             if ((response.records === undefined) ||
-                (response.records.length === 0)) {
+                (response.records.length <= 0)) {
                 throw response;
             }
             const record = response.records[0];
-            return this.processUserAccount(record);
+            return this.processAsset(record);
         }));
     }
-    setAddress(address_post_data) {
-        const body = {
-            address: address_post_data
-        };
-        return this.http
-            .post(`${this.config.api_url}/set-address.php`, body, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;',
-            },
-            responseType: 'json',
-            observe: 'body',
-        })
-            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveAddressResult(response))), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('set-registration', errorRes);
+    getAssets(options) {
+        const params = this.parseOptions(options);
+        return this.getAssetRecords(params).pipe(map((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            const assets = [];
+            for (const record of response.records) {
+                assets.push(this.processAsset(record));
+            }
+            const page = options?.page ?? 0;
+            const rows = options?.rows ?? 0;
+            const total = +response.additional_data.total_records;
+            return new EsolveList(assets, page, rows, total);
         }));
     }
-    getAddresses() {
-        try {
-            this.loginGuard();
-            return this.http
-                .get(`${this.config.api_url}/get-addresses.php`, {
-                params: { user_id: this.user_id }
-            })
-                .pipe(map((response) => {
-                if (response.records === undefined) {
-                    throw response;
-                }
-                return this.processUserAddress(response.records);
-            }));
+    processAsset(record) {
+        return new EsolveAsset(record);
+    }
+    parseOptions(options) {
+        let params = new HttpParams();
+        if (!options) {
+            return params;
         }
-        catch (error) {
-            return throwError(error);
+        if (options.page) {
+            params = params.set('page', options.page);
+        }
+        if (options.rows) {
+            params = params.set('rows', options.rows);
+        }
+        if (options.asset_type) {
+            params = params.set('asset_type', options.asset_type);
+        }
+        if (options.category_id) {
+            params = params.set('category_id', options.category_id);
+        }
+        if (options.subcategory_id) {
+            params = params.set('subcategory_id', options.subcategory_id);
+        }
+        if (options.manufacturers_id) {
+            params = params.set('manufacturers_id', options.manufacturers_id);
+        }
+        if (options.ranges_id) {
+            params = params.set('ranges_id', options.ranges_id);
+        }
+        if (options.asset_category) {
+            params = params.set('asset_category', options.asset_category);
         }
+        if (options.asset_sub_category) {
+            params = params.set('asset_sub_category', options.asset_sub_category);
+        }
+        return params;
     }
-    deleteAddress(id) {
-        return this.http
-            .delete(`${this.config.api_url}/delete-address.php`, {
-            params: { id },
-            responseType: 'json',
-            observe: 'body'
-        })
-            .pipe(map((http_response) => {
-            if ((http_response.result === undefined) ||
-                (http_response.result === null) ||
-                (http_response.result.status !== 'success')) {
-                throw http_response;
-            }
-            return new EsolveResult(http_response.result.status, http_response.result.code, http_response.result.message);
-        }), catchError((errorRes) => {
-            return this.errorHandler.handleHttpDeleteError('delete-address', errorRes);
-        }));
+    getAssetRecords(params) {
+        return this.http.get(`${this.config.api_url}/get-assets.php`, { params });
     }
-    register(user_registration) {
-        const body = {
-            user: user_registration
-        };
-        return this.http
-            .post(`${this.config.api_url}/set-registration.php`, body, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
-            },
-            responseType: 'json',
-            observe: 'body'
-        })
-            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
-            if (response.auto_login) {
-                this.sessionService.handleUpdateSession({
-                    user_id: +response.esolve_id,
-                    location_id: +response.session_data.location_id,
-                });
-            }
-            return new EsolveRegistrationResult(response);
-        })), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('set-registration', errorRes);
-        }));
+}
+EsolveAssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAssetsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAssetsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAssetsService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }]; } });
+
+// Types
+
+class EsolveAuthService {
+    constructor(config, http, session, errorHandler, cookieService) {
+        this.config = config;
+        this.http = http;
+        this.session = session;
+        this.errorHandler = errorHandler;
+        this.cookieService = cookieService;
     }
-    changePassword(password, confirm_password) {
-        const body = {
-            password,
-            confirm_password
-        };
+    getAccessToken(email, password, anonymous = false) {
+        let params = new HttpParams();
+        if (anonymous) {
+            params = params.set('anonymous', true);
+        }
+        if (email !== '') {
+            params = params.set('email', email);
+        }
+        if (password !== '') {
+            params = params.set('password', password);
+        }
         return this.http
-            .post(`${this.config.api_url}/set-change-password.php`, body, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
-            },
-            responseType: 'json',
-            observe: 'body'
+            .get(`${this.config.api_url}/get-access-token.php`, {
+            params,
+            headers: new HttpHeaders({
+                'Accept-Language': '*',
+            }),
         })
-            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
-            return new EsolveChangePasswordResult(response);
-        })), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('set-change-password', errorRes);
-        }));
-    }
-    sendForgotPasswordRequest(email) {
-        return this.http
-            .get(`${this.config.api_url}/get-forgot-password.php`, { params: { email } })
-            .pipe(map((response) => {
-            if ((response.records === undefined) ||
-                !('reset_link_sent' in response.records)) {
-                throw response;
+            .pipe(tap((responseData) => {
+            if ((responseData.type === 'error') ||
+                (responseData.type === 'exception')) {
+                throw responseData;
             }
-            return response.records.reset_link_sent;
+        }), catchError(this.handleError), tap((responseData) => {
+            this.handleAuthentication(responseData.additional_data);
         }));
     }
-    resetPassword(reset_key, password, confirm_password, auto_login = true) {
+    autoLogin() {
+        this.session.restore(this.handleExpiration(), () => {
+            this.getAccessToken('', '', true).toPromise().then(() => { }, (error) => {
+                console.error(error);
+            });
+        });
+    }
+    login(email, password) {
+        const body = {
+            login: {
+                email,
+                password
+            }
+        };
         return this.http
-            .post(`${this.config.api_url}/set-forgot-password.php`, {
-            reset_key,
-            password,
-            confirm_password,
-            auto_login
-        }, {
+            .post(`${this.config.api_url}/set-login.php`, body, {
             headers: {
                 'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
             responseType: 'json',
             observe: 'body'
         })
-            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
-            if (!response.login_required) {
-                this.sessionService.handleUpdateSession({
-                    user_id: +response.esolve_id,
-                    location_id: +response.session_data.location_id,
-                });
+            .pipe(map((response) => {
+            if ((response.responses === undefined) ||
+                (response.responses.length <= 0)) {
+                throw response;
             }
-            return new EsolveResetPasswordResult(response);
-        })), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('set-forgot-password', errorRes);
+            const login_response = response.responses[0];
+            if ((login_response.status.state !== 'success') &&
+                (login_response.status.state !== 'warning')) {
+                throw login_response;
+            }
+            for (const response_log of login_response.log) {
+                if ((response_log.type === 'success') &&
+                    (response_log.message_code === 'login_success')) {
+                    const session_data = login_response.session_data;
+                    const user_id = +login_response.esolve_id;
+                    const location_id = +session_data.location_id;
+                    this.session.handleUpdateSession({
+                        user_id: user_id,
+                        location_id: location_id
+                    });
+                    return user_id;
+                }
+            }
+            throw login_response;
+        }), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-login', errorRes);
         }));
     }
-    updateLocation(location_id) {
-        const body = { location_id };
+    logout() {
+        this.session.clearTimer();
+        this.cookieService.delete('_ws_id');
+        return this.getAccessToken('', '', true).toPromise();
+    }
+    checkAccessToken(session) {
+        session = session || this.session.currentSession;
+        const token = session?.key ?? '';
         return this.http
-            .post(`${this.config.api_url}/set-session-location.php`, body, {
-            headers: {
-                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
-            },
-            responseType: 'json',
-            observe: 'body',
+            .get(`${this.config.api_url}/get-access-token.php`, {
+            params: { key: token },
+            headers: new HttpHeaders({
+                'Accept-Language': '*'
+            }),
         })
-            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
-            this.sessionService.handleUpdateSession({ location_id });
-            return new EsolveLocationUpdateResult(response);
-        })));
+            .pipe(map((responseData) => {
+            if ((responseData.type === 'error') ||
+                (responseData.type === 'exception') ||
+                (!responseData.additional_data.key_okay)) {
+                throw responseData;
+            }
+            const additional_data = responseData.additional_data;
+            const result = {
+                key: token,
+                expires: additional_data.expires,
+                expiry_time: additional_data.expiry_time,
+                location_id: additional_data.location_id,
+                user_id: additional_data.user_id,
+            };
+            return result;
+        }))
+            .toPromise();
     }
-    getTransactions(options = {}) {
-        try {
-            this.loginGuard();
-            return this.http
-                .get(`${this.config.api_url}/get-transactions.php`, {
-                params: {
-                    user_id: this.user_id,
-                    ...options,
-                }
-            })
-                .pipe(map((response) => {
-                if (response.records === undefined) {
-                    throw response;
-                }
-                const items = this.processTransactions(response.records);
-                const total = +response.additional_data.total_records ?? 0;
-                const rows = options.rows ?? total;
-                const page = options.page || 1;
-                return new EsolveTransactionList(items, page, rows, total);
-            }));
+    // Handlers
+    handleExpiration() {
+        return (session) => {
+            this.checkAccessToken(session).then((response) => {
+                this.handleAuthentication(response);
+            }, () => {
+                this.logout();
+            });
+        };
+    }
+    handleAuthentication(result) {
+        if (!result.key) {
+            return;
         }
-        catch (error) {
+        this.session.handleSession(+result.user_id, +result.location_id, result.key, +result.expiry_time, +result.expires, this.handleExpiration());
+    }
+    handleError(errorRes) {
+        const error = {
+            message: 'An unknown error occurred',
+            data: {},
+        };
+        if ((!errorRes.type) ||
+            (!errorRes.service_type) ||
+            (!errorRes.message)) {
             return throwError(error);
         }
-    }
-    getTransaction(id) {
-        try {
-            this.loginGuard();
-            return this.http
-                .get(`${this.config.api_url}/get-transactions.php`, {
-                params: {
-                    user_id: this.user_id,
-                    transaction_id: id,
-                }
-            })
-                .pipe(map((response) => {
-                if ((response.records === undefined) ||
-                    (response.records.length <= 0)) {
-                    throw response;
-                }
-                const items = this.processTransactions(response.records);
-                return items[0];
-            }));
+        if (errorRes.message.trim() !== '') {
+            error.message = errorRes.message;
         }
-        catch (error) {
-            return throwError(error);
+        if (errorRes.additional_data) {
+            error.data = errorRes.additional_data;
         }
+        return throwError(error);
+    }
+}
+EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveCookieService }]; } });
+
+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 EsolveAddressResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.id = response.esolve_id;
+        this.address_validated = response.address_validated;
+        this.geocode_status = response.geocode_status;
+        this.geocode_result = response.geocode_result;
+    }
+}
+
+class EsolveUserAccount {
+    constructor(esolve_id, email, registration_type, title, first_name, last_name, initials, gender, identification_number) {
+        this.esolve_id = esolve_id;
+        this.email = email;
+        this.registration_type = registration_type;
+        this.title = title;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.initials = initials;
+        this.gender = gender;
+        this.identification_number = identification_number;
+    }
+}
+
+class EsolveUserAccountResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.id = 0;
+        this.id = +response.esolve_id;
+    }
+}
+
+class EsolveUserAccountBusiness {
+    constructor(name, vat_number, description, type) {
+        this.name = name;
+        this.vat_number = vat_number;
+        this.description = description;
+        this.type = type;
+    }
+}
+
+class EsolveUserAccountContact {
+    constructor(tel_number, cell_number, fax_number) {
+        this.tel_number = tel_number;
+        this.cell_number = cell_number;
+        this.fax_number = fax_number;
+    }
+}
+
+class EsolveTransactionAddress {
+    constructor(recipient, address_type, address_description, street_number, street, suburb, city, province, country, postal_code, pobox) {
+        this.recipient = recipient;
+        this.address_type = address_type;
+        this.address_description = address_description;
+        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.pobox = pobox;
+    }
+}
+
+class EsolveTransactionClient {
+    constructor(id, account, company_name, branch_code, email, first_name, last_name, contact_number) {
+        this.id = id;
+        this.account = account;
+        this.company_name = company_name;
+        this.branch_code = branch_code;
+        this.email = email;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.contact_number = contact_number;
     }
-    processUserAccount(record) {
-        if (!record) {
-            throw new Error('Invalid record');
-        }
-        if (+record.userid !== this._user_id) {
-            throw new Error('Invalid user account retrieved');
-        }
-        const user_account = new EsolveUserAccount(+record.userid, record.email, record.registration_type, record.title, record.firstname, record.surname, record.initials, record.gender, record.idnumber);
-        user_account.contact_details = new EsolveUserAccountContact(record.telnumber, record.cellnumber, record.fax);
-        user_account.business_details = new EsolveUserAccountBusiness(record.busname, record.vatnum, record.busdescript, record.business_type);
-        return user_account;
+}
+
+class EsolveTransactionItem {
+    constructor(code, name, qty, discount, vat_rate, price, line_total) {
+        this.code = code;
+        this.name = name;
+        this.qty = qty;
+        this.discount = discount;
+        this.vat_rate = vat_rate;
+        this.price = price;
+        this.line_total = line_total;
     }
-    processUserAddress(records) {
-        const user_addresses = [];
-        if (!records || (this._user_id === 0)) {
-            return user_addresses;
-        }
-        for (const record of records) {
-            if (+record.userid !== this._user_id) {
-                continue;
-            }
-            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;
+}
+
+class EsolveTransactionItemPrice {
+    constructor(
+    /**
+     * Price without tax
+     */
+    price, 
+    /**
+     * Price with tax
+     */
+    price_with_tax, 
+    /**
+     * Price without tax and with discounts applied if applicable
+     */
+    price_discounted, 
+    /**
+     * Price with tax and with discounts applied if applicable
+     */
+    price_with_tax_discounted) {
+        this.price = price;
+        this.price_with_tax = price_with_tax;
+        this.price_discounted = price_discounted;
+        this.price_with_tax_discounted = price_with_tax_discounted;
     }
-    processTransactions(records) {
-        const transactions = [];
-        if (records) {
-            for (const record of records) {
-                const transaction = new EsolveTransaction(record);
-                transactions.push(transaction);
-            }
-        }
-        return transactions;
+}
+
+class EsolveLocationAddress {
+    constructor(street, suburb, city, province, country, postal_code, latitude, longitude) {
+        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;
     }
-    loginGuard() {
-        if (this.user_id <= 0) {
-            this.errorHandler.throwError('login_required', 'Login is required');
-        }
+}
+
+class EsolveLocationContactInfo {
+    constructor(telnumber, cellnumber, email, fax) {
+        this.telnumber = telnumber;
+        this.cellnumber = cellnumber;
+        this.email = email;
+        this.fax = fax;
     }
-}
-EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+}
 
-class EsolveBanner {
-    constructor(id, banner_display_container, identifier, type, title, article, sort_priority, link, images) {
-        this.id = id;
-        this.banner_display_container = banner_display_container;
-        this.identifier = identifier;
-        this.type = type;
-        this.title = title;
-        this.article = article;
-        this.sort_priority = sort_priority;
-        this.link = link;
-        this.desktop_images = [];
-        this.mobile_images = [];
-        this.sub_images = [];
-        if (images.desktop) {
-            this.desktop_images = images.desktop;
-        }
-        if (images.mobile) {
-            this.mobile_images = images.mobile;
-        }
-        if (images.sub) {
-            this.sub_images = images.sub;
-        }
+class EsolveLocationPOBoxAddress {
+    constructor(pobox, city, postal_code) {
+        this.pobox = pobox;
+        this.city = city;
+        this.postal_code = postal_code;
     }
 }
 
-class EsolveBannerImage {
-    constructor(id, image_type, width, height, filename, hotspots) {
-        this.id = id;
-        this.image_type = image_type;
-        this.width = width;
-        this.height = height;
-        this.filename = filename;
-        this.hotspots = hotspots;
+class EsolveLocationTradingTimes {
+    constructor(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, trading_hours_additional_info = '') {
+        this.monday = monday;
+        this.tuesday = tuesday;
+        this.wednesday = wednesday;
+        this.thursday = thursday;
+        this.friday = friday;
+        this.saturday = saturday;
+        this.sunday = sunday;
+        this.public_holiday = public_holiday;
+        this.trading_hours_additional_info = trading_hours_additional_info;
     }
-    get src() {
-        return '/images/banners/' + this.filename;
+}
+
+class EsolveLocationTradingDay {
+    constructor(open, close) {
+        this.open = open;
+        this.close = close;
     }
 }
 
-class EsolveBannerImageHotspot {
-    constructor(url, target, coords, coords_string) {
-        this.url = url;
-        this.target = target;
-        this.coords = coords;
-        this.coords_string = coords_string;
+class EsolveLocation {
+    constructor(record) {
+        this.id = +record.id;
+        this.identifier = record.identifier;
+        this.description = record.description;
+        this.head_office = record.head_office;
+        this.erp_identifier = record.erp_identifier;
+        this.external_system_code = record.external_system_code;
+        this.default_location_for_payment_methods = record.default_location_for_payment_methods;
+        this.userid = +record.userid;
+        this.importance = +record.importance;
+        this.active = record.is_active;
+        this.website_url = record.website_url;
+        this.address = new EsolveLocationAddress(record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude);
+        this.pobox_address = new EsolveLocationPOBoxAddress(record.pobox, record.pobox_city, record.pobox_postal_code);
+        const telnumbers = [];
+        if (record.branch_telnumber.length > 0) {
+            telnumbers.push(record.branch_telnumber);
+        }
+        if (record.branch_telnumber_2.length > 0) {
+            telnumbers.push(record.branch_telnumber_2);
+        }
+        if (record.branch_telnumber_3.length > 0) {
+            telnumbers.push(record.branch_telnumber_3);
+        }
+        this.contact_info = new EsolveLocationContactInfo(telnumbers, record.branch_cellnumber, record.branch_email, record.branch_fax);
+        const monday = new EsolveLocationTradingDay(record.monday_open_time, record.monday_close_time);
+        const tuesday = new EsolveLocationTradingDay(record.tuesday_open_time, record.tuesday_close_time);
+        const wednesday = new EsolveLocationTradingDay(record.wednesday_open_time, record.wednesday_close_time);
+        const thursday = new EsolveLocationTradingDay(record.thursday_open_time, record.thursday_close_time);
+        const friday = new EsolveLocationTradingDay(record.friday_open_time, record.friday_close_time);
+        const saturday = new EsolveLocationTradingDay(record.saturday_open_time, record.saturday_close_time);
+        const sunday = new EsolveLocationTradingDay(record.sunday_open_time, record.sunday_close_time);
+        const public_holiday = new EsolveLocationTradingDay(record.public_holiday_open_time, record.public_holiday_close_time);
+        this.trading_times = new EsolveLocationTradingTimes(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, record.trading_hours_additional_info);
     }
 }
 
-class EsolveBannerService {
+class EsolveLocationsService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
     /**
-     * Retrieves banners records from eSolve instance
+     * Retrieves a list of stock locations
      *
-     * @returns An observable of eSolve banners.
+     * @returns An `Observable` with an array of stock locations
      */
-    getBanners(identifier, banner_display_container, enable_date_filter = false) {
-        let params = new HttpParams({
-            fromObject: { enable_date_filter }
-        });
-        if (identifier) {
-            params = params.set('identifier', identifier);
-        }
-        if (banner_display_container) {
-            params = params.set('banner_display_container', banner_display_container);
-        }
+    getStockLocations() {
         return this.http
-            .get(`${this.config.api_url}/get-banners.php`, { params })
+            .get(`${this.config.api_url}/get-locations.php`)
             .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
-            return this.processBanners(response.records);
+            return this.processStockLocations(response.records);
         }));
     }
-    processBannerImageHotspots(hotspot_records) {
-        const hotspots = [];
-        if (hotspot_records.length > 0) {
-            for (const hotspot_record of hotspot_records) {
-                const hotspot = new EsolveBannerImageHotspot(hotspot_record.url, hotspot_record.target, hotspot_record.coords, hotspot_record.coords_string);
-                hotspots.push(hotspot);
-            }
-        }
-        return hotspots;
-    }
-    processBannerImages(image_records, banner_type) {
-        const images = [];
-        if (image_records.length > 0) {
-            for (const image_record of image_records) {
-                const image = new EsolveBannerImage(+image_record.id, image_record.image_type, +image_record.width, +image_record.height, image_record.filename);
-                if ((banner_type === 'hotspot') && (image_record.hotspots)) {
-                    const hotspots = this.processBannerImageHotspots(image_record.hotspots);
-                    image.hotspots = hotspots;
-                }
-                images.push(image);
-            }
-        }
-        return images;
-    }
     /**
-     * Process banner records into banner objects
-     * @param records Array of records
-     * @returns List of banners
+     * Processes the eSolve stock location records.
+     *
+     * @param records Records to process
+     * @returns An array of processed stock location records
      */
-    processBanners(records) {
-        const banners = [];
-        if ((records) && (records.length > 0)) {
+    processStockLocations(records) {
+        const stock_locations = [];
+        if (records) {
             for (const record of records) {
-                const image_sets = {};
-                if (record.images.desktop) {
-                    image_sets.desktop = this.processBannerImages(record.images.desktop, record.type);
-                }
-                if (record.images.mobile) {
-                    image_sets.mobile = this.processBannerImages(record.images.mobile, record.type);
-                }
-                if (record.images.sub) {
-                    image_sets.sub = this.processBannerImages(record.images.sub, record.type);
-                }
-                const banner = new EsolveBanner(+record.id, record.banner_display_container, record.identifier, record.type, record.title, record.article, +record.sort_priority, {
-                    url: record.link.url,
-                    target: record.link.target
-                }, image_sets);
-                banners.push(banner);
+                stock_locations.push(new EsolveLocation(record));
             }
         }
-        return banners;
+        return stock_locations;
     }
 }
-EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveBannerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, decorators: [{
+EsolveLocationsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveLocationsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveLocationsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1685,253 +1840,422 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-// Types
-
-class EsolveHeading {
-    constructor(identifier, value) {
-        this.identifier = identifier;
-        this.value = value;
-    }
+class EsolveTransactionLocation extends EsolveLocation {
 }
 
-class EsolveMediaArticle {
-    constructor(identifier, title, article, image_url = '', tags = [], topics = [], seo_title = '', seo_keywords = '', seo_description = '') {
-        this.identifier = identifier;
-        this.title = title;
-        this.article = article;
-        this.image_url = image_url;
-        this.tags = tags;
-        this.topics = topics;
-        if (seo_title.trim() === '') {
-            seo_title = this.title;
-        }
-        this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
+class EsolveTransactionPaymentMethod {
+    constructor(id, name, description, integration_type, service_provider) {
+        this.id = id;
+        this.name = name;
+        this.description = description;
+        this.integration_type = integration_type;
+        this.service_provider = service_provider;
     }
 }
 
-class EsolveTag {
-    constructor(id, tag_phrase, tag_weight, description) {
+class EsolveTransactionShippingMethod {
+    constructor(id, name, delivery_category, location, description, pricing, client_to_collect) {
         this.id = id;
-        this.tag_phrase = tag_phrase;
-        this.tag_weight = tag_weight;
+        this.name = name;
+        this.delivery_category = delivery_category;
+        this.location = location;
         this.description = description;
+        this.pricing = pricing;
+        this.client_to_collect = client_to_collect;
     }
 }
 
-class EsolveTopic {
-    constructor(id, name, short_description, sort_priority) {
+class EsolveTransactionUser {
+    constructor(id, email, first_name, last_name, tel_number, cell_number) {
         this.id = id;
-        this.name = name;
-        this.short_description = short_description;
-        this.sort_priority = sort_priority;
+        this.email = email;
+        this.first_name = first_name;
+        this.last_name = last_name;
+        this.tel_number = tel_number;
+        this.cell_number = cell_number;
     }
 }
 
-class EsolveTopicService {
-    constructor(config, http) {
+class EsolveTransaction {
+    constructor(record) {
+        // Transaction Items
+        this.items = [];
+        this.id = +record.id;
+        this.type = record.transaction_type;
+        this.status = record.status;
+        this.loyalty_number = record.loyaltynumber;
+        this.external_order_number = record.external_order_number;
+        this.external_invoice_number = record.external_invoice_number;
+        this.date = new Date(+record.txdate_timestamp * 1000);
+        this.expected_date = new Date(+record.expected_date_timestamp * 1000);
+        this.invoice_amount = +record.invoice_amount;
+        this.vat = +record.vat;
+        this.discount = +record.discount;
+        this.total = +record.total;
+        this.shipping_total = +record.shipping_total;
+        this.insurance_total = +record.insurance_total;
+        this.payment = +record.payment;
+        this.payment_reference = record.payment_reference;
+        this.payment_description = record.payment_description;
+        this.gateway_transaction_id = record.gateway_transaction_id;
+        this.address = new EsolveTransactionAddress(record.recipient, record.address_type, record.address_description, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, record.pobox);
+        if (record.user) {
+            this.user = new EsolveTransactionUser(+record.user.id, record.user.email, record.user.firstname, record.user.surname, record.user.telnumber, record.user.cellnumber);
+        }
+        if (record.client) {
+            this.client = new EsolveTransactionClient(+record.client.id, record.client.account, record.client.company_name, record.client.branch_code, record.client.email, record.client.firstname, record.client.surname, record.client.contact_number);
+        }
+        if (record.location_details) {
+            this.location = new EsolveTransactionLocation(record.location_details);
+        }
+        if (record.payment_method_details) {
+            this.payment_method = new EsolveTransactionPaymentMethod(record.payment_method_details.id, record.payment_method_details.paymethod_name, record.payment_method_details.description, record.payment_method_details.integration_type, record.payment_method_details.service_provider);
+        }
+        if (record.shipping_method_details) {
+            this.shipping_method = new EsolveTransactionShippingMethod(+record.shipping_method_details.id, record.shipping_method_details.carrier_name, record.shipping_method_details.delivery_category, record.shipping_method_details.location, record.shipping_method_details.description, record.shipping_method_details.pricing, !!record.shipping_method_details.client_to_collect);
+        }
+        this.parseTransactionItems(record.transaction_items);
+    }
+    parseTransactionItems(record_items) {
+        for (const record_item of record_items) {
+            const price = new EsolveTransactionItemPrice(+record_item.price_exclusive, +record_item.price_inclusive, +record_item.price_exclusive_after_discount, +record_item.price_inclusive_after_discount);
+            const line_total = new EsolveTransactionItemPrice(+record_item.line_total_exclusive, +record_item.line_total_inclusive, +record_item.line_total_exclusive_after_discount, +record_item.line_total_inclusive_after_discount);
+            const item = new EsolveTransactionItem(record_item.code, record_item.name, +record_item.qty, +record_item.discount, +record_item.vat_rate, price, line_total);
+            this.items.push(item);
+        }
+    }
+}
+
+class EsolveTransactionList extends EsolveList {
+}
+
+// Classes
+
+class EsolveChangePasswordResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.password_updated = (response.status.state === 'success');
+    }
+}
+
+class EsolveResetPasswordResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.id = response.esolve_id;
+        this.reset_success = response.reset_success;
+        this.password_matches_old = response.password_matches_old;
+        this.login_required = response.login_required;
+    }
+}
+
+class EsolveRegistrationResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.user_id = response.esolve_id;
+        this.guest = response.guest;
+        this.auto_login = response.auto_login;
+        this.authentication_required = response.authentication_required;
+        this.location_id = response.session_data.location_id;
+    }
+}
+
+class EsolveLocationUpdateResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.location_updated = (response.esolve_id > 0);
+    }
+}
+
+class EsolveAccountService {
+    constructor(config, http, sessionService, errorHandler, responseHandler) {
         this.config = config;
         this.http = http;
+        this.sessionService = sessionService;
+        this.errorHandler = errorHandler;
+        this.responseHandler = responseHandler;
+        this._user_id = 0;
+        this.sessionService.session.subscribe((session) => {
+            if (session.key !== '') {
+                this.user_id = session.id;
+            }
+        });
     }
-    /**
-     * Retrieves active topics from the list of topic ID's. Note that inactive or expired
-     * topics will not be retrieved.
-     *
-     * @param topic_id_list List of topic ID's that need to be retrieved
-     */
-    getTopics(topic_id_list = []) {
-        let params = new HttpParams();
-        if (topic_id_list.length > 0) {
-            params = params.append('topic_id', topic_id_list.join(','));
+    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;
+        }
+    }
+    updateUserAccount(user_account_data) {
+        const body = {
+            account: user_account_data
+        };
+        return this.http
+            .post(`${this.config.api_url}/set-user-account.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
+            },
+            responseType: 'json',
+            observe: 'body'
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveUserAccountResult(response))), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-user-account', errorRes);
+        }));
+    }
+    getUserAccount() {
+        return this.http
+            .get(`${this.config.api_url}/get-account.php`)
+            .pipe(map((response) => {
+            if ((response.records === undefined) ||
+                (response.records.length === 0)) {
+                throw response;
+            }
+            const record = response.records[0];
+            return this.processUserAccount(record);
+        }));
+    }
+    setAddress(address_post_data) {
+        const body = {
+            address: address_post_data
+        };
+        return this.http
+            .post(`${this.config.api_url}/set-address.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;',
+            },
+            responseType: 'json',
+            observe: 'body',
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveAddressResult(response))), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-registration', errorRes);
+        }));
+    }
+    getAddresses() {
+        try {
+            this.loginGuard();
+            return this.http
+                .get(`${this.config.api_url}/get-addresses.php`, {
+                params: { user_id: this.user_id }
+            })
+                .pipe(map((response) => {
+                if (response.records === undefined) {
+                    throw response;
+                }
+                return this.processUserAddress(response.records);
+            }));
         }
-        return this.http.get(`${this.config.api_url}/get-topics.php`, { params }).pipe(map(response => {
-            if (response.records === undefined) {
-                throw response;
+        catch (error) {
+            return throwError(error);
+        }
+    }
+    deleteAddress(id) {
+        return this.http
+            .delete(`${this.config.api_url}/delete-address.php`, {
+            params: { id },
+            responseType: 'json',
+            observe: 'body'
+        })
+            .pipe(map((http_response) => {
+            if ((http_response.result === undefined) ||
+                (http_response.result === null) ||
+                (http_response.result.status !== 'success')) {
+                throw http_response;
             }
-            return this.processTopics(response.records);
+            return new EsolveResult(http_response.result.status, http_response.result.code, http_response.result.message);
+        }), catchError((errorRes) => {
+            return this.errorHandler.handleHttpDeleteError('delete-address', errorRes);
         }));
     }
-    processTopics(records) {
-        const topics = [];
-        if (records) {
-            for (const record of records) {
-                const topic = new EsolveTopic(+record.id, record.name, record.short_description, +record.sort_priority);
-                topics.push(topic);
+    register(user_registration) {
+        const body = {
+            user: user_registration
+        };
+        return this.http
+            .post(`${this.config.api_url}/set-registration.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
+            },
+            responseType: 'json',
+            observe: 'body'
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+            if (response.auto_login) {
+                this.sessionService.handleUpdateSession({
+                    user_id: +response.esolve_id,
+                    location_id: +response.session_data.location_id,
+                });
             }
-        }
-        return topics;
+            return new EsolveRegistrationResult(response);
+        })), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-registration', errorRes);
+        }));
     }
-}
-EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveTopicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTopicService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }]; } });
-
-class EsolveMediaService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    changePassword(password, confirm_password) {
+        const body = {
+            password,
+            confirm_password
+        };
+        return this.http
+            .post(`${this.config.api_url}/set-change-password.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
+            },
+            responseType: 'json',
+            observe: 'body'
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+            return new EsolveChangePasswordResult(response);
+        })), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-change-password', errorRes);
+        }));
     }
-    /**
-     * Retrieves the media record from the eSolve instance using the identifier
-     *
-     * @param identifier String representing the eSolve media identifier
-     */
-    getMediaArticle(identifier) {
-        const params = new HttpParams({ fromObject: { identifier } });
-        // TODO: Error Handling
-        return this.getMediaRecords(params).pipe(map((response) => {
+    sendForgotPasswordRequest(email) {
+        return this.http
+            .get(`${this.config.api_url}/get-forgot-password.php`, { params: { email } })
+            .pipe(map((response) => {
             if ((response.records === undefined) ||
-                (response.records.length <= 0)) {
-                throw response;
-            }
-            const mediaRecord = response.records[0];
-            if (!mediaRecord.active) {
+                !('reset_link_sent' in response.records)) {
                 throw response;
             }
-            return this.processMediaRecord(mediaRecord);
+            return response.records.reset_link_sent;
         }));
     }
-    /**
-     * Retrieves a group of media records from the eSolve instance linked to a group
-     *
-     * @param media_group String representing the eSolve media group
-     */
-    getGroupedMediaArticles(media_group) {
-        const params = new HttpParams({
-            fromObject: { media_group_sef: media_group }
-        });
-        return this.getMediaRecords(params).pipe(map((response) => {
-            const mediaArticles = [];
-            if ((response.records !== undefined) &&
-                (response.records.length > 0)) {
-                for (const mediaRecord of response.records) {
-                    if (mediaRecord.active) {
-                        mediaArticles.push(this.processMediaRecord(mediaRecord));
-                    }
-                }
+    resetPassword(reset_key, password, confirm_password, auto_login = true) {
+        return this.http
+            .post(`${this.config.api_url}/set-forgot-password.php`, {
+            reset_key,
+            password,
+            confirm_password,
+            auto_login
+        }, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
+            },
+            responseType: 'json',
+            observe: 'body'
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+            if (!response.login_required) {
+                this.sessionService.handleUpdateSession({
+                    user_id: +response.esolve_id,
+                    location_id: +response.session_data.location_id,
+                });
             }
-            return mediaArticles;
+            return new EsolveResetPasswordResult(response);
+        })), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-forgot-password', errorRes);
         }));
     }
-    /**
-     * Retrieves the media heading records from the eSolve instance using the identifiers
-     *
-     * @param identifiers Array of strings representing the eSolve heading identifiers
-     */
-    getHeadings(identifiers) {
+    updateLocation(location_id) {
+        const body = { location_id };
         return this.http
-            .get(`${this.config.api_url}/get-headings.php`, {
-            params: {
-                identifier: identifiers.join(','),
+            .post(`${this.config.api_url}/set-session-location.php`, body, {
+            headers: {
+                'Content-Type': 'application/x-www-form-urlencoded;charset=utf-8;'
             },
+            responseType: 'json',
+            observe: 'body',
         })
-            .pipe(map((response) => {
-            const headings = [];
-            if ((response.records !== undefined) &&
-                (response.records.length > 0)) {
-                for (const heading_record of response.records) {
-                    headings.push(this.processHeadingRecord(heading_record));
-                }
-            }
-            return headings;
-        }));
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => {
+            this.sessionService.handleUpdateSession({ location_id });
+            return new EsolveLocationUpdateResult(response);
+        })));
     }
-    /**
-     * Processes media article record
-     *
-     * @param record Record from eSolve instance
-     */
-    processMediaRecord(record) {
-        const tags = [];
-        const topics = [];
-        if ((record.tags) && (record.tags.length > 0)) {
-            for (const tag of record.tags) {
-                tags.push(new EsolveTag(+tag.id, tag.tag_phrase, +tag.tag_weight, tag.description));
-            }
+    getTransactions(options = {}) {
+        try {
+            this.loginGuard();
+            return this.http
+                .get(`${this.config.api_url}/get-transactions.php`, {
+                params: {
+                    user_id: this.user_id,
+                    ...options,
+                }
+            })
+                .pipe(map((response) => {
+                if (response.records === undefined) {
+                    throw response;
+                }
+                const items = this.processTransactions(response.records);
+                const total = +response.additional_data.total_records ?? 0;
+                const rows = options.rows ?? total;
+                const page = options.page || 1;
+                return new EsolveTransactionList(items, page, rows, total);
+            }));
         }
-        if ((record.topics) && (record.topics.length > 0)) {
-            for (const topic of record.topics) {
-                topics.push(new EsolveTopic(+topic.id, topic.name, topic.short_description, +topic.sort_priority));
-            }
+        catch (error) {
+            return throwError(error);
         }
-        return new EsolveMediaArticle(record.identifier, record.title, record.article, record.image_url, tags, topics, record.seo_page_title, record.seo_keywords, record.seo_description);
-    }
-    /**
-     * Processes media heading record
-     *
-     * @param record Record from eSolve instance
-     */
-    processHeadingRecord(record) {
-        return new EsolveHeading(record.identifier, record.value);
-    }
-    /**
-     * Retrieves media records from eSolve instance.
-     *
-     * @param params HTTP params
-     */
-    getMediaRecords(params) {
-        return this.http.get(`${this.config.api_url}/get-media.php`, { params });
     }
-}
-EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }]; } });
-
-class EsolveMenuItem {
-    constructor(url, name, target, children = []) {
-        this.url = url;
-        this.name = name;
-        this.target = target;
-        this.children = children;
+    getTransaction(id) {
+        try {
+            this.loginGuard();
+            return this.http
+                .get(`${this.config.api_url}/get-transactions.php`, {
+                params: {
+                    user_id: this.user_id,
+                    transaction_id: id,
+                }
+            })
+                .pipe(map((response) => {
+                if ((response.records === undefined) ||
+                    (response.records.length <= 0)) {
+                    throw response;
+                }
+                const items = this.processTransactions(response.records);
+                return items[0];
+            }));
+        }
+        catch (error) {
+            return throwError(error);
+        }
     }
-}
-
-class EsolveMenuService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    processUserAccount(record) {
+        if (!record) {
+            throw new Error('Invalid record');
+        }
+        if (+record.userid !== this._user_id) {
+            throw new Error('Invalid user account retrieved');
+        }
+        const user_account = new EsolveUserAccount(+record.userid, record.email, record.registration_type, record.title, record.firstname, record.surname, record.initials, record.gender, record.idnumber);
+        user_account.contact_details = new EsolveUserAccountContact(record.telnumber, record.cellnumber, record.fax);
+        user_account.business_details = new EsolveUserAccountBusiness(record.busname, record.vatnum, record.busdescript, record.business_type);
+        return user_account;
     }
-    getMenuTree(identifier) {
-        return this.http
-            .get(`${this.config.api_url}/get-menu-tree.php`, { params: { identifier } })
-            .pipe(map((response) => {
-            if ((!response) || (response.records === undefined)) {
-                throw response;
-            }
-            else if (response.records.length === 0) {
-                return [];
+    processUserAddress(records) {
+        const user_addresses = [];
+        if (!records || (this._user_id === 0)) {
+            return user_addresses;
+        }
+        for (const record of records) {
+            if (+record.userid !== this._user_id) {
+                continue;
             }
-            return this.handleMenu(response.records);
-        }));
+            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;
     }
-    handleMenu(records) {
-        const menu = [];
-        if (typeof records !== 'undefined') {
-            for (const menuTreeRecord of records) {
-                menu.push(new EsolveMenuItem(menuTreeRecord.sef_url, menuTreeRecord.name, menuTreeRecord.target, this.handleMenu(menuTreeRecord.children)));
+    processTransactions(records) {
+        const transactions = [];
+        if (records) {
+            for (const record of records) {
+                const transaction = new EsolveTransaction(record);
+                transactions.push(transaction);
             }
         }
-        return menu;
+        return transactions;
+    }
+    loginGuard() {
+        if (this.user_id <= 0) {
+            this.errorHandler.throwError('login_required', 'Login is required');
+        }
     }
 }
-EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveMenuService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, decorators: [{
+EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1939,137 +2263,141 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }]; } });
-
-class EsolveNewsGroup {
-    constructor(id, name, description, sef_name) {
-        this.id = id;
-        this.name = name;
-        this.description = description;
-        this.sef_name = sef_name;
-    }
-}
+                }] }, { type: i1$2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
 
-class EsolveNewsArticle {
-    constructor(id, title, sef_title, article, short_description, txdate, active, image, featured, author, seo_title = '', seo_keywords = '') {
+class EsolveBanner {
+    constructor(id, banner_display_container, identifier, type, title, article, sort_priority, link, images) {
         this.id = id;
+        this.banner_display_container = banner_display_container;
+        this.identifier = identifier;
+        this.type = type;
         this.title = title;
-        this.sef_title = sef_title;
         this.article = article;
-        this.short_description = short_description;
-        this.txdate = txdate;
-        this.active = active;
-        this.image = image;
-        this.featured = featured;
-        this.author = author;
-        if (seo_title.trim() === '') {
-            seo_title = this.title;
+        this.sort_priority = sort_priority;
+        this.link = link;
+        this.desktop_images = [];
+        this.mobile_images = [];
+        this.sub_images = [];
+        if (images.desktop) {
+            this.desktop_images = images.desktop;
+        }
+        if (images.mobile) {
+            this.mobile_images = images.mobile;
+        }
+        if (images.sub) {
+            this.sub_images = images.sub;
         }
-        this.seo_details = new EsolveSeoInfo(seo_title, short_description, seo_keywords);
     }
 }
 
-class EsolveNewsArticleList {
-    constructor(newsArticles, total, page) {
-        this.newsArticles = newsArticles;
-        this.total = total;
-        this.page = page;
+class EsolveBannerImage {
+    constructor(id, image_type, width, height, filename, hotspots) {
+        this.id = id;
+        this.image_type = image_type;
+        this.width = width;
+        this.height = height;
+        this.filename = filename;
+        this.hotspots = hotspots;
+    }
+    get src() {
+        return '/images/banners/' + this.filename;
     }
 }
 
-class EsolveNewsArticleAuthor {
-    constructor(userid, email, firstname, surname) {
-        this.userid = userid;
-        this.email = email;
-        this.firstname = firstname;
-        this.surname = surname;
+class EsolveBannerImageHotspot {
+    constructor(url, target, coords, coords_string) {
+        this.url = url;
+        this.target = target;
+        this.coords = coords;
+        this.coords_string = coords_string;
     }
 }
 
-class EsolveNewsService {
+class EsolveBannerService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    getNewsArticle(identifier) {
-        const params = new HttpParams({ fromObject: { sef_title: identifier } });
-        return this.getNewsRecords(params).pipe(map(response => {
-            if ((response.records === undefined) ||
-                (response.records.length <= 0)) {
-                throw response;
-            }
-            const newsRecord = response.records[0];
-            if (!newsRecord.active) {
-                throw response;
-            }
-            return this.processNewsArticle(newsRecord);
-        }));
-    }
-    getNewsArticles(options) {
-        let params = new HttpParams();
-        if (options.news_group_id) {
-            params = params.set('news_group_id', options.news_group_id.toString());
-        }
-        else if (options.news_group_sef) {
-            params = params.set('news_group_sef', options.news_group_sef.toString());
-        }
-        if (options.page) {
-            params = params.set('page', options.page.toString());
-        }
-        if (options.rows) {
-            params = params.set('rows', options.rows.toString());
-        }
-        if (options.feature_only) {
-            params = params.set('feature_only', options.feature_only.toString());
-        }
-        if (options.manufacturers_id) {
-            params = params.set('manufacturers_id', options.manufacturers_id.toString());
-        }
-        if (options.ranges_id) {
-            params = params.set('ranges_id', options.ranges_id.toString());
-        }
-        if (options.from_date) {
-            params = params.set('from_date', options.from_date.toString());
+    /**
+     * Retrieves banners records from eSolve instance
+     *
+     * @returns An observable of eSolve banners.
+     */
+    getBanners(identifier, banner_display_container, enable_date_filter = false) {
+        let params = new HttpParams({
+            fromObject: { enable_date_filter }
+        });
+        if (identifier) {
+            params = params.set('identifier', identifier);
         }
-        if (options.to_date) {
-            params = params.set('to_date', options.to_date.toString());
+        if (banner_display_container) {
+            params = params.set('banner_display_container', banner_display_container);
         }
-        return this.getNewsRecords(params).pipe(map(response => {
-            if (response.records === undefined) {
-                throw response;
-            }
-            const newsArticles = [];
-            response.records.forEach(newsArticleRecord => {
-                newsArticles.push(this.processNewsArticle(newsArticleRecord));
-            });
-            return new EsolveNewsArticleList(newsArticles, response.additional_data.total_records, options.page || 0);
-        }));
-    }
-    getNewsGroups() {
         return this.http
-            .get(`${this.config.api_url}/get-news-groups.php`)
+            .get(`${this.config.api_url}/get-banners.php`, { params })
             .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
-            const newsGroups = [];
-            response.records.forEach(newsGroupRecord => {
-                newsGroups.push(new EsolveNewsGroup(newsGroupRecord.id, newsGroupRecord.name, newsGroupRecord.description, newsGroupRecord.sef_name));
-            });
-            return newsGroups;
+            return this.processBanners(response.records);
         }));
     }
-    processNewsArticle(newsRecord) {
-        const author = new EsolveNewsArticleAuthor(newsRecord.user.userid, newsRecord.user.email, newsRecord.user.firstname, newsRecord.user.surname);
-        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);
+    processBannerImageHotspots(hotspot_records) {
+        const hotspots = [];
+        if (hotspot_records.length > 0) {
+            for (const hotspot_record of hotspot_records) {
+                const hotspot = new EsolveBannerImageHotspot(hotspot_record.url, hotspot_record.target, hotspot_record.coords, hotspot_record.coords_string);
+                hotspots.push(hotspot);
+            }
+        }
+        return hotspots;
     }
-    getNewsRecords(params) {
-        return this.http.get(`${this.config.api_url}/get-news.php`, { params });
+    processBannerImages(image_records, banner_type) {
+        const images = [];
+        if (image_records.length > 0) {
+            for (const image_record of image_records) {
+                const image = new EsolveBannerImage(+image_record.id, image_record.image_type, +image_record.width, +image_record.height, image_record.filename);
+                if ((banner_type === 'hotspot') && (image_record.hotspots)) {
+                    const hotspots = this.processBannerImageHotspots(image_record.hotspots);
+                    image.hotspots = hotspots;
+                }
+                images.push(image);
+            }
+        }
+        return images;
+    }
+    /**
+     * Process banner records into banner objects
+     * @param records Array of records
+     * @returns List of banners
+     */
+    processBanners(records) {
+        const banners = [];
+        if ((records) && (records.length > 0)) {
+            for (const record of records) {
+                const image_sets = {};
+                if (record.images.desktop) {
+                    image_sets.desktop = this.processBannerImages(record.images.desktop, record.type);
+                }
+                if (record.images.mobile) {
+                    image_sets.mobile = this.processBannerImages(record.images.mobile, record.type);
+                }
+                if (record.images.sub) {
+                    image_sets.sub = this.processBannerImages(record.images.sub, record.type);
+                }
+                const banner = new EsolveBanner(+record.id, record.banner_display_container, record.identifier, record.type, record.title, record.article, +record.sort_priority, {
+                    url: record.link.url,
+                    target: record.link.target
+                }, image_sets);
+                banners.push(banner);
+            }
+        }
+        return banners;
     }
 }
-EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, decorators: [{
+EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveBannerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveBannerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2079,280 +2407,189 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveColour {
-    constructor(record) {
-        this.id = record.id ?? 0;
-        this.colour = record.colour ?? '';
-        this.description = record.description ?? '';
+// Types
+
+class EsolveHeading {
+    constructor(identifier, value) {
+        this.identifier = identifier;
+        this.value = value;
     }
 }
 
-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) {
-        this.type = type;
-        this.esolve_id = esolve_id;
-        this.parent_id = parent_id;
-        this.description = description;
-        this.sef_description = sef_description;
-        this.short_description = short_description;
-        this.sort_priority = sort_priority;
-        this.active = active;
-        this.display_only = display_only;
-        this.image_name = image_name;
-        this.id = '';
-        this.image_path = '';
-        if (this.type === 'category') {
-            this.id = `<<CAT>>${this.esolve_id}`;
-            if (children != null) {
-                this.children = children;
-            }
-            this.image_path = '/images/categories/';
-        }
-        else {
-            this.id = `<<SUB>>${this.esolve_id}`;
-            this.image_path = '/images/subcategories/';
-        }
+class EsolveMediaArticle {
+    constructor(identifier, title, article, image_url = '', tags = [], topics = [], seo_title = '', seo_keywords = '', seo_description = '') {
+        this.identifier = identifier;
+        this.title = title;
+        this.article = article;
+        this.image_url = image_url;
+        this.tags = tags;
+        this.topics = topics;
         if (seo_title.trim() === '') {
-            seo_title = this.description;
+            seo_title = this.title;
         }
         this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
     }
-    get small_image_src() {
-        return this.getImagePath('small');
-    }
-    get thumbnail_image_src() {
-        return this.getImagePath('thumb');
-    }
-    get tiny_image_src() {
-        return this.getImagePath('tiny');
-    }
-    getImagePath(image_size) {
-        if (this.image_name !== '') {
-            return `${this.image_path}${image_size}/${this.image_name}`;
-        }
-        return '';
-    }
 }
 
-class EsolveCategoryTreeService {
+class EsolveMediaService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
     /**
-     * Retrieves the category tree from eSolve instance and coverts it to the correct format.
+     * Retrieves the media record from the eSolve instance using the identifier
+     *
+     * @param identifier String representing the eSolve media identifier
      */
-    getCategoryTree() {
-        return this.http
-            .get(`${this.config.api_url}/get-tree.php`)
-            .pipe(map((response) => {
-            if (response.records === undefined) {
+    getMediaArticle(identifier) {
+        const params = new HttpParams({ fromObject: { identifier } });
+        // TODO: Error Handling
+        return this.getMediaRecords(params).pipe(map((response) => {
+            if ((response.records === undefined) ||
+                (response.records.length <= 0)) {
                 throw response;
             }
-            return this.processTree(response.records);
+            const mediaRecord = response.records[0];
+            if (!mediaRecord.active) {
+                throw response;
+            }
+            return this.processMediaRecord(mediaRecord);
         }));
     }
     /**
-     * Retrieve the details of a category tree item from the eSolve instance and
-     * converts it to the correct format.
+     * Retrieves a group of media records from the eSolve instance linked to a group
      *
-     * @param options Filter options
+     * @param media_group String representing the eSolve media group
      */
-    getCategoryTreeItem(options) {
-        let type;
-        let esolve_id;
-        let sef_description;
-        if (options.id) {
-            const categoryIdentifier = this.processID(options.id);
-            if (categoryIdentifier) {
-                type = categoryIdentifier.type;
-                esolve_id = categoryIdentifier.esolve_id;
-            }
-        }
-        else if (options.type) {
-            type = options.type;
-            if (options.esolve_id) {
-                esolve_id = options.esolve_id;
-            }
-            else if (options.sef_description) {
-                sef_description = options.sef_description;
-            }
-        }
-        if (type && (esolve_id || sef_description)) {
-            let params = new HttpParams();
-            params = params.set('type', type);
-            if (esolve_id) {
-                params = params.set('id', esolve_id);
-            }
-            if (sef_description) {
-                params = params.set('sef_description', sef_description);
-            }
-            return this.http
-                .get(`${this.config.api_url}/get-tree-item.php`, { params })
-                .pipe(map((response) => {
-                if ((response.records === undefined) ||
-                    (response.records.length <= 0)) {
-                    throw response;
+    getGroupedMediaArticles(media_group) {
+        const params = new HttpParams({
+            fromObject: { media_group_sef: media_group }
+        });
+        return this.getMediaRecords(params).pipe(map((response) => {
+            const mediaArticles = [];
+            if ((response.records !== undefined) &&
+                (response.records.length > 0)) {
+                for (const mediaRecord of response.records) {
+                    if (mediaRecord.active) {
+                        mediaArticles.push(this.processMediaRecord(mediaRecord));
+                    }
                 }
-                return this.processTreeItem(response.records[0]);
-            }));
-        }
-        return throwError('Invalid options');
+            }
+            return mediaArticles;
+        }));
     }
     /**
-     * Processes the eSolve tree records and converts them into the correct format.
+     * Retrieves the media heading records from the eSolve instance using the identifiers
      *
-     * @param tree_records Records to process
+     * @param identifiers Array of strings representing the eSolve heading identifiers
      */
-    processTree(tree_records) {
-        const tree_items = [];
-        if (tree_records) {
-            for (const tree_record of tree_records) {
-                let esolve_id = '';
-                let parent_id = '';
-                let children = [];
-                if (tree_record.type === 'category') {
-                    children = this.processTree(tree_record.children);
-                    esolve_id = tree_record.menu_id;
-                    parent_id = tree_record.owner_menu_id;
-                }
-                else {
-                    esolve_id = tree_record.id;
-                    parent_id = tree_record.menu_id;
+    getHeadings(identifiers) {
+        return this.http
+            .get(`${this.config.api_url}/get-headings.php`, {
+            params: {
+                identifier: identifiers.join(','),
+            },
+        })
+            .pipe(map((response) => {
+            const headings = [];
+            if ((response.records !== undefined) &&
+                (response.records.length > 0)) {
+                for (const heading_record of response.records) {
+                    headings.push(this.processHeadingRecord(heading_record));
                 }
-                tree_items.push(new EsolveCategoryTreeItem(tree_record.type, esolve_id, parent_id, tree_record.description, tree_record.sef_description, tree_record.seo_description, tree_record.sort_priority, tree_record.active, tree_record.display_only, tree_record.image, tree_record.seo_page_title, tree_record.seo_keywords, tree_record.short_description, children));
             }
-        }
-        return tree_items;
-    }
-    processTreeItem(record) {
-        return new EsolveCategoryTreeItem(record.type, record.id, record.parent_id, record.description, record.sef_description, record.short_description, record.sort_priority, record.active, record.display_only, record.image, record.seo_page_title, record.seo_keywords, record.seo_description);
-    }
-    processID(id) {
-        let type;
-        let esolve_id;
-        const type_code_regex = /^\<\<(CAT|SUB)\>\>/g;
-        const match_results = id.match(type_code_regex);
-        if (match_results) {
-            const type_code = match_results[0];
-            type = (type_code === '<<CAT>>' ? 'category' : 'subcategory');
-            esolve_id = id.replace(type_code_regex, '');
-            return {
-                type,
-                esolve_id
-            };
-        }
-        return null;
+            return headings;
+        }));
     }
-}
-EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveCategoryTreeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }]; } });
-
-class EsolveManufacturer {
-    constructor(id, manufacturer, sef_manufacturer, title, article, sort_priority, is_active, featured, image_name, seo_title = '', seo_keywords = '', seo_description = '') {
-        this.id = id;
-        this.manufacturer = manufacturer;
-        this.sef_manufacturer = sef_manufacturer;
-        this.title = title;
-        this.article = article;
-        this.sort_priority = sort_priority;
-        this.is_active = is_active;
-        this.featured = featured;
-        this.image_name = image_name;
-        this.image_path = '/images/manufacturers/';
-        if (this.title.trim() === '') {
-            this.title = this.manufacturer;
+    /**
+     * Processes media article record
+     *
+     * @param record Record from eSolve instance
+     */
+    processMediaRecord(record) {
+        const tags = [];
+        const topics = [];
+        if ((record.tags) && (record.tags.length > 0)) {
+            for (const tag of record.tags) {
+                tags.push(new EsolveTag(tag));
+            }
         }
-        if (seo_title.trim() === '') {
-            seo_title = this.title;
+        if ((record.topics) && (record.topics.length > 0)) {
+            for (const topic of record.topics) {
+                topics.push(new EsolveTopic(topic));
+            }
         }
-        this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
-    }
-    get original_image_src() {
-        return this.getImagePath('original');
-    }
-    get small_image_src() {
-        return this.getImagePath('small');
+        return new EsolveMediaArticle(record.identifier, record.title, record.article, record.image_url, tags, topics, record.seo_page_title, record.seo_keywords, record.seo_description);
     }
-    get thumbnail_image_src() {
-        return this.getImagePath('thumb');
+    /**
+     * Processes media heading record
+     *
+     * @param record Record from eSolve instance
+     */
+    processHeadingRecord(record) {
+        return new EsolveHeading(record.identifier, record.value);
     }
-    get tiny_image_src() {
-        return this.getImagePath('tiny');
+    /**
+     * Retrieves media records from eSolve instance.
+     *
+     * @param params HTTP params
+     */
+    getMediaRecords(params) {
+        return this.http.get(`${this.config.api_url}/get-media.php`, { params });
     }
-    getImagePath(image_size) {
-        if (this.image_name !== '') {
-            return `${this.image_path}${image_size}/${this.image_name}`;
-        }
-        return '';
+}
+EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }]; } });
+
+class EsolveMenuItem {
+    constructor(url, name, target, children = []) {
+        this.url = url;
+        this.name = name;
+        this.target = target;
+        this.children = children;
     }
 }
 
-class EsolveManufacturersService {
+class EsolveMenuService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    getManufacturer(id) {
-        const params = new HttpParams({
-            fromObject: { manufacturers_id: id }
-        });
-        return this.getManufacturerSingle(params);
-    }
-    getManufacturerFromSEF(sef_manufacturer) {
-        const params = new HttpParams({
-            fromObject: { sef_manufacturer }
-        });
-        return this.getManufacturerSingle(params);
-    }
-    getManufacturers(options) {
-        let params = new HttpParams();
-        if (options?.featured_only) {
-            params = params.set('featured_only', options.featured_only);
-        }
-        return this.getManufacturerRecords(params).pipe(map((records) => {
-            const manufacturers = [];
-            for (const record of records) {
-                manufacturers.push(this.processManufacturer(record));
-            }
-            return manufacturers;
-        }), catchError(() => {
-            return of([]);
-        }));
-    }
-    getManufacturerSingle(params) {
-        return this.getManufacturerRecords(params).pipe(map((records) => {
-            const record = records[0];
-            return this.processManufacturer(record);
-        }));
-    }
-    getManufacturerRecords(params) {
+    getMenuTree(identifier) {
         return this.http
-            .get(`${this.config.api_url}/get-manufacturers.php`, { params })
+            .get(`${this.config.api_url}/get-menu-tree.php`, { params: { identifier } })
             .pipe(map((response) => {
-            if ((response.records === undefined) ||
-                (response.records.length <= 0)) {
+            if ((!response) || (response.records === undefined)) {
                 throw response;
             }
-            return response.records;
+            else if (response.records.length === 0) {
+                return [];
+            }
+            return this.handleMenu(response.records);
         }));
     }
-    processManufacturer(record) {
-        return new EsolveManufacturer(+record.id, record.manufacturer, record.sef_manufacturer, record.title, record.article, +record.sort_priority, !!+record.is_active, !!+record.featured, record.image_name, record.seo_page_title, record.seo_keywords, record.seo_description);
+    handleMenu(records) {
+        const menu = [];
+        if (typeof records !== 'undefined') {
+            for (const menuTreeRecord of records) {
+                menu.push(new EsolveMenuItem(menuTreeRecord.sef_url, menuTreeRecord.name, menuTreeRecord.target, this.handleMenu(menuTreeRecord.children)));
+            }
+        }
+        return menu;
     }
 }
-EsolveManufacturersService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveManufacturersService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveManufacturersService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveManufacturersService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveManufacturersService, decorators: [{
+EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMenuService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMenuService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2362,97 +2599,192 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveRange {
-    constructor(id, range, sef_range, manufacturers_id, title, article, is_active, featured, sort_priority, image_name, seo_title = '', seo_keywords = '', seo_description = '') {
+class EsolveNewsGroup {
+    constructor(id, name, description, sef_name) {
         this.id = id;
-        this.range = range;
-        this.sef_range = sef_range;
-        this.manufacturers_id = manufacturers_id;
-        this.title = title;
-        this.article = article;
-        this.is_active = is_active;
-        this.featured = featured;
-        this.sort_priority = sort_priority;
-        this.image_name = image_name;
-        this.image_path = '/images/ranges/';
-        if (this.title.trim() === '') {
-            this.title = this.range;
+        this.name = name;
+        this.description = description;
+        this.sef_name = sef_name;
+    }
+}
+
+class EsolveNewsArticleAuthor {
+    constructor(userid, email, firstname, surname) {
+        this.userid = userid;
+        this.email = email;
+        this.firstname = firstname;
+        this.surname = surname;
+    }
+}
+
+class EsolveNewsArticle {
+    constructor(record) {
+        this.id = 0;
+        this.title = '';
+        this.sef_title = '';
+        this.article = '';
+        this.short_description = '';
+        this.txdate = '';
+        this.active = false;
+        this.image = '';
+        this.featured = false;
+        this.topics = [];
+        this.tags = [];
+        let seo_title = '';
+        let seo_description = '';
+        let seo_keywords = '';
+        if (record) {
+            this.id = +(record.id ?? 0);
+            this.title = record.title ?? '';
+            this.sef_title = record.sef_title ?? '';
+            this.article = record.article ?? '';
+            this.txdate = record.txdate ?? '';
+            this.image = record.image ?? '';
+            if (record.active) {
+                this.active = !!+record.active;
+            }
+            if (record.featured) {
+                this.featured = !!+record.featured;
+            }
+            seo_title = record.seo_page_title ?? '';
+            seo_description = record.short_description ?? '';
+            seo_keywords = record.seo_keywords ?? '';
+            if (record.news_group) {
+                const group_record = record.news_group;
+                this.group = new EsolveNewsGroup(+group_record.id, group_record.name, group_record.description, group_record.sef_name);
+            }
+            if (record.user) {
+                this.author = new EsolveNewsArticleAuthor(record.user.userid, record.user.email, record.user.firstname, record.user.surname);
+            }
+            if (record.manufacturer) {
+                this.manufacturer = new EsolveManufacturer(record.manufacturer);
+            }
+            if (record.range) {
+                this.range = new EsolveRange(record.range);
+            }
+            if (record.topics && record.topics.length > 0) {
+                const topics = record.topics;
+                for (const topic of topics) {
+                    this.topics.push(new EsolveTopic(topic));
+                }
+            }
+            if (record.tags && record.tags.length > 0) {
+                const tags = record.tags;
+                for (const tag of tags) {
+                    this.tags.push(new EsolveTag(tag));
+                }
+            }
         }
         if (seo_title.trim() === '') {
             seo_title = this.title;
         }
         this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
     }
-    get image_src() {
-        return this.getImagePath();
-    }
-    getImagePath() {
-        if (this.image_name !== '') {
-            return `${this.image_path}${this.image_name}`;
-        }
-        return '';
+}
+
+class EsolveNewsArticleList {
+    constructor(newsArticles, total, page) {
+        this.newsArticles = newsArticles;
+        this.total = total;
+        this.page = page;
     }
 }
 
-class EsolveRangesService {
+class EsolveNewsService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    getRange(id) {
-        const params = new HttpParams({
-            fromObject: { ranges_id: id }
-        });
-        return this.getRangeSingle(params);
-    }
-    getRangeFromSEF(sef_range) {
-        const params = new HttpParams({
-            fromObject: { sef_range }
-        });
-        return this.getRangeSingle(params);
-    }
-    getRanges(options) {
-        let params = new HttpParams();
-        if (options?.featured_only) {
-            params = params.set('featured_only', options.featured_only);
-        }
-        if (options?.manufacturers_id) {
-            params = params.set('manufacturers_id', options.manufacturers_id);
-        }
-        return this.getRangeRecords(params).pipe(map((records) => {
-            const ranges = [];
-            for (const record of records) {
-                ranges.push(this.processRange(record));
+    getNewsArticle(identifier) {
+        const params = new HttpParams({ fromObject: { sef_title: identifier } });
+        return this.getNewsRecords(params).pipe(map((response) => {
+            if ((response.records === undefined) ||
+                (response.records.length <= 0)) {
+                throw response;
             }
-            return ranges;
-        }), catchError(() => {
-            return of([]);
+            const record = response.records[0];
+            if (!record.active) {
+                throw response;
+            }
+            return this.processNewsArticle(record);
         }));
     }
-    getRangeSingle(params) {
-        return this.getRangeRecords(params).pipe(map((records) => {
-            const record = records[0];
-            return this.processRange(record);
+    getNewsArticles(options) {
+        const params = this.parseOptions(options);
+        return this.getNewsRecords(params).pipe(map((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            const news_articles = [];
+            for (const record of response.records) {
+                news_articles.push(this.processNewsArticle(record));
+            }
+            const page = options?.page ?? 0;
+            const total_records = +response.additional_data.total_records;
+            return new EsolveNewsArticleList(news_articles, total_records, page);
         }));
     }
-    getRangeRecords(params) {
+    getNewsGroups() {
         return this.http
-            .get(`${this.config.api_url}/get-ranges.php`, { params })
+            .get(`${this.config.api_url}/get-news-groups.php`)
             .pipe(map((response) => {
-            if ((response.records === undefined) ||
-                (response.records.length <= 0)) {
+            if (response.records === undefined) {
                 throw response;
             }
-            return response.records;
+            const news_groups = [];
+            for (const record of response.records) {
+                news_groups.push(new EsolveNewsGroup(record.id, record.name, record.description, record.sef_name));
+            }
+            return news_groups;
         }));
     }
-    processRange(record) {
-        return new EsolveRange(+record.id, record.range, record.sef_range, record.manufacturers_id, record.title, record.article, !!+record.is_active, !!+record.featured, +record.sort_priority, record.image_name, record.seo_page_title, record.seo_keywords, record.seo_description);
+    processNewsArticle(record) {
+        return new EsolveNewsArticle(record);
+    }
+    getNewsRecords(params) {
+        return this.http.get(`${this.config.api_url}/get-news.php`, { params });
+    }
+    parseOptions(options) {
+        let params = new HttpParams();
+        if (!options) {
+            return params;
+        }
+        if (options.news_group_id) {
+            params = params.set('news_group_id', options.news_group_id);
+        }
+        else if (options.news_group_sef) {
+            params = params.set('news_group_sef', options.news_group_sef);
+        }
+        if (options.page) {
+            params = params.set('page', options.page);
+        }
+        if (options.rows) {
+            params = params.set('rows', options.rows);
+        }
+        if (options.feature_only) {
+            params = params.set('feature_only', options.feature_only);
+        }
+        if (options.manufacturers_id) {
+            params = params.set('manufacturers_id', options.manufacturers_id);
+        }
+        if (options.ranges_id) {
+            params = params.set('ranges_id', options.ranges_id);
+        }
+        if (options.from_date) {
+            params = params.set('from_date', options.from_date);
+        }
+        if (options.to_date) {
+            params = params.set('to_date', options.to_date);
+        }
+        if (options.search_phrase) {
+            params = params.set('search_phrase', options.search_phrase);
+        }
+        return params;
     }
 }
-EsolveRangesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveRangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, decorators: [{
+EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2462,6 +2794,14 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
+class EsolveColour {
+    constructor(record) {
+        this.id = record.id ?? 0;
+        this.colour = record.colour ?? '';
+        this.description = record.description ?? '';
+    }
+}
+
 class EsolveStockBadge {
     constructor(id, text, identifier, font_colour, badge_colour, sort_priority) {
         this.id = id;
@@ -2629,12 +2969,12 @@ class EsolveStockItemBase {
             sell_price_with_tax = +(record.sellprice_inclusive ?? 0);
             if ((record.tags) && (record.tags.length > 0)) {
                 for (const tag of record.tags) {
-                    this.tags.push(new EsolveTag(+tag.id, tag.tag_phrase, +tag.tag_weight, tag.description));
+                    this.tags.push(new EsolveTag(tag));
                 }
             }
             if ((record.topics) && (record.topics.length > 0)) {
                 for (const topic of record.topics) {
-                    this.topics.push(new EsolveTopic(+topic.id, topic.name, topic.short_description, +topic.sort_priority));
+                    this.topics.push(new EsolveTopic(topic));
                 }
             }
             if ((record.badges) && (record.badges.length > 0)) {
@@ -2649,10 +2989,10 @@ class EsolveStockItemBase {
                 this.subcategory = new EsolveCategoryTreeItem(record.subcategory.type, record.subcategory.id, record.subcategory.parent_id, record.subcategory.description, record.subcategory.sef_description, record.subcategory.short_description, record.subcategory.sort_priority, record.subcategory.active, record.subcategory.display_only, record.subcategory.image, record.subcategory.seo_page_title, record.subcategory.seo_keywords, record.subcategory.seo_description);
             }
             if (record.manufacturer) {
-                this.manufacturer = new EsolveManufacturer(record.manufacturer.id, record.manufacturer.manufacturer, record.manufacturer.sef_manufacturer, record.manufacturer.title, record.manufacturer.article, record.manufacturer.sort_priority, record.manufacturer.is_active, record.manufacturer.featured, record.manufacturer.image_name, record.manufacturer.seo_page_title, record.manufacturer.seo_keywords, record.manufacturer.seo_description);
+                this.manufacturer = new EsolveManufacturer(record.manufacturer);
             }
             if (record.range) {
-                this.range = new EsolveRange(record.range.id, record.range.range, record.range.sef_range, record.range.manufacturers_id, record.range.title, record.range.article, record.range.is_active, record.range.featured, record.range.sort_priority, record.range.image_name, record.range.seo_page_title, record.range.seo_keywords, record.range.seo_description);
+                this.range = new EsolveRange(record.range);
             }
             if (record.colours && record.colours.length > 0) {
                 for (const colour of record.colours) {
@@ -4042,5 +4382,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { EsolveAccountService, EsolveAdditionalStockImage, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartStockItem, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveColour, EsolveCookieService, EsolveEnquiryResult, EsolveEnquiryService, EsolveErrorHandlerService, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHeading, EsolveHttpError, EsolveLinkedAsset, EsolveLinkedStockItem, EsolveList, EsolveLocation, EsolveLocationAddress, EsolveLocationContactInfo, EsolveLocationPOBoxAddress, EsolveLocationTradingDay, EsolveLocationTradingTimes, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaArticle, EsolveMediaService, EsolveMediaStockItem, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangesService, EsolveRecipeStockItem, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSeoInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveShippingTotals, EsolveSpecial, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStockBadge, EsolveStockGroup, EsolveStockGroupItem, EsolveStockImage, EsolveStockImageCollection, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, EsolveStockLeadTimes, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };
-//# sourceMappingURL=esolve-ng-esolve-connect.mjs.map
+export { EsolveAccountService, EsolveAdditionalStockImage, EsolveAddress, EsolveAddressResult, EsolveAsset, EsolveAssetsService, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartStockItem, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveColour, EsolveCookieService, EsolveEnquiryResult, EsolveEnquiryService, EsolveErrorHandlerService, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHeading, EsolveHttpError, EsolveLinkedAsset, EsolveLinkedStockItem, EsolveList, EsolveLocation, EsolveLocationAddress, EsolveLocationContactInfo, EsolveLocationPOBoxAddress, EsolveLocationTradingDay, EsolveLocationTradingTimes, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaArticle, EsolveMediaService, EsolveMediaStockItem, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangesService, EsolveRecipeStockItem, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSeoInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveShippingTotals, EsolveSpecial, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStockBadge, EsolveStockGroup, EsolveStockGroupItem, EsolveStockImage, EsolveStockImageCollection, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, EsolveStockLeadTimes, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTagsService, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };