@esolve/ng-esolve-connect 0.20.8 → 0.20.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/auth/esolve-auth-interceptor.service.mjs +2 -7
- package/esm2020/lib/locations/esolve-location.model.mjs +3 -3
- package/fesm2015/esolve-ng-esolve-connect.mjs +4 -8
- package/fesm2015/esolve-ng-esolve-connect.mjs.map +1 -1
- package/fesm2020/esolve-ng-esolve-connect.mjs +4 -8
- package/fesm2020/esolve-ng-esolve-connect.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import { Inject, Injectable } from '@angular/core';
|
|
2
|
-
import { HttpParams, } from '@angular/common/http';
|
|
3
2
|
import { ESOLVE_CONNECT_CONFIG } from '../esolve-connect-config.constant';
|
|
4
3
|
import * as i0 from "@angular/core";
|
|
5
4
|
import * as i1 from "../session/esolve-session.service";
|
|
@@ -11,9 +10,8 @@ export class EsolveAuthInterceptorService {
|
|
|
11
10
|
intercept(req, next) {
|
|
12
11
|
if (req.url.startsWith(`${this.config.api_url}/`)) {
|
|
13
12
|
const service_identifier = req.url.replace(`${this.config.api_url}/`, '');
|
|
14
|
-
const old_params_keys = req.params.keys();
|
|
15
13
|
const modified_url = req.url;
|
|
16
|
-
let params =
|
|
14
|
+
let params = req.params;
|
|
17
15
|
const session = this.session.currentSession;
|
|
18
16
|
if (session.valid) {
|
|
19
17
|
if (service_identifier !== 'get-access-token.php') {
|
|
@@ -21,9 +19,6 @@ export class EsolveAuthInterceptorService {
|
|
|
21
19
|
}
|
|
22
20
|
}
|
|
23
21
|
params = params.set('ws_id', this.config.wsid);
|
|
24
|
-
old_params_keys.forEach(key => {
|
|
25
|
-
params = params.set(key, req.params.get(key) || '');
|
|
26
|
-
});
|
|
27
22
|
const modified_req = req.clone({
|
|
28
23
|
url: modified_url,
|
|
29
24
|
params,
|
|
@@ -41,4 +36,4 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImpo
|
|
|
41
36
|
type: Inject,
|
|
42
37
|
args: [ESOLVE_CONNECT_CONFIG]
|
|
43
38
|
}] }, { type: i1.EsolveSessionService }]; } });
|
|
44
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
39
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXNvbHZlLWF1dGgtaW50ZXJjZXB0b3Iuc2VydmljZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uL3Byb2plY3RzL25nLWVzb2x2ZS1jb25uZWN0L3NyYy9saWIvYXV0aC9lc29sdmUtYXV0aC1pbnRlcmNlcHRvci5zZXJ2aWNlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLE9BQU8sRUFBRSxNQUFNLEVBQUUsVUFBVSxFQUFFLE1BQU0sZUFBZSxDQUFDO0FBV25ELE9BQU8sRUFBRSxxQkFBcUIsRUFBRSxNQUFNLG1DQUFtQyxDQUFDOzs7QUFJMUUsTUFBTSxPQUFPLDRCQUE0QjtJQUNyQyxZQUMyQyxNQUEyQixFQUMxRCxPQUE2QjtRQURFLFdBQU0sR0FBTixNQUFNLENBQXFCO1FBQzFELFlBQU8sR0FBUCxPQUFPLENBQXNCO0lBQ3JDLENBQUM7SUFFRSxTQUFTLENBQUMsR0FBcUIsRUFBRSxJQUFpQjtRQUNyRCxJQUFJLEdBQUcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQyxPQUFPLEdBQUcsQ0FBQyxFQUFFO1lBQy9DLE1BQU0sa0JBQWtCLEdBQUcsR0FBRyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsR0FBRyxJQUFJLENBQUMsTUFBTSxDQUFDLE9BQU8sR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO1lBRTFFLE1BQU0sWUFBWSxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUM7WUFDN0IsSUFBSSxNQUFNLEdBQUcsR0FBRyxDQUFDLE1BQU0sQ0FBQztZQUV4QixNQUFNLE9BQU8sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUFDLGNBQWMsQ0FBQztZQUU1QyxJQUFJLE9BQU8sQ0FBQyxLQUFLLEVBQUU7Z0JBQ2YsSUFBSSxrQkFBa0IsS0FBSyxzQkFBc0IsRUFBRTtvQkFDL0MsTUFBTSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxHQUFHLENBQUMsQ0FBQztpQkFDM0M7YUFDSjtZQUVELE1BQU0sR0FBRyxNQUFNLENBQUMsR0FBRyxDQUFDLE9BQU8sRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDO1lBRS9DLE1BQU0sWUFBWSxHQUFHLEdBQUcsQ0FBQyxLQUFLLENBQUM7Z0JBQzNCLEdBQUcsRUFBRSxZQUFZO2dCQUNqQixNQUFNO2FBQ1QsQ0FBQyxDQUFDO1lBRUgsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxDQUFDO1NBQ3BDO1FBRUQsT0FBTyxJQUFJLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQzVCLENBQUM7OzBIQWhDUSw0QkFBNEIsa0JBRXpCLHFCQUFxQjs4SEFGeEIsNEJBQTRCOzRGQUE1Qiw0QkFBNEI7a0JBRHhDLFVBQVU7OzBCQUdGLE1BQU07MkJBQUMscUJBQXFCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgSW5qZWN0LCBJbmplY3RhYmxlIH0gZnJvbSAnQGFuZ3VsYXIvY29yZSc7XHJcbmltcG9ydCB7XHJcbiAgICBIdHRwSW50ZXJjZXB0b3IsXHJcbiAgICBIdHRwUmVxdWVzdCxcclxuICAgIEh0dHBIYW5kbGVyLFxyXG4gICAgSHR0cEV2ZW50LFxyXG59IGZyb20gJ0Bhbmd1bGFyL2NvbW1vbi9odHRwJztcclxuXHJcbmltcG9ydCB7IE9ic2VydmFibGUgfSBmcm9tICdyeGpzJztcclxuXHJcbmltcG9ydCB7IEVzb2x2ZUNvbm5lY3RDb25maWcgfSBmcm9tICcuLi9lc29sdmUtY29ubmVjdC5jb25maWcnO1xyXG5pbXBvcnQgeyBFU09MVkVfQ09OTkVDVF9DT05GSUcgfSBmcm9tICcuLi9lc29sdmUtY29ubmVjdC1jb25maWcuY29uc3RhbnQnO1xyXG5pbXBvcnQgeyBFc29sdmVTZXNzaW9uU2VydmljZSB9IGZyb20gJy4uL3Nlc3Npb24vZXNvbHZlLXNlc3Npb24uc2VydmljZSc7XHJcblxyXG5ASW5qZWN0YWJsZSgpXHJcbmV4cG9ydCBjbGFzcyBFc29sdmVBdXRoSW50ZXJjZXB0b3JTZXJ2aWNlIGltcGxlbWVudHMgSHR0cEludGVyY2VwdG9yIHtcclxuICAgIGNvbnN0cnVjdG9yKFxyXG4gICAgICAgIEBJbmplY3QoRVNPTFZFX0NPTk5FQ1RfQ09ORklHKSBwcml2YXRlIGNvbmZpZzogRXNvbHZlQ29ubmVjdENvbmZpZyxcclxuICAgICAgICBwcml2YXRlIHNlc3Npb246IEVzb2x2ZVNlc3Npb25TZXJ2aWNlLFxyXG4gICAgKSB7IH1cclxuXHJcbiAgICBwdWJsaWMgaW50ZXJjZXB0KHJlcTogSHR0cFJlcXVlc3Q8YW55PiwgbmV4dDogSHR0cEhhbmRsZXIpOiBPYnNlcnZhYmxlPEh0dHBFdmVudDxhbnk+PiB7XHJcbiAgICAgICAgaWYgKHJlcS51cmwuc3RhcnRzV2l0aChgJHt0aGlzLmNvbmZpZy5hcGlfdXJsfS9gKSkge1xyXG4gICAgICAgICAgICBjb25zdCBzZXJ2aWNlX2lkZW50aWZpZXIgPSByZXEudXJsLnJlcGxhY2UoYCR7dGhpcy5jb25maWcuYXBpX3VybH0vYCwgJycpO1xyXG5cclxuICAgICAgICAgICAgY29uc3QgbW9kaWZpZWRfdXJsID0gcmVxLnVybDtcclxuICAgICAgICAgICAgbGV0IHBhcmFtcyA9IHJlcS5wYXJhbXM7XHJcblxyXG4gICAgICAgICAgICBjb25zdCBzZXNzaW9uID0gdGhpcy5zZXNzaW9uLmN1cnJlbnRTZXNzaW9uO1xyXG5cclxuICAgICAgICAgICAgaWYgKHNlc3Npb24udmFsaWQpIHtcclxuICAgICAgICAgICAgICAgIGlmIChzZXJ2aWNlX2lkZW50aWZpZXIgIT09ICdnZXQtYWNjZXNzLXRva2VuLnBocCcpIHtcclxuICAgICAgICAgICAgICAgICAgICBwYXJhbXMgPSBwYXJhbXMuc2V0KCdrZXknLCBzZXNzaW9uLmtleSk7XHJcbiAgICAgICAgICAgICAgICB9XHJcbiAgICAgICAgICAgIH1cclxuXHJcbiAgICAgICAgICAgIHBhcmFtcyA9IHBhcmFtcy5zZXQoJ3dzX2lkJywgdGhpcy5jb25maWcud3NpZCk7XHJcblxyXG4gICAgICAgICAgICBjb25zdCBtb2RpZmllZF9yZXEgPSByZXEuY2xvbmUoe1xyXG4gICAgICAgICAgICAgICAgdXJsOiBtb2RpZmllZF91cmwsXHJcbiAgICAgICAgICAgICAgICBwYXJhbXMsXHJcbiAgICAgICAgICAgIH0pO1xyXG5cclxuICAgICAgICAgICAgcmV0dXJuIG5leHQuaGFuZGxlKG1vZGlmaWVkX3JlcSk7XHJcbiAgICAgICAgfVxyXG5cclxuICAgICAgICByZXR1cm4gbmV4dC5oYW5kbGUocmVxKTtcclxuICAgIH1cclxufVxyXG4iXX0=
|
|
@@ -16,8 +16,8 @@ export class EsolveLocation {
|
|
|
16
16
|
this.userid = +record.userid;
|
|
17
17
|
this.importance = +record.importance;
|
|
18
18
|
this.active = !!+record.is_active;
|
|
19
|
-
this.dispatches_stock = record.dispatches_stock;
|
|
20
|
-
this.include_on_enquiries = record.
|
|
19
|
+
this.dispatches_stock = !!+record.dispatches_stock;
|
|
20
|
+
this.include_on_enquiries = !!+record.include_on_enquiries;
|
|
21
21
|
this.website_url = record.website_url;
|
|
22
22
|
this.address = new EsolveLocationAddress(record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude);
|
|
23
23
|
this.pobox_address = new EsolveLocationPOBoxAddress(record.pobox, record.pobox_city, record.pobox_postal_code);
|
|
@@ -44,4 +44,4 @@ export class EsolveLocation {
|
|
|
44
44
|
this.geo = new EsolveLocationGEO(record.distance, record.range, record.target_description);
|
|
45
45
|
}
|
|
46
46
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"esolve-location.model.js","sourceRoot":"","sources":["../../../../../projects/ng-esolve-connect/src/lib/locations/esolve-location.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { EsolveLocationRecord } from './esolve-location-record.interface';\r\nimport { EsolveLocationAddress } from './esolve-location-address.model';\r\nimport { EsolveLocationContactInfo } from './esolve-location-contact-info.model';\r\nimport { EsolveLocationPOBoxAddress } from './esolve-location-pobox-address.model';\r\nimport { EsolveLocationTradingTimes } from './esolve-location-trading-times.model';\r\nimport { EsolveLocationTradingDay } from './esolve-location-trading-day.model';\r\nimport { EsolveLocationGEO } from './esolve-location-geo.model';\r\n\r\nexport class EsolveLocation {\r\n    public id: number;\r\n    public identifier: string;\r\n    public description: string;\r\n    public head_office: boolean;\r\n    public default_location_for_payment_methods: boolean;\r\n    public external_system_code: string;\r\n    public erp_identifier: string;\r\n    public userid: number;\r\n    public importance: number;\r\n    public active: boolean;\r\n    public dispatches_stock: boolean;\r\n    public include_on_enquiries: boolean;\r\n    public website_url: string;\r\n\r\n    public address: EsolveLocationAddress;\r\n    public pobox_address: EsolveLocationPOBoxAddress;\r\n    public contact_info: EsolveLocationContactInfo;\r\n    public trading_times: EsolveLocationTradingTimes;\r\n    public geo?: EsolveLocationGEO;\r\n\r\n    constructor(record: EsolveLocationRecord) {\r\n        this.id = +record.id;\r\n        this.identifier = record.identifier;\r\n        this.description = record.description;\r\n        this.head_office = !!+record.head_office;\r\n        this.erp_identifier = record.erp_identifier;\r\n        this.external_system_code = record.external_system_code;\r\n        this.default_location_for_payment_methods = !!+record.default_location_for_payment_methods;\r\n        this.userid = +record.userid;\r\n        this.importance = +record.importance;\r\n        this.active = !!+record.is_active;\r\n        this.dispatches_stock = record.dispatches_stock;\r\n        this.include_on_enquiries = record.dispatches_stock;\r\n        this.website_url = record.website_url;\r\n\r\n        this.address = new EsolveLocationAddress(\r\n            record.street,\r\n            record.suburb,\r\n            record.city,\r\n            record.province,\r\n            record.country,\r\n            record.postal_code,\r\n            +record.latitude,\r\n            +record.longitude,\r\n        );\r\n\r\n        this.pobox_address = new EsolveLocationPOBoxAddress(\r\n            record.pobox,\r\n            record.pobox_city,\r\n            record.pobox_postal_code,\r\n        );\r\n\r\n        const telnumbers = [];\r\n\r\n        if (record.branch_telnumber.length > 0) {\r\n            telnumbers.push(record.branch_telnumber);\r\n        }\r\n\r\n        if (record.branch_telnumber_2.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_2);\r\n        }\r\n\r\n        if (record.branch_telnumber_3.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_3);\r\n        }\r\n\r\n        this.contact_info = new EsolveLocationContactInfo(\r\n            telnumbers,\r\n            record.branch_cellnumber,\r\n            record.branch_email,\r\n            record.branch_fax,\r\n        );\r\n\r\n        const monday = new EsolveLocationTradingDay(\r\n            record.monday_open_time,\r\n            record.monday_close_time,\r\n        );\r\n\r\n        const tuesday = new EsolveLocationTradingDay(\r\n            record.tuesday_open_time,\r\n            record.tuesday_close_time,\r\n        );\r\n\r\n        const wednesday = new EsolveLocationTradingDay(\r\n            record.wednesday_open_time,\r\n            record.wednesday_close_time,\r\n        );\r\n\r\n        const thursday = new EsolveLocationTradingDay(\r\n            record.thursday_open_time,\r\n            record.thursday_close_time,\r\n        );\r\n\r\n        const friday = new EsolveLocationTradingDay(\r\n            record.friday_open_time,\r\n            record.friday_close_time,\r\n        );\r\n\r\n        const saturday = new EsolveLocationTradingDay(\r\n            record.saturday_open_time,\r\n            record.saturday_close_time,\r\n        );\r\n\r\n        const sunday = new EsolveLocationTradingDay(\r\n            record.sunday_open_time,\r\n            record.sunday_close_time,\r\n        );\r\n\r\n        const public_holiday = new EsolveLocationTradingDay(\r\n            record.public_holiday_open_time,\r\n            record.public_holiday_close_time,\r\n        );\r\n\r\n        this.trading_times = new EsolveLocationTradingTimes(\r\n            monday,\r\n            tuesday,\r\n            wednesday,\r\n            thursday,\r\n            friday,\r\n            saturday,\r\n            sunday,\r\n            public_holiday,\r\n            record.trading_hours_additional_info,\r\n        );\r\n\r\n        this.geo = new EsolveLocationGEO(\r\n            record.distance,\r\n            record.range,\r\n            record.target_description,\r\n        );\r\n    }\r\n}\r\n\r\n\r\n"]}
|
|
47
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"esolve-location.model.js","sourceRoot":"","sources":["../../../../../projects/ng-esolve-connect/src/lib/locations/esolve-location.model.ts"],"names":[],"mappings":"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","sourcesContent":["import { EsolveLocationRecord } from './esolve-location-record.interface';\r\nimport { EsolveLocationAddress } from './esolve-location-address.model';\r\nimport { EsolveLocationContactInfo } from './esolve-location-contact-info.model';\r\nimport { EsolveLocationPOBoxAddress } from './esolve-location-pobox-address.model';\r\nimport { EsolveLocationTradingTimes } from './esolve-location-trading-times.model';\r\nimport { EsolveLocationTradingDay } from './esolve-location-trading-day.model';\r\nimport { EsolveLocationGEO } from './esolve-location-geo.model';\r\n\r\nexport class EsolveLocation {\r\n    public id: number;\r\n    public identifier: string;\r\n    public description: string;\r\n    public head_office: boolean;\r\n    public default_location_for_payment_methods: boolean;\r\n    public external_system_code: string;\r\n    public erp_identifier: string;\r\n    public userid: number;\r\n    public importance: number;\r\n    public active: boolean;\r\n    public dispatches_stock: boolean;\r\n    public include_on_enquiries: boolean;\r\n    public website_url: string;\r\n\r\n    public address: EsolveLocationAddress;\r\n    public pobox_address: EsolveLocationPOBoxAddress;\r\n    public contact_info: EsolveLocationContactInfo;\r\n    public trading_times: EsolveLocationTradingTimes;\r\n    public geo?: EsolveLocationGEO;\r\n\r\n    constructor(record: EsolveLocationRecord) {\r\n        this.id = +record.id;\r\n        this.identifier = record.identifier;\r\n        this.description = record.description;\r\n        this.head_office = !!+record.head_office;\r\n        this.erp_identifier = record.erp_identifier;\r\n        this.external_system_code = record.external_system_code;\r\n        this.default_location_for_payment_methods = !!+record.default_location_for_payment_methods;\r\n        this.userid = +record.userid;\r\n        this.importance = +record.importance;\r\n        this.active = !!+record.is_active;\r\n        this.dispatches_stock = !!+record.dispatches_stock;\r\n        this.include_on_enquiries = !!+record.include_on_enquiries;\r\n        this.website_url = record.website_url;\r\n\r\n        this.address = new EsolveLocationAddress(\r\n            record.street,\r\n            record.suburb,\r\n            record.city,\r\n            record.province,\r\n            record.country,\r\n            record.postal_code,\r\n            +record.latitude,\r\n            +record.longitude,\r\n        );\r\n\r\n        this.pobox_address = new EsolveLocationPOBoxAddress(\r\n            record.pobox,\r\n            record.pobox_city,\r\n            record.pobox_postal_code,\r\n        );\r\n\r\n        const telnumbers = [];\r\n\r\n        if (record.branch_telnumber.length > 0) {\r\n            telnumbers.push(record.branch_telnumber);\r\n        }\r\n\r\n        if (record.branch_telnumber_2.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_2);\r\n        }\r\n\r\n        if (record.branch_telnumber_3.length > 0) {\r\n            telnumbers.push(record.branch_telnumber_3);\r\n        }\r\n\r\n        this.contact_info = new EsolveLocationContactInfo(\r\n            telnumbers,\r\n            record.branch_cellnumber,\r\n            record.branch_email,\r\n            record.branch_fax,\r\n        );\r\n\r\n        const monday = new EsolveLocationTradingDay(\r\n            record.monday_open_time,\r\n            record.monday_close_time,\r\n        );\r\n\r\n        const tuesday = new EsolveLocationTradingDay(\r\n            record.tuesday_open_time,\r\n            record.tuesday_close_time,\r\n        );\r\n\r\n        const wednesday = new EsolveLocationTradingDay(\r\n            record.wednesday_open_time,\r\n            record.wednesday_close_time,\r\n        );\r\n\r\n        const thursday = new EsolveLocationTradingDay(\r\n            record.thursday_open_time,\r\n            record.thursday_close_time,\r\n        );\r\n\r\n        const friday = new EsolveLocationTradingDay(\r\n            record.friday_open_time,\r\n            record.friday_close_time,\r\n        );\r\n\r\n        const saturday = new EsolveLocationTradingDay(\r\n            record.saturday_open_time,\r\n            record.saturday_close_time,\r\n        );\r\n\r\n        const sunday = new EsolveLocationTradingDay(\r\n            record.sunday_open_time,\r\n            record.sunday_close_time,\r\n        );\r\n\r\n        const public_holiday = new EsolveLocationTradingDay(\r\n            record.public_holiday_open_time,\r\n            record.public_holiday_close_time,\r\n        );\r\n\r\n        this.trading_times = new EsolveLocationTradingTimes(\r\n            monday,\r\n            tuesday,\r\n            wednesday,\r\n            thursday,\r\n            friday,\r\n            saturday,\r\n            sunday,\r\n            public_holiday,\r\n            record.trading_hours_additional_info,\r\n        );\r\n\r\n        this.geo = new EsolveLocationGEO(\r\n            record.distance,\r\n            record.range,\r\n            record.target_description,\r\n        );\r\n    }\r\n}\r\n\r\n\r\n"]}
|
|
@@ -2,7 +2,7 @@ import * as i0 from '@angular/core';
|
|
|
2
2
|
import { InjectionToken, PLATFORM_ID, Injectable, Inject, Optional, NgModule } from '@angular/core';
|
|
3
3
|
import { isPlatformBrowser, CommonModule } from '@angular/common';
|
|
4
4
|
import * as i1$2 from '@angular/common/http';
|
|
5
|
-
import {
|
|
5
|
+
import { HTTP_INTERCEPTORS, HttpClientModule, HttpErrorResponse, HttpParams, HttpHeaders } from '@angular/common/http';
|
|
6
6
|
import * as i1 from 'ngx-cookie-service';
|
|
7
7
|
import { CookieService } from 'ngx-cookie-service';
|
|
8
8
|
import { BehaviorSubject, throwError, of, iif } from 'rxjs';
|
|
@@ -243,9 +243,8 @@ class EsolveAuthInterceptorService {
|
|
|
243
243
|
intercept(req, next) {
|
|
244
244
|
if (req.url.startsWith(`${this.config.api_url}/`)) {
|
|
245
245
|
const service_identifier = req.url.replace(`${this.config.api_url}/`, '');
|
|
246
|
-
const old_params_keys = req.params.keys();
|
|
247
246
|
const modified_url = req.url;
|
|
248
|
-
let params =
|
|
247
|
+
let params = req.params;
|
|
249
248
|
const session = this.session.currentSession;
|
|
250
249
|
if (session.valid) {
|
|
251
250
|
if (service_identifier !== 'get-access-token.php') {
|
|
@@ -253,9 +252,6 @@ class EsolveAuthInterceptorService {
|
|
|
253
252
|
}
|
|
254
253
|
}
|
|
255
254
|
params = params.set('ws_id', this.config.wsid);
|
|
256
|
-
old_params_keys.forEach(key => {
|
|
257
|
-
params = params.set(key, req.params.get(key) || '');
|
|
258
|
-
});
|
|
259
255
|
const modified_req = req.clone({
|
|
260
256
|
url: modified_url,
|
|
261
257
|
params,
|
|
@@ -1844,8 +1840,8 @@ class EsolveLocation {
|
|
|
1844
1840
|
this.userid = +record.userid;
|
|
1845
1841
|
this.importance = +record.importance;
|
|
1846
1842
|
this.active = !!+record.is_active;
|
|
1847
|
-
this.dispatches_stock = record.dispatches_stock;
|
|
1848
|
-
this.include_on_enquiries = record.
|
|
1843
|
+
this.dispatches_stock = !!+record.dispatches_stock;
|
|
1844
|
+
this.include_on_enquiries = !!+record.include_on_enquiries;
|
|
1849
1845
|
this.website_url = record.website_url;
|
|
1850
1846
|
this.address = new EsolveLocationAddress(record.street, record.suburb, record.city, record.province, record.country, record.postal_code, +record.latitude, +record.longitude);
|
|
1851
1847
|
this.pobox_address = new EsolveLocationPOBoxAddress(record.pobox, record.pobox_city, record.pobox_postal_code);
|