@esolve/ng-esolve-connect 0.13.0 → 0.15.0

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

@@ -9,14 +9,7 @@ import { BehaviorSubject, throwError, of, iif } from 'rxjs';
 import * as i1$1 from '@angular/platform-browser';
 import { map, tap, catchError, switchMap } from 'rxjs/operators';
 
-const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
-// For future development
-// export const GLOBAL_CONFIG = {
-//     images_url: '',
-//     media_path: '/media',
-//     stock_path: '/stock',
-//     banner_path: '/banners'
-// };
+const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 
 class EsolveSession {
     constructor(id = -1, location_id = 0, key = '', expiration_date) {
@@ -259,7 +252,7 @@ class EsolveAuthInterceptorService {
             });
             const modified_req = req.clone({
                 url: modified_url,
-                params
+                params,
             });
             return next.handle(modified_req);
         }
@@ -330,6 +323,47 @@ class EsolveResult {
     }
 }
 
+class EsolveResponseResult {
+    constructor(response) {
+        this.success_log = [];
+        this.error_log = [];
+        this.error_log.push(...response.log.filter(log_item => log_item.type === 'error'));
+        this.success_log.push(...response.log.filter(log_item => log_item.type === 'success'));
+    }
+}
+
+class EsolveResponseHandlerService {
+    constructor() { }
+    /**
+     * Parse single HTTP response
+     *
+     * @param http_response HTTP Response to eSolve service
+     * @param resultHandler Function to parse response to a result
+     *
+     * @returns Parsed result of response
+     */
+    validateSingleHttpResponse(http_response, resultHandler) {
+        if ((http_response.responses === undefined) ||
+            (http_response.responses.length <= 0)) {
+            throw http_response;
+        }
+        const response = http_response.responses[0];
+        if ((response.status.state === 'error') ||
+            (response.status.state === 'none')) {
+            throw response;
+        }
+        return resultHandler(response);
+    }
+}
+EsolveResponseHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveResponseHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return []; } });
+
 class EsolveHttpError {
     constructor(type, message, error_code) {
         this.type = type;
@@ -340,9 +374,12 @@ class EsolveHttpError {
 
 class EsolveErrorHandlerService {
     constructor() { }
-    emitError(code, message) {
+    throwError(code, message) {
         throw new EsolveHttpError('error', message, code);
     }
+    emitError(code, message) {
+        return throwError(new EsolveHttpError('error', message, code));
+    }
     handleHttpPostError(service_type, errorRes) {
         if (!(errorRes instanceof HttpErrorResponse) &&
             !('service_type' in errorRes) &&
@@ -424,49 +461,10 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                 }]
         }], ctorParameters: function () { return []; } });
 
-class EsolveResponseResult {
-    constructor(response) {
-        this.success_log = [];
-        this.error_log = [];
-        this.error_log.push(...response.log.filter(log_item => log_item.type === 'error'));
-        this.success_log.push(...response.log.filter(log_item => log_item.type === 'success'));
-    }
-}
-
-class EsolveResponseHandlerService {
-    constructor() { }
-    /**
-     * Parse single HTTP response
-     * @param http_response HTTP Response to eSolve service
-     * @param resultHandler Function to parse response to a result
-     * @returns Parsed result of response
-     */
-    validateSingleHttpResponse(http_response, resultHandler) {
-        if ((http_response.responses === undefined) ||
-            (http_response.responses.length <= 0)) {
-            throw http_response;
-        }
-        const response = http_response.responses[0];
-        if ((response.status.state === 'error') ||
-            (response.status.state === 'none')) {
-            throw response;
-        }
-        return resultHandler(response);
-    }
-}
-EsolveResponseHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveResponseHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return []; } });
-
 /**
  * Search Engine Optimization information.
  */
-class EsolveSEOInfo {
+class EsolveSeoInfo {
     constructor(title = '', description = '', keywords = '') {
         this.title = title;
         this.description = description;
@@ -487,6 +485,16 @@ class EsolveSeoService {
         this.default_seo_keywords = '';
         this.init();
     }
+    /**
+     * Sets SEO tags for page
+     * @param seoInfo SEO object
+     */
+    setTags(seoInfo) {
+        seoInfo = this.validateAndSanitizeSeoInfo(seoInfo);
+        this.setPageTitleTags(seoInfo.title);
+        this.setPageDescriptionTags(seoInfo.description);
+        this.setPageKeywordsTags(seoInfo.keywords);
+    }
     init() {
         if (typeof this.config.title_prefix !== 'undefined') {
             this.title_prefix = this.config.title_prefix;
@@ -519,7 +527,7 @@ class EsolveSeoService {
         this.meta.updateTag({ name: 'keywords', content: keywords });
     }
     validateAndSanitizeSeoInfo(seoInfo) {
-        const pageSeo = new EsolveSEOInfo(this.default_seo_title, this.default_seo_description, this.default_seo_keywords);
+        const pageSeo = new EsolveSeoInfo(this.default_seo_title, this.default_seo_description, this.default_seo_keywords);
         if (seoInfo.description.trim() !== '') {
             pageSeo.description = seoInfo.description;
         }
@@ -560,23 +568,13 @@ class EsolveSeoService {
         }
         return pageSeo;
     }
-    /**
-     * Sets SEO tags for page
-     * @param seoInfo SEO object
-     */
-    setTags(seoInfo) {
-        seoInfo = this.validateAndSanitizeSeoInfo(seoInfo);
-        this.setPageTitleTags(seoInfo.title);
-        this.setPageDescriptionTags(seoInfo.description);
-        this.setPageKeywordsTags(seoInfo.keywords);
-    }
 }
 EsolveSeoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSeoService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.Title }, { token: i1$1.Meta }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveSeoService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSeoService, providedIn: 'root' });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSeoService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -890,7 +888,16 @@ class EsolveUserAccount {
         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;
@@ -898,7 +905,8 @@ class EsolveUserAccountBusiness {
         this.description = description;
         this.type = type;
     }
-}
+}
+
 class EsolveUserAccountContact {
     constructor(tel_number, cell_number, fax_number) {
         this.tel_number = tel_number;
@@ -907,44 +915,73 @@ class EsolveUserAccountContact {
     }
 }
 
-class EsolveUserAccountResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        this.id = 0;
-        this.id = +response.esolve_id;
+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 EsolveStockLocation {
-    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 EsolveStockLocationAddress(record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude);
-        this.pobox_address = new EsolveStockLocationPOBoxAddress(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 EsolveStockLocationContactInfo(telnumbers, record.branch_cellnumber, record.branch_email, record.branch_fax);
-        this.trading_times = new EsolveStockLocationTradingTimes(new EsolveStockLocationTradingTimesDay(record.monday_open_time, record.monday_close_time), new EsolveStockLocationTradingTimesDay(record.tuesday_open_time, record.tuesday_close_time), new EsolveStockLocationTradingTimesDay(record.wednesday_open_time, record.wednesday_close_time), new EsolveStockLocationTradingTimesDay(record.thursday_open_time, record.thursday_close_time), new EsolveStockLocationTradingTimesDay(record.friday_open_time, record.friday_close_time), new EsolveStockLocationTradingTimesDay(record.saturday_open_time, record.saturday_close_time), new EsolveStockLocationTradingTimesDay(record.sunday_open_time, record.sunday_close_time), new EsolveStockLocationTradingTimesDay(record.public_holiday_open_time, record.public_holiday_close_time), record.trading_hours_additional_info);
+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;
     }
-}
-class EsolveStockLocationAddress {
+}
+
+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 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;
+    }
+}
+
+class EsolveLocationAddress {
     constructor(street, suburb, city, province, country, postal_code, latitude, longitude) {
         this.street = street;
         this.suburb = suburb;
@@ -955,23 +992,26 @@ class EsolveStockLocationAddress {
         this.latitude = latitude;
         this.longitude = longitude;
     }
-}
-class EsolveStockLocationPOBoxAddress {
-    constructor(pobox, city, postal_code) {
-        this.pobox = pobox;
-        this.city = city;
-        this.postal_code = postal_code;
-    }
-}
-class EsolveStockLocationContactInfo {
+}
+
+class EsolveLocationContactInfo {
     constructor(telnumber, cellnumber, email, fax) {
         this.telnumber = telnumber;
         this.cellnumber = cellnumber;
         this.email = email;
         this.fax = fax;
     }
-}
-class EsolveStockLocationTradingTimes {
+}
+
+class EsolveLocationPOBoxAddress {
+    constructor(pobox, city, postal_code) {
+        this.pobox = pobox;
+        this.city = city;
+        this.postal_code = postal_code;
+    }
+}
+
+class EsolveLocationTradingTimes {
     constructor(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, trading_hours_additional_info = '') {
         this.monday = monday;
         this.tuesday = tuesday;
@@ -983,87 +1023,104 @@ class EsolveStockLocationTradingTimes {
         this.public_holiday = public_holiday;
         this.trading_hours_additional_info = trading_hours_additional_info;
     }
-}
-class EsolveStockLocationTradingTimesDay {
+}
+
+class EsolveLocationTradingDay {
     constructor(open, close) {
         this.open = open;
         this.close = close;
     }
 }
 
-class EsolveTransaction {
+class EsolveLocation {
     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);
+        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.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.branch_telnumber_2.length > 0) {
+            telnumbers.push(record.branch_telnumber_2);
         }
-        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);
+        if (record.branch_telnumber_3.length > 0) {
+            telnumbers.push(record.branch_telnumber_3);
         }
-        this.parseTransactionItems(record.transaction_items);
+        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);
     }
-    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 EsolveLocationsService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
     }
-}
-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;
+    /**
+     * Retrieves a list of stock locations
+     *
+     * @returns An `Observable` with an array of stock locations
+     */
+    getStockLocations() {
+        return this.http
+            .get(`${this.config.api_url}/get-locations.php`)
+            .pipe(map((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return this.processStockLocations(response.records);
+        }));
     }
-}
-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;
+    /**
+     * Processes the eSolve stock location records.
+     *
+     * @param records Records to process
+     * @returns An array of processed stock location records
+     */
+    processStockLocations(records) {
+        const stock_locations = [];
+        if (records) {
+            for (const record of records) {
+                stock_locations.push(new EsolveLocation(record));
+            }
+        }
+        return stock_locations;
     }
 }
-class EsolveTransactionLocation extends EsolveStockLocation {
-}
+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',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    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;
@@ -1072,7 +1129,8 @@ class EsolveTransactionPaymentMethod {
         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;
@@ -1083,71 +1141,73 @@ class EsolveTransactionShippingMethod {
         this.pricing = pricing;
         this.client_to_collect = client_to_collect;
     }
-}
-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 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;
     }
-}
-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 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);
     }
-}
-class EsolveTransactionItemPrice {
-    constructor(
-    /**
-     * Price without tax
-     */
-    price, 
-    /**
-     * Price with tax
-     */
-    price_with_tax, 
-    /**
-     * Price without tax and with discounts applied if appilcable
-     */
-    price_discounted, 
-    /**
-     * Price with tax and with discounts applied if appilcable
-     */
-    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;
+    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 {
 }
 
-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;
-    }
-}
+// Classes
 
 class EsolveChangePasswordResult extends EsolveResponseResult {
     constructor(response) {
@@ -1166,6 +1226,17 @@ class EsolveResetPasswordResult extends EsolveResponseResult {
     }
 }
 
+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);
@@ -1456,7 +1527,7 @@ class EsolveAccountService {
     }
     loginGuard() {
         if (this.user_id <= 0) {
-            this.errorHandler.emitError('login_required', 'Login is required');
+            this.errorHandler.throwError('login_required', 'Login is required');
         }
     }
 }
@@ -1465,34 +1536,178 @@ EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0",
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, decorators: [{
             type: Injectable,
             args: [{
-                    providedIn: 'root'
+                    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 EsolveHeading {
-    constructor(identifier, value) {
-        this.identifier = identifier;
-        this.value = value;
-    }
-}
-
-class EsolveMediaArticle {
-    constructor(identifier, title, article, image_url = '', tags = [], topics = [], seo_title = '', seo_keywords = '', seo_description = '') {
+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.image_url = image_url;
-        this.tags = tags;
-        this.topics = topics;
-        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;
         }
-        this.seo_details = new EsolveSEOInfo(seo_title, seo_description, seo_keywords);
-    }
-}
+        if (images.mobile) {
+            this.mobile_images = images.mobile;
+        }
+        if (images.sub) {
+            this.sub_images = images.sub;
+        }
+    }
+}
+
+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 EsolveBannerImageHotspot {
+    constructor(url, target, coords, coords_string) {
+        this.url = url;
+        this.target = target;
+        this.coords = coords;
+        this.coords_string = coords_string;
+    }
+}
+
+class EsolveBannerService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
+    }
+    /**
+     * 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 (banner_display_container) {
+            params = params.set('banner_display_container', banner_display_container);
+        }
+        return this.http
+            .get(`${this.config.api_url}/get-banners.php`, { params })
+            .pipe(map((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return this.processBanners(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
+     */
+    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;
+    }
+}
+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',
+                }]
+        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+                    type: Inject,
+                    args: [ESOLVE_CONNECT_CONFIG]
+                }] }, { type: i1$2.HttpClient }]; } });
+
+// Types
+
+class EsolveHeading {
+    constructor(identifier, value) {
+        this.identifier = identifier;
+        this.value = value;
+    }
+}
+
+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 EsolveTag {
     constructor(id, tag_phrase, tag_weight, description) {
@@ -1512,6 +1727,52 @@ class EsolveTopic {
     }
 }
 
+class EsolveTopicService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
+    }
+    /**
+     * 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);
+        }));
+    }
+    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);
+            }
+        }
+        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 EsolveMediaService {
     constructor(config, http) {
         this.config = config;
@@ -1631,6 +1892,55 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     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 EsolveMenuService {
+    constructor(config, http) {
+        this.config = config;
+        this.http = http;
+    }
+    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 [];
+            }
+            return this.handleMenu(response.records);
+        }));
+    }
+    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;
+    }
+}
+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',
+                }]
+        }], 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;
@@ -1655,7 +1965,7 @@ class EsolveNewsArticle {
         if (seo_title.trim() === '') {
             seo_title = this.title;
         }
-        this.seo_details = new EsolveSEOInfo(seo_title, short_description, seo_keywords);
+        this.seo_details = new EsolveSeoInfo(seo_title, short_description, seo_keywords);
     }
 }
 
@@ -1769,139 +2079,175 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-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;
+class EsolveColour {
+    constructor(record) {
+        this.id = record.id ?? 0;
+        this.colour = record.colour ?? '';
+        this.description = record.description ?? '';
+    }
+}
+
+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.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;
+        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 (images.mobile) {
-            this.mobile_images = images.mobile;
+        else {
+            this.id = `<<SUB>>${this.esolve_id}`;
+            this.image_path = '/images/subcategories/';
         }
-        if (images.sub) {
-            this.sub_images = images.sub;
+        if (seo_title.trim() === '') {
+            seo_title = this.description;
         }
+        this.seo_details = new EsolveSeoInfo(seo_title, seo_description, seo_keywords);
     }
-}
-
-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 small_image_src() {
+        return this.getImagePath('small');
     }
-    get src() {
-        return '/images/banners/' + this.filename;
+    get thumbnail_image_src() {
+        return this.getImagePath('thumb');
     }
-}
-
-class EsolveBannerImageHotspot {
-    constructor(url, target, coords, coords_string) {
-        this.url = url;
-        this.target = target;
-        this.coords = coords;
-        this.coords_string = coords_string;
+    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 EsolveBannerService {
+class EsolveCategoryTreeService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
     /**
-     * Retrieves banners records from eSolve instance
-     *
-     * @returns An observable of eSolve banners.
+     * Retrieves the category tree from eSolve instance and coverts it to the correct format.
      */
-    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);
-        }
+    getCategoryTree() {
         return this.http
-            .get(`${this.config.api_url}/get-banners.php`, { params })
+            .get(`${this.config.api_url}/get-tree.php`)
             .pipe(map((response) => {
             if (response.records === undefined) {
                 throw response;
             }
-            return this.processBanners(response.records);
+            return this.processTree(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);
+    /**
+     * 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;
             }
         }
-        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);
+        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;
             }
         }
-        return images;
+        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');
     }
     /**
-     * Process banner records into banner objects
-     * @param records Array of records
-     * @returns List of banners
+     * Processes the eSolve tree records and converts them into the correct format.
+     *
+     * @param tree_records Records to process
      */
-    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);
+    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;
                 }
-                if (record.images.sub) {
-                    image_sets.sub = this.processBannerImages(record.images.sub, record.type);
+                else {
+                    esolve_id = tree_record.id;
+                    parent_id = tree_record.menu_id;
                 }
-                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);
+                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 banners;
+        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;
     }
 }
-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: [{
+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',
@@ -1911,46 +2257,102 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     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 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;
+        }
+        if (seo_title.trim() === '') {
+            seo_title = this.title;
+        }
+        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 `${this.image_path}${image_size}/${this.image_name}`;
+        }
+        return '';
     }
 }
 
-class EsolveMenuService {
+class EsolveManufacturersService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    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 [];
-            }
-            return this.handleMenu(response.records);
+    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([]);
         }));
     }
-    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)));
+    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 menu;
+            return 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);
     }
 }
-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: [{
+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',
@@ -1960,46 +2362,100 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveTopicService {
+class EsolveRange {
+    constructor(id, range, sef_range, manufacturers_id, title, article, is_active, featured, sort_priority, image_name, seo_title = '', seo_keywords = '', seo_description = '') {
+        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;
+        }
+        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 EsolveRangesService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    /**
-     * 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 = []) {
+    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 (topic_id_list.length > 0) {
-            params = params.append('topic_id', topic_id_list.join(','));
+        if (options?.featured_only) {
+            params = params.set('featured_only', options.featured_only);
         }
-        return this.http.get(`${this.config.api_url}/get-topics.php`, { params }).pipe(map(response => {
-            if (response.records === undefined) {
-                throw response;
+        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 this.processTopics(response.records);
+            return ranges;
+        }), catchError(() => {
+            return of([]);
         }));
     }
-    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);
+    getRangeSingle(params) {
+        return this.getRangeRecords(params).pipe(map((records) => {
+            const record = records[0];
+            return this.processRange(record);
+        }));
+    }
+    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 topics;
+            return response.records;
+        }));
+    }
+    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);
     }
 }
-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: [{
+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'
+                    providedIn: 'root',
                 }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{
                     type: Inject,
@@ -2025,26 +2481,26 @@ class EsolveStockPrice {
      * Create stock price instance
      * @param base_price Price without tax
      * @param base_price_with_tax Price with tax
-     * @param sell_price Price without tax and with discounts applied if appilcable
-     * @param sell_price_with_tax Price with tax and with discounts applied if appilcable
+     * @param sell_price Price without tax and with discounts applied if applicable
+     * @param sell_price_with_tax Price with tax and with discounts applied if applicable
      */
     constructor(
     /**
      * Price without tax
      */
-    base_price, 
+    base_price = 0, 
     /**
      * Price with tax
      */
-    base_price_with_tax, 
+    base_price_with_tax = 0, 
     /**
-     * Price without tax and with discounts applied if appilcable
+     * Price without tax and with discounts applied if applicable
      */
-    sell_price, 
+    sell_price = 0, 
     /**
-     * Price with tax and with discounts applied if appilcable
+     * Price with tax and with discounts applied if applicable
      */
-    sell_price_with_tax) {
+    sell_price_with_tax = 0) {
         this.base_price = base_price;
         this.base_price_with_tax = base_price_with_tax;
         this.sell_price = sell_price;
@@ -2060,139 +2516,220 @@ class EsolveStockPrice {
     }
 }
 
-/**
- * Stock Item object. It can be a service or a product (physical and/or digital).
- */
-class EsolveStockItem {
-    /**
-     * Constructs an instance of EsolveStockItem
-     *
-     * @param id eSolve Generated ID
-     * @param code Code identifying the stock item
-     * @param name Name of the stock item
-     * @param sef_name Search engine friendly name
-     * @param description Short description of stock item
-     * @param active Active state
-     * @param featured Featured state
-     * @param image_name Image filename
-     * @param price Default price
-     * @param tags Linked tags
-     * @param topics Linked topics
-     * @param seo_title SEO page title
-     * @param seo_keywords SEO page keywords
-     */
-    constructor(
-    /**
-     * eSolve Generated ID
-     */
-    id, 
-    /**
-     * Code identifying the stock item
-     */
-    code, 
-    /**
-     * Name of the stock item
-     */
-    name, 
-    /**
-     * Search engine friendly name
-     */
-    sef_name, 
-    /**
-     * Short description of stock item
-     */
-    description, 
-    /**
-     * Full description of stock item
-     */
-    extended_description, 
-    /**
-     * Active state
-     */
-    active, 
-    /**
-     * Featured state
-     */
-    featured, 
-    /**
-     * Image filename
-     */
-    image_name, 
-    /**
-     * Default price
-     */
-    price, 
-    /**
-     * Linked tags
-     */
-    tags, 
-    /**
-     * Linked topics
-     */
-    topics, 
-    /**
-     * Stock badges
-     */
-    badges, 
-    /**
-     * ID of default category linked to the stock item
-     */
-    category_id, 
-    /**
-     * ID of default subcategory linked to the stock item
-     */
-    subcategory_id, manufacturers_id, ranges_id, seo_title = '', seo_keywords = '') {
-        this.id = id;
-        this.code = code;
-        this.name = name;
-        this.sef_name = sef_name;
-        this.description = description;
-        this.extended_description = extended_description;
-        this.active = active;
-        this.featured = featured;
-        this.image_name = image_name;
-        this.price = price;
-        this.tags = tags;
-        this.topics = topics;
-        this.badges = badges;
-        this.category_id = category_id;
-        this.subcategory_id = subcategory_id;
-        this.manufacturers_id = manufacturers_id;
-        this.ranges_id = ranges_id;
+class EsolveStockItemBase {
+    constructor(record = {}) {
+        /**
+         * eSolve Generated ID
+         */
+        this.id = 0;
+        /**
+         * Code identifying the stock item
+         */
+        this.code = '';
+        /**
+         * Name of the stock item
+         */
+        this.name = '';
+        /**
+         * Search engine friendly name
+         */
+        this.sef_name = '';
+        /**
+         * Short description of stock item
+         */
+        this.description = '';
+        /**
+         * Full description of stock item
+         */
+        this.extended_description = '';
+        /**
+         * Active state
+         */
+        this.active = false;
+        /**
+         * Featured state
+         */
+        this.featured = false;
+        /**
+         * ID of default category linked to the stock item
+         *
+         * @deprecated Use `category.esolve_id` field instead
+         */
+        this.category_id = '';
+        /**
+         * ID of default subcategory linked to the stock item
+         *
+         * @deprecated Use `subcategory.esolve_id` field instead
+         */
+        this.subcategory_id = 0;
+        /**
+         * ID of linked manufacturer
+         *
+         * @deprecated Use `manufacturer.id` field instead
+         */
+        this.manufacturers_id = 0;
+        /**
+         * ID of linked range
+         *
+         * @deprecated Use `range.id` field instead
+         */
+        this.ranges_id = 0;
+        /**
+         * Linked tags
+         */
+        this.tags = [];
+        /**
+         * Linked topics
+         */
+        this.topics = [];
+        /**
+         * Stock badges
+         */
+        this.badges = [];
+        /**
+         * Colours
+         */
+        this.colours = [];
+        /**
+         * Image filename
+         */
+        this.image_name = '';
+        let seo_title = '';
+        let seo_keywords = '';
+        let base_price = 0;
+        let base_price_with_tax = 0;
+        let sell_price = 0;
+        let sell_price_with_tax = 0;
+        if (record) {
+            this.id = +(record.id ?? 0);
+            this.code = record.code ?? '';
+            this.name = record.name ?? '';
+            this.sef_name = record.sef_name ?? '';
+            this.description = record.description ?? '';
+            this.extended_description = record.extended_description ?? '';
+            this.image_name = record.image_name ?? '';
+            this.category_id = record.category_id ?? '';
+            this.subcategory_id = +(record.subcategory_id ?? 0);
+            this.manufacturers_id = +(record.manufacturers_id ?? 0);
+            this.ranges_id = +(record.ranges_id ?? 0);
+            this.active = !!+(record.is_active ?? false);
+            this.featured = !!+(record.is_featured ?? false);
+            base_price = +(record.regular_sellprice ?? 0);
+            base_price_with_tax = +(record.regular_sellprice_inclusive ?? 0);
+            sell_price = +(record.sellprice ?? 0);
+            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));
+                }
+            }
+            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));
+                }
+            }
+            if ((record.badges) && (record.badges.length > 0)) {
+                for (const badge of record.badges) {
+                    this.badges.push(new EsolveStockBadge(+badge.id, badge.text, badge.identifier, badge.font_colour, badge.badge_colour, +badge.sort_priority));
+                }
+            }
+            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.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);
+            }
+            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);
+            }
+            if (record.colours && record.colours.length > 0) {
+                for (const colour of record.colours) {
+                    this.colours.push(new EsolveColour(colour));
+                }
+            }
+            if (record.custom_fields) {
+                this.custom_fields = record.custom_fields;
+            }
+            seo_title = record.seo_page_title ?? '';
+            seo_keywords = record.seo_keywords ?? '';
+        }
+        this.price = new EsolveStockPrice(base_price, base_price_with_tax, sell_price, sell_price_with_tax);
         if (seo_title.trim() === '') {
             seo_title = this.name;
         }
-        this.seo_details = new EsolveSEOInfo(seo_title, description, seo_keywords);
+        this.seo_details = new EsolveSeoInfo(seo_title, this.description, seo_keywords);
     }
     /**
      * Path to tiny stock image
      */
     get tiny_image_src() {
-        return '/images/' + (this.image_name ? 'stock/tiny/' + this.image_name : 'no_image.jpg');
+        return this.getImagePath('tiny');
     }
     /**
      * Path to thumbnail stock image
      */
     get thumbnail_image_src() {
-        return '/images/' + (this.image_name ? 'stock/thumb/' + this.image_name : 'no_image.jpg');
+        return this.getImagePath('thumb');
     }
     /**
      * Path to small stock image
      */
     get small_image_src() {
-        return '/images/' + (this.image_name ? 'stock/small/' + this.image_name : 'no_image.jpg');
+        return this.getImagePath('small');
     }
     /**
      * Path to big stock image
      */
     get big_image_src() {
-        return '/images/' + (this.image_name ? 'stock/big/' + this.image_name : 'no_image.jpg');
+        return this.getImagePath('big');
     }
     /**
      * Path to original stock image
      */
     get original_image_src() {
-        return '/images/' + (this.image_name ? 'stock/original/' + this.image_name : 'no_image.jpg');
+        return this.getImagePath('original');
+    }
+    getImagePath(image_size) {
+        if (this.image_name !== '') {
+            return `/images/stock/${image_size}/${this.image_name}`;
+        }
+        return '';
+    }
+}
+
+class EsolveStockGroupItem extends EsolveStockItemBase {
+    constructor(record) {
+        super(record);
+    }
+}
+
+class EsolveStockGroup {
+    constructor(group, records = []) {
+        this.group = group;
+        this.items = [];
+        if (records.length > 0) {
+            for (const record of records) {
+                this.items.push(new EsolveStockGroupItem(record));
+            }
+        }
+    }
+}
+
+/**
+ * Stock Item object. It can be a service or a product (physical and/or digital).
+ */
+class EsolveStockItem extends EsolveStockItemBase {
+    /**
+     * Constructs an instance of EsolveStockItem
+     */
+    constructor(record) {
+        super(record);
+        if (record?.group && record.grouped_items) {
+            this.group = new EsolveStockGroup(record.group, record.grouped_items);
+        }
     }
 }
 
@@ -2207,413 +2744,200 @@ class EsolveStockItemList {
     }
 }
 
-class EsolveStockService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+class EsolveRecipeStockItem extends EsolveStockItemBase {
+    constructor(record) {
+        super(record);
+        this.qty = 0;
+        this.qty = +(record?.qty ?? 0);
     }
-    /**
-     * Retrieves the stock record from the eSolve instance using the code.
-     * @param code eSolve stock code
-     */
-    getStockItem(code) {
-        const params = new HttpParams({
-            fromObject: {
-                code
-            }
-        });
-        return this.getStockRecords(params).pipe(map(response => {
-            if ((response.records === undefined) || (response.records.length <= 0)) {
-                throw response;
-            }
-            const stockRecord = response.records[0];
-            return this.processStockItem(stockRecord);
-        }));
-    }
-    /**
-     * Retrieves the stock record from the eSolve instance using the SEF name.
-     * @param sef_name SEF name of the stock item
-     */
-    getStockItemFromSEF(sef_name) {
-        const params = new HttpParams({
-            fromObject: {
-                sef_name
-            }
-        });
-        return this.getStockRecords(params).pipe(map(response => {
-            if ((response.records === undefined) || (response.records.length <= 0)) {
-                throw response;
-            }
-            const stockRecord = response.records[0];
-            return this.processStockItem(stockRecord);
-        }));
-    }
-    /**
-     * Retrieves list of stock from the eSolve instance using info provided
-     * @param options Stock filter options
-     */
-    getStockItems(options) {
-        let params = new HttpParams();
-        if (options.page) {
-            params = params.set('page', options.page);
-        }
-        if (options.rows) {
-            params = params.set('rows', options.rows);
-        }
-        if (options.search_phrase) {
-            params = params.set('search_phrase', options.search_phrase);
-        }
-        if (options.display_only) {
-            params = params.set('display_only', options.display_only);
-        }
-        if (options.is_active) {
-            params = params.set('is_active', options.is_active);
-        }
-        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.specials_id) {
-            params = params.set('specials_id', options.specials_id);
-        }
-        if (options.tag_id_list) {
-            if (options.tag_id_list.length > 0) {
-                params = params.set('tag_id', options.tag_id_list.join(','));
-            }
-        }
-        if (options.topic_id_list) {
-            if (options.topic_id_list.length > 0) {
-                params = params.set('topic_id', options.topic_id_list.join(','));
-            }
-        }
-        return this.getStockRecords(params).pipe(map(response => {
-            if ((response.records === undefined) || (response.records.length <= 0)) {
-                throw response;
-            }
-            const stockItems = [];
-            response.records.forEach(stockRecord => {
-                stockItems.push(this.processStockItem(stockRecord));
-            });
-            return new EsolveStockItemList(stockItems, +response.additional_data.total_records, options.page ?? 0);
-        }));
-    }
-    /**
-     * Processes the eSolve stock item record and converts it to StockItem object.
-     * @param record eSolve stock item record
-     */
-    processStockItem(record) {
-        const tags = [];
-        const topics = [];
-        const badges = [];
-        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));
-            }
-        }
-        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));
-            }
-        }
-        if ((record.badges) && (record.badges.length > 0)) {
-            for (const badge of record.badges) {
-                badges.push(new EsolveStockBadge(+badge.id, badge.text, badge.identifier, badge.font_colour, badge.badge_colour, +badge.sort_priority));
-            }
-        }
-        const price = new EsolveStockPrice(record.regular_sellprice, record.regular_sellprice_inclusive, record.sellprice, record.sellprice_inclusive);
-        return new EsolveStockItem(+record.id, record.code, record.name, record.sef_name, record.description, record.extended_description, !!+record.is_active, !!+record.is_featured, record.image_name, price, tags, topics, badges, record.category_id, +record.subcategory_id, +record.manufacturers_id, +record.ranges_id, record.seo_page_title, record.seo_keywords);
-    }
-    /**
-     * Retrieves stock records from HTTP params.
-     * @param params HTTP client parameters
-     */
-    getStockRecords(params) {
-        return this.http.get(`${this.config.api_url}/get-items.php`, { params });
-    }
-}
-EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveStockService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root',
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }, { type: i1$2.HttpClient }]; } });
+}
 
-class EsolveCategoryTreeItem {
-    constructor(type, esolve_id, parent_id, description, sef_description, short_description, sort_priority, active, display_only, image_name, seo_title, seo_keywords, seo_description, children) {
-        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.image_path = '';
-        this.id = '';
-        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/';
-        }
-        if (seo_title.trim() === '') {
-            seo_title = this.description;
-        }
-        this.seo_details = new EsolveSEOInfo(seo_title, seo_description, seo_keywords);
-    }
-    generateImagePath(image_size) {
-        if (this.image_name !== '') {
-            return `${this.image_path}${image_size}/${this.image_name}`;
-        }
-        return '';
-    }
-    get small_image_src() {
-        return this.generateImagePath('small');
-    }
-    get thumbnail_image_src() {
-        return this.generateImagePath('thumb');
-    }
-    get tiny_image_src() {
-        return this.generateImagePath('tiny');
+class EsolveLinkedStockItem extends EsolveStockItemBase {
+    constructor(record) {
+        super(record);
+        this.qty = 0;
+        this.qty = +(record?.qty ?? 0);
     }
 }
 
-class EsolveCategoryTreeService {
+class EsolveStockService {
     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
-            .get(`${this.config.api_url}/get-tree.php`)
-            .pipe(map((response) => {
-            if (response.records === undefined) {
-                throw response;
-            }
-            return this.processTree(response.records);
-        }));
-    }
-    /**
-     * 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');
-    }
-    /**
-     * Processes the eSolve tree records and converts them into the correct format.
+     * Retrieves the stock record from the eSolve instance using the code.
      *
-     * @param tree_records Records to process
+     * @param code eSolve stock code
      */
-    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));
-            }
-        }
-        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.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;
-    }
-}
-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;
-        }
-        if (seo_title.trim() === '') {
-            seo_title = this.title;
-        }
-        this.seo_details = new EsolveSEOInfo(seo_title, seo_description, seo_keywords);
-    }
-    get small_image_src() {
-        return this.generateImagePath('small');
-    }
-    get thumbnail_image_src() {
-        return this.generateImagePath('thumb');
-    }
-    get tiny_image_src() {
-        return this.generateImagePath('tiny');
-    }
-    generateImagePath(image_size) {
-        if (this.image_name !== '') {
-            return `${this.image_path}${image_size}/${this.image_name}`;
-        }
-        return '';
-    }
-}
-
-class EsolveManufacturersService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
-    }
-    getManufacturer(id) {
+    getStockItem(code) {
         const params = new HttpParams({
-            fromObject: { manufacturers_id: id }
+            fromObject: {
+                code
+            }
         });
-        return this.getManufacturerSingle(params);
+        return this.getStockRecords(params).pipe(map(response => {
+            if ((response.records === undefined) || (response.records.length <= 0)) {
+                throw response;
+            }
+            const stockRecord = response.records[0];
+            return this.processStockItem(stockRecord);
+        }));
     }
-    getManufacturerFromSEF(sef_manufacturer) {
+    /**
+     * Retrieves the stock record from the eSolve instance using the SEF name.
+     *
+     * @param sef_name SEF name of the stock item
+     */
+    getStockItemFromSEF(sef_name) {
         const params = new HttpParams({
-            fromObject: { sef_manufacturer }
+            fromObject: {
+                sef_name
+            }
         });
-        return this.getManufacturerSingle(params);
+        return this.getStockRecords(params).pipe(map(response => {
+            if ((response.records === undefined) || (response.records.length <= 0)) {
+                throw response;
+            }
+            const stockRecord = response.records[0];
+            return this.processStockItem(stockRecord);
+        }));
     }
-    getManufacturers(options) {
+    /**
+     * Retrieves list of stock from the eSolve instance using info provided
+     *
+     * @param options Stock filter options
+     */
+    getStockItems(options) {
         let params = new HttpParams();
-        if (options?.featured_only) {
-            params = params.set('featured_only', options.featured_only);
+        if (options.page) {
+            params = params.set('page', options.page);
         }
-        return this.getManufacturerRecords(params).pipe(map((records) => {
-            const manufacturers = [];
-            for (const record of records) {
-                manufacturers.push(this.processManufacturer(record));
+        if (options.rows) {
+            params = params.set('rows', options.rows);
+        }
+        if (options.search_phrase) {
+            params = params.set('search_phrase', options.search_phrase);
+        }
+        if (options.display_only) {
+            params = params.set('display_only', options.display_only);
+        }
+        if (options.is_active) {
+            params = params.set('is_active', options.is_active);
+        }
+        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.specials_id) {
+            params = params.set('specials_id', options.specials_id);
+        }
+        if (options.tag_id_list) {
+            if (options.tag_id_list.length > 0) {
+                params = params.set('tag_id', options.tag_id_list.join(','));
             }
-            return manufacturers;
-        }), catchError(() => {
-            return of([]);
+        }
+        if (options.topic_id_list) {
+            if (options.topic_id_list.length > 0) {
+                params = params.set('topic_id', options.topic_id_list.join(','));
+            }
+        }
+        return this.getStockRecords(params).pipe(map(response => {
+            if ((response.records === undefined) || (response.records.length <= 0)) {
+                throw response;
+            }
+            const stockItems = [];
+            response.records.forEach(stockRecord => {
+                stockItems.push(this.processStockItem(stockRecord));
+            });
+            return new EsolveStockItemList(stockItems, +response.additional_data.total_records, options.page ?? 0);
         }));
     }
-    getManufacturerSingle(params) {
-        return this.getManufacturerRecords(params).pipe(map((records) => {
-            const record = records[0];
-            return this.processManufacturer(record);
+    /**
+     * Retrieve list of stock items linked to a stock item from the eSolve API
+     *
+     * @param code Stock item code
+     */
+    getLinkedItems(code) {
+        return this.http
+            .get(`${this.config.api_url}/get-linked-items.php`, { params: { code } })
+            .pipe(map((response) => {
+            if ((response.records === undefined) || (response.records.length <= 0)) {
+                throw response;
+            }
+            return this.processLinkedItems(response.records);
         }));
     }
-    getManufacturerRecords(params) {
+    /**
+     * Retrieve list of stock items on a recipe from the eSolve API
+     *
+     * @param code Stock item code
+     */
+    getRecipeItems(code) {
         return this.http
-            .get(`${this.config.api_url}/get-manufacturers.php`, { params })
+            .get(`${this.config.api_url}/get-recipe-items.php`, { params: { code } })
             .pipe(map((response) => {
-            if ((response.records === undefined) ||
-                (response.records.length <= 0)) {
+            if ((response.records === undefined) || (response.records.length <= 0)) {
                 throw response;
             }
-            return response.records;
+            return this.processRecipeItems(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);
+    /**
+     * Processes the eSolve stock item record and converts it to an object.
+     *
+     * @param record eSolve stock item record
+     */
+    processStockItem(record) {
+        return new EsolveStockItem(record);
+    }
+    /**
+     * Processes the linked eSolve stock item records and converts them to objects.
+     *
+     * @param records Linked eSolve stock item records
+     */
+    processLinkedItems(records) {
+        const items = [];
+        if (records.length > 0) {
+            for (const record of records) {
+                items.push(new EsolveLinkedStockItem(record));
+            }
+        }
+        return items;
+    }
+    /**
+     * Processes the recipe eSolve stock item records and converts them to objects.
+     *
+     * @param records Recipe eSolve stock item records
+     */
+    processRecipeItems(records) {
+        const items = [];
+        if (records.length > 0) {
+            for (const record of records) {
+                items.push(new EsolveRecipeStockItem(record));
+            }
+        }
+        return items;
+    }
+    /**
+     * Retrieves stock records from HTTP params.
+     * @param params HTTP client parameters
+     */
+    getStockRecords(params) {
+        return this.http.get(`${this.config.api_url}/get-items.php`, { params });
     }
 }
-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: [{
+EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveStockService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveStockService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2623,6 +2947,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
+// Models
+
 class EsolveSpecialImage {
     constructor(record) {
         this.id = +record.id;
@@ -2666,181 +2992,81 @@ class EsolveSpecial {
         this.discount_type = +record.discount_type;
         this.special_type = record.special_type;
         this.location_id = +record.location_id;
-        this.active = !!+record.active;
-        this.featured = !!+record.featured;
-        this.assets = [];
-        if (record.assets.length > 0) {
-            for (const asset_record of record.assets) {
-                this.assets.push(new EsolveLinkedAsset(asset_record));
-            }
-        }
-        if (record.images &&
-            ((record.images.thumb &&
-                record.images.thumb.length > 0) ||
-                (record.images.banner &&
-                    record.images.banner.length > 0) ||
-                (record.images.banner_mobile &&
-                    record.images.banner_mobile.length > 0)) &&
-            record.image_container.trim() !== '') {
-            this.images = new EsolveSpecialImageCollection(record.image_container, record.images);
-        }
-        if (record.seo_page_title.trim() === '') {
-            record.seo_page_title = this.name;
-        }
-        this.seo_details = new EsolveSEOInfo(record.seo_page_title, record.seo_description, record.seo_keywords);
-    }
-}
-
-class EsolveSpecialsService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
-    }
-    getSpecial(specials_id) {
-        const params = new HttpParams({
-            fromObject: { specials_id }
-        });
-        return this.getSpecialSingle(params);
-    }
-    getSpecialFromIdentifier(identifier) {
-        const params = new HttpParams({
-            fromObject: { identifier }
-        });
-        return this.getSpecialSingle(params);
-    }
-    getSpecials(options) {
-        let params = new HttpParams();
-        if (options?.featured_only) {
-            params = params.set('featured_only', options.featured_only);
-        }
-        if (options?.image_container) {
-            params = params.set('image_container', options.image_container);
-        }
-        if (options?.location_id) {
-            params = params.set('location_id', options.location_id);
-        }
-        if (options?.special_type) {
-            params = params.set('special_type', options.special_type);
-        }
-        return this.getSpecialRecords(params).pipe(map((records) => {
-            const specials = [];
-            for (const record of records) {
-                specials.push(this.processSpecial(record));
-            }
-            return specials;
-        }), catchError(() => {
-            return of([]);
-        }));
-    }
-    getSpecialSingle(params) {
-        return this.getSpecialRecords(params).pipe(map((records) => {
-            const record = records[0];
-            return this.processSpecial(record);
-        }));
-    }
-    getSpecialRecords(params) {
-        return this.http
-            .get(`${this.config.api_url}/get-specials.php`, { params })
-            .pipe(map((response) => {
-            if ((response.records === undefined) ||
-                (response.records.length <= 0)) {
-                throw response;
-            }
-            return response.records;
-        }));
-    }
-    processSpecial(record) {
-        return new EsolveSpecial(record);
-    }
-}
-EsolveSpecialsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSpecialsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveSpecialsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSpecialsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSpecialsService, decorators: [{
-            type: Injectable,
-            args: [{
-                    providedIn: 'root'
-                }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    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 = '') {
-        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.active = !!+record.active;
+        this.featured = !!+record.featured;
+        this.assets = [];
+        if (record.assets.length > 0) {
+            for (const asset_record of record.assets) {
+                this.assets.push(new EsolveLinkedAsset(asset_record));
+            }
         }
-        if (seo_title.trim() === '') {
-            seo_title = this.title;
+        if (record.images &&
+            ((record.images.thumb &&
+                record.images.thumb.length > 0) ||
+                (record.images.banner &&
+                    record.images.banner.length > 0) ||
+                (record.images.banner_mobile &&
+                    record.images.banner_mobile.length > 0)) &&
+            record.image_container.trim() !== '') {
+            this.images = new EsolveSpecialImageCollection(record.image_container, record.images);
         }
-        this.seo_details = new EsolveSEOInfo(seo_title, seo_description, seo_keywords);
-    }
-    get image_src() {
-        return this.generateImagePath();
-    }
-    generateImagePath() {
-        if (this.image_name !== '') {
-            return `${this.image_path}${this.image_name}`;
+        if (record.seo_page_title.trim() === '') {
+            record.seo_page_title = this.name;
         }
-        return '';
+        this.seo_details = new EsolveSeoInfo(record.seo_page_title, record.seo_description, record.seo_keywords);
     }
 }
 
-class EsolveRangesService {
+class EsolveSpecialsService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    getRange(id) {
+    getSpecial(specials_id) {
         const params = new HttpParams({
-            fromObject: { ranges_id: id }
+            fromObject: { specials_id }
         });
-        return this.getRangeSingle(params);
+        return this.getSpecialSingle(params);
     }
-    getRangeFromSEF(sef_range) {
+    getSpecialFromIdentifier(identifier) {
         const params = new HttpParams({
-            fromObject: { sef_range }
+            fromObject: { identifier }
         });
-        return this.getRangeSingle(params);
+        return this.getSpecialSingle(params);
     }
-    getRanges(options) {
+    getSpecials(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);
+        if (options?.image_container) {
+            params = params.set('image_container', options.image_container);
         }
-        return this.getRangeRecords(params).pipe(map((records) => {
-            const ranges = [];
+        if (options?.location_id) {
+            params = params.set('location_id', options.location_id);
+        }
+        if (options?.special_type) {
+            params = params.set('special_type', options.special_type);
+        }
+        return this.getSpecialRecords(params).pipe(map((records) => {
+            const specials = [];
             for (const record of records) {
-                ranges.push(this.processRange(record));
+                specials.push(this.processSpecial(record));
             }
-            return ranges;
+            return specials;
         }), catchError(() => {
             return of([]);
         }));
     }
-    getRangeSingle(params) {
-        return this.getRangeRecords(params).pipe(map((records) => {
+    getSpecialSingle(params) {
+        return this.getSpecialRecords(params).pipe(map((records) => {
             const record = records[0];
-            return this.processRange(record);
+            return this.processSpecial(record);
         }));
     }
-    getRangeRecords(params) {
+    getSpecialRecords(params) {
         return this.http
-            .get(`${this.config.api_url}/get-ranges.php`, { params })
+            .get(`${this.config.api_url}/get-specials.php`, { params })
             .pipe(map((response) => {
             if ((response.records === undefined) ||
                 (response.records.length <= 0)) {
@@ -2849,13 +3075,13 @@ class EsolveRangesService {
             return response.records;
         }));
     }
-    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);
+    processSpecial(record) {
+        return new EsolveSpecial(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: [{
+EsolveSpecialsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSpecialsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveSpecialsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSpecialsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSpecialsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -2897,6 +3123,55 @@ class EsolveCartItem {
     }
 }
 
+class EsolveCartStockItem {
+    constructor(code, name, sef_name, description, active, items_in_pack, delivery_category, image_name) {
+        this.code = code;
+        this.name = name;
+        this.sef_name = sef_name;
+        this.description = description;
+        this.active = active;
+        this.items_in_pack = items_in_pack;
+        this.delivery_category = delivery_category;
+        this.image_name = image_name;
+    }
+    /**
+     * Path to tiny stock image
+     */
+    get tiny_image_src() {
+        return this.getImagePath('tiny');
+    }
+    /**
+     * Path to thumbnail stock image
+     */
+    get thumbnail_image_src() {
+        return this.getImagePath('thumb');
+    }
+    /**
+     * Path to small stock image
+     */
+    get small_image_src() {
+        return this.getImagePath('small');
+    }
+    /**
+     * Path to big stock image
+     */
+    get big_image_src() {
+        return this.getImagePath('big');
+    }
+    /**
+     * Path to original stock image
+     */
+    get original_image_src() {
+        return this.getImagePath('original');
+    }
+    getImagePath(image_size) {
+        if (this.image_name !== '') {
+            return `/images/stock/${image_size}/${this.image_name}`;
+        }
+        return '';
+    }
+}
+
 /**
  * Totals in cart
  */
@@ -2936,49 +3211,6 @@ class EsolveCartTotals {
     }
 }
 
-class EsolveCartStockItem {
-    constructor(code, name, sef_name, description, active, items_in_pack, delivery_category, image_name) {
-        this.code = code;
-        this.name = name;
-        this.sef_name = sef_name;
-        this.description = description;
-        this.active = active;
-        this.items_in_pack = items_in_pack;
-        this.delivery_category = delivery_category;
-        this.image_name = image_name;
-    }
-    /**
-     * Path to tiny stock image
-     */
-    get tiny_image_src() {
-        return '/images/' + (this.image_name ? 'stock/tiny/' + this.image_name : 'no_image.jpg');
-    }
-    /**
-     * Path to thumbnail stock image
-     */
-    get thumbnail_image_src() {
-        return '/images/' + (this.image_name ? 'stock/thumb/' + this.image_name : 'no_image.jpg');
-    }
-    /**
-     * Path to small stock image
-     */
-    get small_image_src() {
-        return '/images/' + (this.image_name ? 'stock/small/' + this.image_name : 'no_image.jpg');
-    }
-    /**
-     * Path to big stock image
-     */
-    get big_image_src() {
-        return '/images/' + (this.image_name ? 'stock/big/' + this.image_name : 'no_image.jpg');
-    }
-    /**
-     * Path to original stock image
-     */
-    get original_image_src() {
-        return 'images/' + (this.image_name ? 'stock/original/' + this.image_name : 'no_image.jpg');
-    }
-}
-
 class EsolveCartService {
     constructor(config, http, errorHandler, responseHandler) {
         this.config = config;
@@ -3141,6 +3373,17 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
 
+class EsolveBankingDetails {
+    constructor(bank_name, account_holder, account, account_type, swift_number, branch_code) {
+        this.bank_name = bank_name;
+        this.account_holder = account_holder;
+        this.account = account;
+        this.account_type = account_type;
+        this.swift_number = swift_number;
+        this.branch_code = branch_code;
+    }
+}
+
 class EsolveVaultItemResult extends EsolveResponseResult {
     constructor(response) {
         super(response);
@@ -3234,16 +3477,6 @@ class EsolvePaymentMethod {
         this.image_url = record.image_url;
         this.banking_details = new EsolveBankingDetails(record.bank_name, record.account_holder, record.account, record.account_type, record.swift_number, record.branch_code);
     }
-}
-class EsolveBankingDetails {
-    constructor(bank_name, account_holder, account, account_type, swift_number, branch_code) {
-        this.bank_name = bank_name;
-        this.account_holder = account_holder;
-        this.account = account;
-        this.account_type = account_type;
-        this.swift_number = swift_number;
-        this.branch_code = branch_code;
-    }
 }
 
 class EsolvePaymentService {
@@ -3300,8 +3533,8 @@ class EsolvePaymentService {
                 card_number: card_data.card_number,
                 card_name: card_data.name,
                 card_cvv: card_data.cvv,
-                card_expiry: this.generateExpiry(card_data)
-            }
+                card_expiry: this.generateExpiry(card_data),
+            },
         };
         return this.http
             .post(`${this.config.api_url}/set-vault.php`, body, {
@@ -3347,7 +3580,7 @@ class EsolvePaymentService {
             payment: {
                 cart_id: transaction_id,
                 payment_methods_id
-            }
+            },
         };
         if (typeof card === 'number') {
             body.payment.user_vault_id = card;
@@ -3357,7 +3590,7 @@ class EsolvePaymentService {
                 card_number: card.card_number,
                 card_name: card.name,
                 card_cvv: card.cvv,
-                card_expiry: this.generateExpiry(card)
+                card_expiry: this.generateExpiry(card),
             };
         }
         return this.http
@@ -3453,6 +3686,14 @@ class EsolveShippingMethod {
     }
 }
 
+class EsolveShippingTotals {
+    constructor(total, vat, savings) {
+        this.total = total;
+        this.vat = vat;
+        this.savings = savings;
+    }
+}
+
 class EsolveShippingCost {
     constructor(
     // Shipping
@@ -3462,13 +3703,6 @@ class EsolveShippingCost {
         this.shipping = new EsolveShippingTotals(shipping_total, shipping_vat, shipping_total_savings);
         this.insurance = new EsolveShippingTotals(insurance_total, insurance_vat, insurance_total_savings);
     }
-}
-class EsolveShippingTotals {
-    constructor(total, vat, savings) {
-        this.total = total;
-        this.vat = vat;
-        this.savings = savings;
-    }
 }
 
 class EsolveShippingService {
@@ -3478,6 +3712,9 @@ class EsolveShippingService {
     }
     /**
      * Retrieves a list of shipping methods
+     *
+     * @param options Filter options
+     *
      * @returns An `Observable` with an array of shipping methods
      */
     getShippingMethods(options) {
@@ -3499,7 +3736,11 @@ class EsolveShippingService {
     }
     /**
      * Retrieves the shipping costs
-     * @param options Shipping cost options
+     *
+     * @param shipping_id
+     * @param addresses_id
+     * @param location_id
+     *
      * @returns An `Observable` with the shipping costs
      */
     getShippingCost(shipping_id, addresses_id, location_id) {
@@ -3535,7 +3776,9 @@ class EsolveShippingService {
     }
     /**
      * Processes the eSolve shipping method records.
+     *
      * @param records Records to process
+     *
      * @returns An array of processed shipping methods
      */
     processShippingMethods(records) {
@@ -3549,8 +3792,10 @@ class EsolveShippingService {
         return shipping_methods;
     }
     /**
-     * Processes the eSolve shipping costs record.
+     * Processes the eSolve shipping costs record.+
+     *
      * @param record Data to process
+     *
      * @returns Processed shipping costs
      */
     processShippingCost(record) {
@@ -3570,45 +3815,38 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$2.HttpClient }]; } });
 
-class EsolveLocationsService {
-    constructor(config, http) {
+class EsolveEnquiryResult extends EsolveResponseResult {
+    constructor(response) {
+        super(response);
+        this.id = 0;
+        this.id = +response.esolve_id;
+    }
+}
+
+class EsolveEnquiryService {
+    constructor(config, http, errorHandler, responseHandler) {
         this.config = config;
         this.http = http;
+        this.errorHandler = errorHandler;
+        this.responseHandler = responseHandler;
     }
-    /**
-     * Retrieves a list of stock locations
-     *
-     * @returns An `Observable` with an array of stock locations
-     */
-    getStockLocations() {
+    send(form_data) {
+        if (!form_data.has('email')) {
+            return this.errorHandler.emitError('email_required', 'Email is required');
+        }
         return this.http
-            .get(`${this.config.api_url}/get-locations.php`)
-            .pipe(map((response) => {
-            if (response.records === undefined) {
-                throw response;
-            }
-            return this.processStockLocations(response.records);
+            .post(`${this.config.api_url}/set-enquiry.php`, form_data, {
+            responseType: 'json',
+            observe: 'body',
+        })
+            .pipe(map((http_response) => this.responseHandler.validateSingleHttpResponse(http_response, (response) => new EsolveEnquiryResult(response))), catchError((errorRes) => {
+            return this.errorHandler.handleHttpPostError('set-enquiry', errorRes);
         }));
     }
-    /**
-     * Processes the eSolve stock location records.
-     *
-     * @param records Records to process
-     * @returns An array of processed stock location records
-     */
-    processStockLocations(records) {
-        const stock_locations = [];
-        if (records) {
-            for (const record of records) {
-                stock_locations.push(new EsolveStockLocation(record));
-            }
-        }
-        return stock_locations;
-    }
 }
-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: [{
+EsolveEnquiryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveEnquiryService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveEnquiryService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveEnquiryService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveEnquiryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -3616,7 +3854,7 @@ 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: i1$2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
 
 /*
  * Public API Surface of ng-esolve-connect
@@ -3626,5 +3864,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { EsolveAccountService, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveCookieService, EsolveErrorHandlerService, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHeading, EsolveHttpError, EsolveLinkedAsset, EsolveList, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangesService, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveSpecial, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockLocationAddress, EsolveStockLocationContactInfo, EsolveStockLocationPOBoxAddress, EsolveStockLocationTradingTimes, EsolveStockLocationTradingTimesDay, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };
+export { EsolveAccountService, 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, 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, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, 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