@esolve/ng-esolve-connect 0.9.0 → 0.10.2

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

@@ -7,7 +7,7 @@ import * as i4 from 'ngx-cookie-service';
 import { CookieService } from 'ngx-cookie-service';
 import { BehaviorSubject, throwError, iif, of } from 'rxjs';
 import * as i1 from '@angular/platform-browser';
-import { map, tap, catchError, switchMap } from 'rxjs/operators';
+import { tap, catchError, map, switchMap } from 'rxjs/operators';
 
 const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 // For future development
@@ -195,6 +195,15 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
                 }]
         }] });
 
+class EsolveList {
+    constructor(items = [], page = 0, rows = 0, total = 0) {
+        this.items = items;
+        this.page = page;
+        this.rows = rows;
+        this.total = total;
+    }
+}
+
 class EsolveResult {
     constructor(status, code, message) {
         this.status = status;
@@ -213,6 +222,9 @@ class EsolveHttpError {
 
 class EsolveErrorHandlerService {
     constructor() { }
+    emitError(code, message) {
+        throw new EsolveHttpError('error', message, code);
+    }
     handleHttpPostError(service_type, errorRes) {
         if (!(errorRes instanceof HttpErrorResponse) &&
             !('service_type' in errorRes) &&
@@ -282,8 +294,7 @@ class EsolveErrorHandlerService {
         return error;
     }
     parseDeleteError(result) {
-        const error = new EsolveHttpError('error', result.message, result.code);
-        return error;
+        return new EsolveHttpError('error', result.message, result.code);
     }
 }
 EsolveErrorHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
@@ -462,30 +473,6 @@ class EsolveAuthService {
         this.errorHandler = errorHandler;
         this.cookieService = cookieService;
     }
-    checkAccessToken(session) {
-        session = session || this.session.currentSession;
-        const token = session?.key ?? '';
-        const params = new HttpParams({
-            fromObject: {
-                key: token,
-                ws_id: this.config.wsid
-            }
-        });
-        return this.http.get(`${this.config.api_url}/service/get-access-token.php`, {
-            params,
-            headers: new HttpHeaders({
-                'Accept-Language': '*'
-            })
-        }).pipe(map(responseData => {
-            if ((responseData.type === 'error') ||
-                (responseData.type === 'exception') ||
-                (!responseData.additional_data.key_okay)) {
-                throw responseData;
-            }
-            responseData.additional_data.key = token;
-            return responseData;
-        })).toPromise();
-    }
     getAccessToken(email, password, anonymous = false) {
         let params = new HttpParams();
         if (anonymous) {
@@ -561,6 +548,30 @@ class EsolveAuthService {
         this.cookieService.delete('_ws_id');
         return this.getAccessToken('', '', true).toPromise();
     }
+    checkAccessToken(session) {
+        session = session || this.session.currentSession;
+        const token = session?.key ?? '';
+        const params = new HttpParams({
+            fromObject: {
+                key: token,
+                ws_id: this.config.wsid
+            }
+        });
+        return this.http.get(`${this.config.api_url}/service/get-access-token.php`, {
+            params,
+            headers: new HttpHeaders({
+                'Accept-Language': '*'
+            })
+        }).pipe(map(responseData => {
+            if ((responseData.type === 'error') ||
+                (responseData.type === 'exception') ||
+                (!responseData.additional_data.key_okay)) {
+                throw responseData;
+            }
+            responseData.additional_data.key = token;
+            return responseData;
+        })).toPromise();
+    }
     // Handlers
     handleExpiration() {
         return (session) => {
@@ -673,6 +684,229 @@ class EsolveUserAccountResult extends EsolveResponseResult {
     }
 }
 
+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 EsolveStockLocationAddress {
+    constructor(street, suburb, city, province, country, postal_code, latitude, longitude) {
+        this.street = street;
+        this.suburb = suburb;
+        this.city = city;
+        this.province = province;
+        this.country = country;
+        this.postal_code = postal_code;
+        this.latitude = latitude;
+        this.longitude = longitude;
+    }
+}
+class EsolveStockLocationPOBoxAddress {
+    constructor(pobox, city, postal_code) {
+        this.pobox = pobox;
+        this.city = city;
+        this.postal_code = postal_code;
+    }
+}
+class EsolveStockLocationContactInfo {
+    constructor(telnumber, cellnumber, email, fax) {
+        this.telnumber = telnumber;
+        this.cellnumber = cellnumber;
+        this.email = email;
+        this.fax = fax;
+    }
+}
+class EsolveStockLocationTradingTimes {
+    constructor(monday, tuesday, wednesday, thursday, friday, saturday, sunday, public_holiday, trading_hours_additional_info = '') {
+        this.monday = monday;
+        this.tuesday = tuesday;
+        this.wednesday = wednesday;
+        this.thursday = thursday;
+        this.friday = friday;
+        this.saturday = saturday;
+        this.sunday = sunday;
+        this.public_holiday = public_holiday;
+        this.trading_hours_additional_info = trading_hours_additional_info;
+    }
+}
+class EsolveStockLocationTradingTimesDay {
+    constructor(open, close) {
+        this.open = open;
+        this.close = close;
+    }
+}
+
+class EsolveTransaction {
+    constructor(record) {
+        // Transaction Items
+        this.items = [];
+        this.id = +record.id;
+        this.type = record.transaction_type;
+        this.status = record.status;
+        this.loyalty_number = record.loyaltynumber;
+        this.external_order_number = record.external_order_number;
+        this.external_invoice_number = record.external_invoice_number;
+        this.date = new Date(+record.txdate_timestamp * 1000);
+        this.expected_date = new Date(+record.expected_date_timestamp * 1000);
+        this.invoice_amount = +record.invoice_amount;
+        this.vat = +record.vat;
+        this.discount = +record.discount;
+        this.total = +record.total;
+        this.shipping_total = +record.shipping_total;
+        this.insurance_total = +record.insurance_total;
+        this.payment = +record.payment;
+        this.payment_reference = record.payment_reference;
+        this.payment_description = record.payment_description;
+        this.gateway_transaction_id = record.gateway_transaction_id;
+        this.address = new EsolveTransactionAddress(record.recipient, record.address_type, record.address_description, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, record.pobox);
+        if (record.user) {
+            this.user = new EsolveTransactionUser(+record.user.id, record.user.email, record.user.firstname, record.user.surname, record.user.telnumber, record.user.cellnumber);
+        }
+        if (record.client) {
+            this.client = new EsolveTransactionClient(+record.client.id, record.client.account, record.client.company_name, record.client.branch_code, record.client.email, record.client.firstname, record.client.surname, record.client.contact_number);
+        }
+        if (record.location_details) {
+            this.location = new EsolveTransactionLocation(record.location_details);
+        }
+        if (record.payment_method_details) {
+            this.payment_method = new EsolveTransactionPaymentMethod(record.payment_method_details.id, record.payment_method_details.paymethod_name, record.payment_method_details.description, record.payment_method_details.integration_type, record.payment_method_details.service_provider);
+        }
+        if (record.shipping_method_details) {
+            this.shipping_method = new EsolveTransactionShippingMethod(+record.shipping_method_details.id, record.shipping_method_details.carrier_name, record.shipping_method_details.delivery_category, record.shipping_method_details.location, record.shipping_method_details.description, record.shipping_method_details.pricing, !!record.shipping_method_details.client_to_collect);
+        }
+        this.parseTransactionItems(record.transaction_items);
+    }
+    parseTransactionItems(record_items) {
+        for (const record_item of record_items) {
+            const price = new EsolveTransactionItemPrice(+record_item.price_exclusive, +record_item.price_inclusive, +record_item.price_exclusive_after_discount, +record_item.price_inclusive_after_discount);
+            const line_total = new EsolveTransactionItemPrice(+record_item.line_total_exclusive, +record_item.line_total_inclusive, +record_item.line_total_exclusive_after_discount, +record_item.line_total_inclusive_after_discount);
+            const item = new EsolveTransactionItem(record_item.code, record_item.name, +record_item.qty, +record_item.discount, +record_item.vat_rate, price, line_total);
+            this.items.push(item);
+        }
+    }
+}
+class 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 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 EsolveTransactionLocation extends EsolveStockLocation {
+}
+class EsolveTransactionPaymentMethod {
+    constructor(id, name, description, integration_type, service_provider) {
+        this.id = id;
+        this.name = name;
+        this.description = description;
+        this.integration_type = integration_type;
+        this.service_provider = service_provider;
+    }
+}
+class EsolveTransactionShippingMethod {
+    constructor(id, name, delivery_category, location, description, pricing, client_to_collect) {
+        this.id = id;
+        this.name = name;
+        this.delivery_category = delivery_category;
+        this.location = location;
+        this.description = description;
+        this.pricing = pricing;
+        this.client_to_collect = client_to_collect;
+    }
+}
+class 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 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 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;
+    }
+}
+
+class EsolveTransactionList extends EsolveList {
+}
+
 class EsolveRegistrationResult extends EsolveResponseResult {
     constructor(response) {
         super(response);
@@ -723,31 +957,6 @@ class EsolveAccountService {
             this._user_id = value;
         }
     }
-    processUserAccount(record) {
-        if (!record) {
-            throw new Error('Invalid record');
-        }
-        if (+record.userid !== this._user_id) {
-            throw new Error('Invalid user account retrieved');
-        }
-        const user_account = new EsolveUserAccount(+record.userid, record.email, record.registration_type, record.title, record.firstname, record.surname, record.initials, record.gender, record.idnumber);
-        user_account.contact_details = new EsolveUserAccountContact(record.telnumber, record.cellnumber, record.fax);
-        user_account.business_details = new EsolveUserAccountBusiness(record.busname, record.vatnum, record.busdescript, record.business_type);
-        return user_account;
-    }
-    processUserAddress(records) {
-        const user_addresses = [];
-        if (!records || (this._user_id === 0)) {
-            return user_addresses;
-        }
-        for (const record of records) {
-            if (+record.userid !== this._user_id) {
-                continue;
-            }
-            user_addresses.push(new EsolveAddress(+record.id, record.recipient, record.address_type, record.pobox, record.place_name, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude));
-        }
-        return user_addresses;
-    }
     updateUserAccount(user_account_data) {
         const body = {
             account: user_account_data
@@ -797,20 +1006,23 @@ class EsolveAccountService {
         }));
     }
     getAddresses() {
-        if (this.user_id <= 0) {
-            return throwError('Log in is required');
+        try {
+            this.loginGuard();
+            return this.http.get(`${this.config.api_url}/service/get-addresses.php`, {
+                params: {
+                    ws_id: this.config.wsid,
+                    user_id: this.user_id
+                }
+            }).pipe(map(response => {
+                if (response.records === undefined) {
+                    throw response;
+                }
+                return this.processUserAddress(response.records);
+            }));
+        }
+        catch (error) {
+            return throwError(error);
         }
-        return this.http.get(`${this.config.api_url}/service/get-addresses.php`, {
-            params: {
-                ws_id: this.config.wsid,
-                user_id: this.user_id
-            }
-        }).pipe(map(response => {
-            if (response.records === undefined) {
-                throw response;
-            }
-            return this.processUserAddress(response.records);
-        }));
     }
     deleteAddress(id) {
         return this.http.delete(`${this.config.api_url}/service/delete-address.php`, {
@@ -828,7 +1040,7 @@ class EsolveAccountService {
             }
             return new EsolveResult(http_response.result.status, http_response.result.code, http_response.result.message);
         }), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('delete-address', errorRes);
+            return this.errorHandler.handleHttpDeleteError('delete-address', errorRes);
         }));
     }
     register(user_registration) {
@@ -911,6 +1123,91 @@ class EsolveAccountService {
             return this.errorHandler.handleHttpPostError('set-forgot-password', errorRes);
         }));
     }
+    getTransactions(options = {}) {
+        try {
+            this.loginGuard();
+            return this.http.get(`${this.config.api_url}/service/get-transactions.php`, {
+                params: {
+                    ws_id: this.config.wsid,
+                    user_id: this.user_id,
+                    ...options,
+                }
+            }).pipe(map(response => {
+                if (response.records === undefined) {
+                    throw response;
+                }
+                const items = this.processTransactions(response.records);
+                const total = +response.additional_data.total_records ?? 0;
+                const rows = options.rows ?? total;
+                const page = options.page || 1;
+                return new EsolveTransactionList(items, page, rows, total);
+            }));
+        }
+        catch (error) {
+            return throwError(error);
+        }
+    }
+    getTransaction(id) {
+        try {
+            this.loginGuard();
+            return this.http.get(`${this.config.api_url}/service/get-transactions.php`, {
+                params: {
+                    ws_id: this.config.wsid,
+                    user_id: this.user_id,
+                    transaction_id: id,
+                }
+            }).pipe(map(response => {
+                if ((response.records === undefined) || (response.records.length <= 0)) {
+                    throw response;
+                }
+                const items = this.processTransactions(response.records);
+                return items[0];
+            }));
+        }
+        catch (error) {
+            return throwError(error);
+        }
+    }
+    processUserAccount(record) {
+        if (!record) {
+            throw new Error('Invalid record');
+        }
+        if (+record.userid !== this._user_id) {
+            throw new Error('Invalid user account retrieved');
+        }
+        const user_account = new EsolveUserAccount(+record.userid, record.email, record.registration_type, record.title, record.firstname, record.surname, record.initials, record.gender, record.idnumber);
+        user_account.contact_details = new EsolveUserAccountContact(record.telnumber, record.cellnumber, record.fax);
+        user_account.business_details = new EsolveUserAccountBusiness(record.busname, record.vatnum, record.busdescript, record.business_type);
+        return user_account;
+    }
+    processUserAddress(records) {
+        const user_addresses = [];
+        if (!records || (this._user_id === 0)) {
+            return user_addresses;
+        }
+        for (const record of records) {
+            if (+record.userid !== this._user_id) {
+                continue;
+            }
+            user_addresses.push(new EsolveAddress(+record.id, record.recipient, record.address_type, record.pobox, record.place_name, record.street_number, record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude));
+        }
+        return user_addresses;
+    }
+    processTransactions(records) {
+        const transactions = [];
+        if (records) {
+            for (const record of records) {
+                const transaction = new EsolveTransaction(record);
+                transactions.push(transaction);
+            }
+        }
+        return transactions;
+    }
+    loginGuard() {
+        if (this.user_id <= 0) {
+            this.errorHandler.emitError('login_required', 'Login is required');
+        }
+    }
 }
 EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
@@ -962,29 +1259,6 @@ class EsolveMediaService {
         this.config = config;
         this.http = http;
     }
-    processMediaRecord(record) {
-        const tags = [];
-        const topics = [];
-        if ((record.tags) && (record.tags.length > 0)) {
-            for (const tag of record.tags) {
-                tags.push(new EsolveTag(+tag.id, tag.tag_phrase, +tag.tag_weight, tag.description));
-            }
-        }
-        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));
-            }
-        }
-        return new EsolveMediaArticle(record.identifier, record.title, record.article, record.image_url, tags, topics, record.seo_page_title, record.seo_keywords, record.seo_description);
-    }
-    /**
-     * Retrieves media records from eSolve instance.
-     * @param params Header params
-     */
-    getMediaRecords(params) {
-        params = params.set('ws_id', this.config.wsid);
-        return this.http.get(`${this.config.api_url}/service/get-media.php`, { params });
-    }
     /**
      * Retrieves the media record from the eSolve instance using the identifier.
      * @param identifier String representing the eSolve media indentifier
@@ -1029,6 +1303,29 @@ class EsolveMediaService {
             return mediaArticles;
         }));
     }
+    processMediaRecord(record) {
+        const tags = [];
+        const topics = [];
+        if ((record.tags) && (record.tags.length > 0)) {
+            for (const tag of record.tags) {
+                tags.push(new EsolveTag(+tag.id, tag.tag_phrase, +tag.tag_weight, tag.description));
+            }
+        }
+        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));
+            }
+        }
+        return new EsolveMediaArticle(record.identifier, record.title, record.article, record.image_url, tags, topics, record.seo_page_title, record.seo_keywords, record.seo_description);
+    }
+    /**
+     * Retrieves media records from eSolve instance.
+     * @param params Header params
+     */
+    getMediaRecords(params) {
+        params = params.set('ws_id', this.config.wsid);
+        return this.http.get(`${this.config.api_url}/service/get-media.php`, { params });
+    }
 }
 EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
@@ -1237,6 +1534,31 @@ class EsolveBannerService {
         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: {
+                ws_id: this.config.wsid,
+                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}/service/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) {
@@ -1283,36 +1605,11 @@ class EsolveBannerService {
                 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;
-    }
-    /**
-     * 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: {
-                ws_id: this.config.wsid,
-                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}/service/get-banners.php`, { params }).pipe(map(response => {
-            if (response.records === undefined) {
-                throw response;
+                }, image_sets);
+                banners.push(banner);
             }
-            return this.processBanners(response.records);
-        }));
+        }
+        return banners;
     }
 }
 EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveBannerService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
@@ -1382,16 +1679,6 @@ class EsolveTopicService {
         this.config = config;
         this.http = http;
     }
-    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;
-    }
     /**
      * Retrieves active topics from the list of topic ID's. Note that inactive or expired
      * topics will not be retrieved.
@@ -1414,6 +1701,16 @@ class EsolveTopicService {
             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.0.0", ngImport: i0, type: EsolveTopicService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveTopicService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
@@ -1809,50 +2106,6 @@ class EsolveCategoryTreeService {
         this.config = config;
         this.http = http;
     }
-    /**
-     * Processes the eSolve tree records and converts them into the correct format.
-     * @param tree_records Records to process
-     */
-    processTree(tree_records) {
-        const tree_items = [];
-        if (tree_records) {
-            for (const tree_record of tree_records) {
-                let esolve_id = '';
-                let parent_id = '';
-                let children = [];
-                if (tree_record.type === 'category') {
-                    children = this.processTree(tree_record.children);
-                    esolve_id = tree_record.menu_id;
-                    parent_id = tree_record.owner_menu_id;
-                }
-                else {
-                    esolve_id = tree_record.id;
-                    parent_id = tree_record.menu_id;
-                }
-                tree_items.push(new EsolveCategoryTreeItem(tree_record.type, esolve_id, parent_id, tree_record.description, tree_record.sef_description, tree_record.seo_description, tree_record.sort_priority, tree_record.active, tree_record.display_only, tree_record.image, tree_record.seo_page_title, tree_record.seo_keywords, tree_record.short_description, children));
-            }
-        }
-        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;
-    }
     /**
      * Retrieves the category tree from eSolve instance and coverts it to the correct format.
      */
@@ -1909,6 +2162,50 @@ class EsolveCategoryTreeService {
         }
         return throwError('Invalid options');
     }
+    /**
+     * Processes the eSolve tree records and converts them into the correct format.
+     * @param tree_records Records to process
+     */
+    processTree(tree_records) {
+        const tree_items = [];
+        if (tree_records) {
+            for (const tree_record of tree_records) {
+                let esolve_id = '';
+                let parent_id = '';
+                let children = [];
+                if (tree_record.type === 'category') {
+                    children = this.processTree(tree_record.children);
+                    esolve_id = tree_record.menu_id;
+                    parent_id = tree_record.owner_menu_id;
+                }
+                else {
+                    esolve_id = tree_record.id;
+                    parent_id = tree_record.menu_id;
+                }
+                tree_items.push(new EsolveCategoryTreeItem(tree_record.type, esolve_id, parent_id, tree_record.description, tree_record.sef_description, tree_record.seo_description, tree_record.sort_priority, tree_record.active, tree_record.display_only, tree_record.image, tree_record.seo_page_title, tree_record.seo_keywords, tree_record.short_description, children));
+            }
+        }
+        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.0.0", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveCategoryTreeService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
@@ -2044,30 +2341,6 @@ class EsolveCartService {
         this.responseHandler = responseHandler;
         this._cached_tracking = 0;
     }
-    /**
-     * Processes the eSolve tree records.
-     * @param cart_item_records Records to process
-     * @returns An array of processed cart items
-     */
-    processCart(cart_item_records) {
-        const cart_items = [];
-        if (cart_item_records) {
-            for (const cart_item_record of cart_item_records) {
-                const cart_stock_item = new EsolveCartStockItem(cart_item_record.code, cart_item_record.name, cart_item_record.sef_name, cart_item_record.description, cart_item_record.is_active, +cart_item_record.items_in_pack, cart_item_record.delivery_category, cart_item_record.image_name);
-                cart_items.push(new EsolveCartItem(+cart_item_record.id, cart_stock_item, +cart_item_record.qty, cart_item_record.type, +cart_item_record.price, +cart_item_record.discount, +cart_item_record.discount_interval, cart_item_record.vat_rate, cart_item_record.allow_quotes, cart_item_record.allow_orders, cart_item_record.must_collect, cart_item_record.requested_assembly, +cart_item_record.price_incl, +cart_item_record.discount_price, +cart_item_record.discount_price_incl, +cart_item_record.discount_total, +cart_item_record.vat_total, +cart_item_record.line_total, +cart_item_record.line_total_incl));
-            }
-        }
-        return cart_items;
-    }
-    /**
-     * Processes the eSolve cart totals
-     * @param record Data to process
-     * @returns Processed cart totals
-     */
-    processCartTotals(record) {
-        const cart_totals = new EsolveCartTotals(+record.records, +record.items, +record.total, +record.vat, +record.discount);
-        return cart_totals;
-    }
     /**
      * Retrieves the current cart
      * @returns An `Observable` with an array of cart items
@@ -2186,6 +2459,30 @@ class EsolveCartService {
             }));
         }));
     }
+    /**
+     * Processes the eSolve tree records.
+     * @param cart_item_records Records to process
+     * @returns An array of processed cart items
+     */
+    processCart(cart_item_records) {
+        const cart_items = [];
+        if (cart_item_records) {
+            for (const cart_item_record of cart_item_records) {
+                const cart_stock_item = new EsolveCartStockItem(cart_item_record.code, cart_item_record.name, cart_item_record.sef_name, cart_item_record.description, cart_item_record.is_active, +cart_item_record.items_in_pack, cart_item_record.delivery_category, cart_item_record.image_name);
+                cart_items.push(new EsolveCartItem(+cart_item_record.id, cart_stock_item, +cart_item_record.qty, cart_item_record.type, +cart_item_record.price, +cart_item_record.discount, +cart_item_record.discount_interval, cart_item_record.vat_rate, cart_item_record.allow_quotes, cart_item_record.allow_orders, cart_item_record.must_collect, cart_item_record.requested_assembly, +cart_item_record.price_incl, +cart_item_record.discount_price, +cart_item_record.discount_price_incl, +cart_item_record.discount_total, +cart_item_record.vat_total, +cart_item_record.line_total, +cart_item_record.line_total_incl));
+            }
+        }
+        return cart_items;
+    }
+    /**
+     * Processes the eSolve cart totals
+     * @param record Data to process
+     * @returns Processed cart totals
+     */
+    processCartTotals(record) {
+        const cart_totals = new EsolveCartTotals(+record.records, +record.items, +record.total, +record.vat, +record.discount);
+        return cart_totals;
+    }
 }
 EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveCartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveCartService, providedIn: 'root' });
@@ -2267,12 +2564,8 @@ class EsolvePaymentMethod {
         this.description = record.description;
         this.display_banking_details = record.display_banking_details;
         this.currency_code = record.currency_code;
-        this.terminal_id = record.terminal_id;
-        this.terminal_id_secondary = record.terminal_id_secondary;
         this.merchant_id = record.merchant_id;
         this.application_id = record.application_id;
-        this.api_username = record.api_username;
-        this.api_password = record.api_password;
         this.api_signature = record.api_signature;
         this.is_gateway = record.is_gateway;
         this.must_store_card_details = record.must_store_card_details;
@@ -2439,7 +2732,7 @@ class EsolvePaymentService {
             }
             return new EsolveResult(http_response.result.status, http_response.result.code, http_response.result.message);
         }), catchError((errorRes) => {
-            return this.errorHandler.handleHttpPostError('delete-vault', errorRes);
+            return this.errorHandler.handleHttpDeleteError('delete-vault', errorRes);
         }));
     }
     /**
@@ -2643,101 +2936,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
                     args: [ESOLVE_CONNECT_CONFIG]
                 }] }, { type: i1$1.HttpClient }]; } });
 
-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(record.monday_open_time, record.monday_close_time, record.tuesday_open_time, record.tuesday_close_time, record.wednesday_open_time, record.wednesday_close_time, record.thursday_open_time, record.thursday_close_time, record.friday_open_time, record.friday_close_time, record.saturday_open_time, record.saturday_close_time, record.sunday_open_time, record.sunday_close_time, record.public_holiday_open_time, record.public_holiday_close_time, record.trading_hours_additional_in);
-    }
-}
-class EsolveStockLocationAddress {
-    constructor(street, suburb, city, province, country, postal_code, latitude, longitude) {
-        this.street = street;
-        this.suburb = suburb;
-        this.city = city;
-        this.province = province;
-        this.country = country;
-        this.postal_code = postal_code;
-        this.latitude = latitude;
-        this.longitude = longitude;
-    }
-}
-class EsolveStockLocationPOBoxAddress {
-    constructor(pobox, city, postal_code) {
-        this.pobox = pobox;
-        this.city = city;
-        this.postal_code = postal_code;
-    }
-}
-class EsolveStockLocationContactInfo {
-    constructor(telnumber, cellnumber, email, fax) {
-        this.telnumber = telnumber;
-        this.cellnumber = cellnumber;
-        this.email = email;
-        this.fax = fax;
-    }
-}
-class EsolveStockLocationTradingTimes {
-    constructor(monday_open_time, monday_close_time, tuesday_open_time, tuesday_close_time, wednesday_open_time, wednesday_close_time, thursday_open_time, thursday_close_time, friday_open_time, friday_close_time, saturday_open_time, saturday_close_time, sunday_open_time, sunday_close_time, public_holiday_open_time, public_holiday_close_time, trading_hours_additional_info = '') {
-        this.trading_hours_additional_info = trading_hours_additional_info;
-        this.monday = new EsolveStockLocationTradingTimesDay(monday_open_time, monday_close_time);
-        this.tuesday = new EsolveStockLocationTradingTimesDay(tuesday_open_time, tuesday_close_time);
-        this.wednesday = new EsolveStockLocationTradingTimesDay(wednesday_open_time, wednesday_close_time);
-        this.thursday = new EsolveStockLocationTradingTimesDay(thursday_open_time, thursday_close_time);
-        this.friday = new EsolveStockLocationTradingTimesDay(friday_open_time, friday_close_time);
-        this.saturday = new EsolveStockLocationTradingTimesDay(saturday_open_time, saturday_close_time);
-        this.sunday = new EsolveStockLocationTradingTimesDay(sunday_open_time, sunday_close_time);
-        this.public_holiday = new EsolveStockLocationTradingTimesDay(public_holiday_open_time, public_holiday_close_time);
-    }
-}
-class EsolveStockLocationTradingTimesDay {
-    constructor(open, close) {
-        this.open = open;
-        this.close = close;
-    }
-}
-
 class EsolveLocationsService {
     constructor(config, http) {
         this.config = config;
         this.http = http;
     }
-    /**
-     * 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;
-    }
     /**
      * Retrieves a list of stock locations
      * @returns An `Observable` with an array of stock locations
@@ -2752,6 +2955,20 @@ class EsolveLocationsService {
             return this.processStockLocations(response.records);
         }));
     }
+    /**
+     * Processes the eSolve stock location records.
+     * @param records Records to process
+     * @returns An array of processed stock location records
+     */
+    processStockLocations(records) {
+        const stock_locations = [];
+        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.0.0", ngImport: i0, type: EsolveLocationsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$1.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
 EsolveLocationsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.0.0", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' });
@@ -2773,5 +2990,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.0.0", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { EsolveAccountService, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveErrorHandlerService, EsolveHttpError, EsolveLocationsService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveStockBadge, EsolveStockItem, EsolveStockItemList, EsolveStockLocation, EsolveStockPrice, EsolveStockService, EsolveTag, EsolveTopic, EsolveTopicService, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveVaultItem, EsolveVaultItemResult, NgEsolveConnectModule };
+export { EsolveAccountService, EsolveAddress, EsolveAddressResult, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveErrorHandlerService, EsolveHttpError, EsolveList, EsolveLocationsService, EsolveMediaArticle, EsolveMediaService, EsolveMenuItem, EsolveMenuService, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSEOInfo, EsolveSeoService, EsolveSession, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, 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 };
 //# sourceMappingURL=esolve-ng-esolve-connect.mjs.map