@esolve/ng-esolve-connect 0.16.2 → 0.18.0

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

@@ -8,6 +8,7 @@ import { CookieService } from 'ngx-cookie-service';
 import { BehaviorSubject, throwError, of, iif } from 'rxjs';
 import * as i1$1 from '@angular/platform-browser';
 import { map, catchError, tap, switchMap } from 'rxjs/operators';
+import { __awaiter } from 'tslib';
 
 const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 
@@ -120,9 +121,9 @@ class EsolveCookieService {
         }
     }
 }
-EsolveCookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCookieService, deps: [{ token: i1.CookieService }, { token: PLATFORM_ID }, { token: 'REQUEST', optional: true }, { token: 'RESPONSE', optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveCookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCookieService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCookieService, decorators: [{
+EsolveCookieService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCookieService, deps: [{ token: i1.CookieService }, { token: PLATFORM_ID }, { token: 'REQUEST', optional: true }, { token: 'RESPONSE', optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCookieService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCookieService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCookieService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -217,9 +218,9 @@ class EsolveSessionService {
         }
     }
 }
-EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSessionService, deps: [{ token: PLATFORM_ID }, { token: ESOLVE_CONNECT_CONFIG }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveSessionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveSessionService, decorators: [{
+EsolveSessionService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveSessionService, deps: [{ token: PLATFORM_ID }, { token: ESOLVE_CONNECT_CONFIG }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveSessionService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveSessionService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveSessionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -264,9 +265,9 @@ class EsolveAuthInterceptorService {
         return next.handle(req);
     }
 }
-EsolveAuthInterceptorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthInterceptorService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: EsolveSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAuthInterceptorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthInterceptorService });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthInterceptorService, decorators: [{
+EsolveAuthInterceptorService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAuthInterceptorService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: EsolveSessionService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAuthInterceptorService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAuthInterceptorService });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAuthInterceptorService, decorators: [{
             type: Injectable
         }], ctorParameters: function () {
         return [{ type: undefined, decorators: [{
@@ -293,14 +294,14 @@ class NgEsolveConnectModule {
         };
     }
 }
-NgEsolveConnectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-NgEsolveConnectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule,
+NgEsolveConnectModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: NgEsolveConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+NgEsolveConnectModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule,
         HttpClientModule] });
-NgEsolveConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, providers: [CookieService], imports: [[
+NgEsolveConnectModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: NgEsolveConnectModule, providers: [CookieService], imports: [[
             CommonModule,
             HttpClientModule
         ]] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: NgEsolveConnectModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: NgEsolveConnectModule, decorators: [{
             type: NgModule,
             args: [{
                     declarations: [],
@@ -362,9 +363,9 @@ class EsolveResponseHandlerService {
         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: [{
+EsolveResponseHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveResponseHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -459,9 +460,9 @@ class EsolveErrorHandlerService {
         return new EsolveHttpError('error', result.message, result.code);
     }
 }
-EsolveErrorHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveErrorHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
+EsolveErrorHandlerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveErrorHandlerService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -578,9 +579,9 @@ class EsolveSeoService {
         return pageSeo;
     }
 }
-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: [{
+EsolveSeoService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveSeoService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveSeoService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -671,9 +672,9 @@ class EsolveGeocoderService {
         return geocode_result;
     }
 }
-EsolveGeocoderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveGeocoderService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveGeocoderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveGeocoderService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveGeocoderService, decorators: [{
+EsolveGeocoderService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveGeocoderService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveGeocoderService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveGeocoderService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveGeocoderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -853,9 +854,9 @@ class EsolveCategoryTreeService {
         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: [{
+EsolveCategoryTreeService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -978,9 +979,9 @@ class EsolveManufacturersService {
         return new EsolveManufacturer(record);
     }
 }
-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: [{
+EsolveManufacturersService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveManufacturersService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveManufacturersService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1104,9 +1105,9 @@ class EsolveRangesService {
         return new EsolveRange(record);
     }
 }
-EsolveRangesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveRangesService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveRangesService, decorators: [{
+EsolveRangesService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveRangesService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveRangesService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1211,9 +1212,9 @@ class EsolveTagsService {
         return tags;
     }
 }
-EsolveTagsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTagsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveTagsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTagsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveTagsService, decorators: [{
+EsolveTagsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveTagsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveTagsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveTagsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveTagsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1277,9 +1278,9 @@ class EsolveTopicService {
         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: [{
+EsolveTopicService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveTopicService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveTopicService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1447,9 +1448,9 @@ class EsolveAssetsService {
         return params;
     }
 }
-EsolveAssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAssetsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAssetsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAssetsService, decorators: [{
+EsolveAssetsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAssetsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAssetsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAssetsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAssetsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1549,9 +1550,15 @@ class EsolveAuthService {
         }));
     }
     logout() {
-        this.session.clearTimer();
-        this.cookieService.delete('_ws_id');
-        return this.getAccessToken('', '', true).toPromise();
+        return __awaiter(this, void 0, void 0, function* () {
+            this.session.clearTimer();
+            this.cookieService.delete('_ws_id');
+            const response = yield this.getAccessToken('', '', true).toPromise();
+            if (response) {
+                return response;
+            }
+            throw new Error('Invalid response');
+        });
     }
     checkAccessToken(session) {
         var _a;
@@ -1561,7 +1568,7 @@ class EsolveAuthService {
             .get(`${this.config.api_url}/get-access-token.php`, {
             params: { key: token },
             headers: new HttpHeaders({
-                'Accept-Language': '*'
+                'Accept-Language': '*',
             }),
         })
             .pipe(map((responseData) => {
@@ -1579,14 +1586,15 @@ class EsolveAuthService {
                 user_id: additional_data.user_id,
             };
             return result;
-        }))
-            .toPromise();
+        }));
     }
     // Handlers
     handleExpiration() {
         return (session) => {
-            this.checkAccessToken(session).then((response) => {
-                this.handleAuthentication(response);
+            this.checkAccessToken(session).toPromise().then((response) => {
+                if (response) {
+                    this.handleAuthentication(response);
+                }
             }, () => {
                 this.logout();
             });
@@ -1606,7 +1614,7 @@ class EsolveAuthService {
         if ((!errorRes.type) ||
             (!errorRes.service_type) ||
             (!errorRes.message)) {
-            return throwError(error);
+            return throwError(() => error);
         }
         if (errorRes.message.trim() !== '') {
             error.message = errorRes.message;
@@ -1614,12 +1622,12 @@ class EsolveAuthService {
         if (errorRes.additional_data) {
             error.data = errorRes.additional_data;
         }
-        return throwError(error);
+        return throwError(() => error);
     }
 }
-EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAuthService, decorators: [{
+EsolveAuthService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAuthService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAuthService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAuthService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAuthService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -1816,6 +1824,14 @@ class EsolveLocationTradingDay {
     }
 }
 
+class EsolveLocationGEO {
+    constructor(distance, range, target_description) {
+        this.distance = distance;
+        this.range = range;
+        this.target_description = target_description;
+    }
+}
+
 class EsolveLocation {
     constructor(record) {
         this.id = +record.id;
@@ -1851,6 +1867,7 @@ class EsolveLocation {
         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);
+        this.geo = new EsolveLocationGEO(record.range, record.distance, record.target_description);
     }
 }
 
@@ -1874,6 +1891,25 @@ class EsolveLocationsService {
             return this.processStockLocations(response.records);
         }));
     }
+    /**
+     * Retrieves a list of stock locations
+     *
+     * @returns An `Observable` with an array of stock locations
+     */
+    getStockLocationsGeo(addresses_id = 0) {
+        return this.http
+            .get(`${this.config.api_url}/get-locations-geo.php`, {
+            params: {
+                addresses_id,
+            },
+        })
+            .pipe(map((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return this.processStockLocations(response.records);
+        }));
+    }
     /**
      * Processes the eSolve stock location records.
      *
@@ -1890,9 +1926,9 @@ class EsolveLocationsService {
         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: [{
+EsolveLocationsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveLocationsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2315,9 +2351,9 @@ class EsolveAccountService {
         }
     }
 }
-EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveAccountService, decorators: [{
+EsolveAccountService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAccountService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveAccountService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAccountService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveAccountService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2459,9 +2495,9 @@ class EsolveBannerService {
         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: [{
+EsolveBannerService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveBannerService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveBannerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2604,9 +2640,9 @@ class EsolveMediaService {
         return this.http.get(`${this.config.api_url}/get-media.php`, { params });
     }
 }
-EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveMediaService, decorators: [{
+EsolveMediaService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveMediaService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveMediaService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveMediaService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveMediaService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2655,9 +2691,9 @@ class EsolveMenuService {
         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: [{
+EsolveMenuService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveMenuService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveMenuService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2855,9 +2891,9 @@ class EsolveNewsService {
         return params;
     }
 }
-EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveNewsService, decorators: [{
+EsolveNewsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveNewsService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveNewsService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveNewsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveNewsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -2945,7 +2981,7 @@ class EsolveStockLeadTimes {
 
 class EsolveStockItemBase {
     constructor(record = {}) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
         /**
          * eSolve Generated ID
          */
@@ -2978,6 +3014,14 @@ class EsolveStockItemBase {
          * Featured state
          */
         this.featured = false;
+        /**
+         * Number of stock available
+         */
+        this.amount_in_stock = 0;
+        /**
+         * Total items linked to the item as a recipe
+         */
+        this.total_recipe_items = 0;
         /**
          * Height measured in meters (m)
          */
@@ -3062,17 +3106,19 @@ class EsolveStockItemBase {
             this.ranges_id = +((_l = record.ranges_id) !== null && _l !== void 0 ? _l : 0);
             this.active = !!+((_m = record.is_active) !== null && _m !== void 0 ? _m : false);
             this.featured = !!+((_o = record.is_featured) !== null && _o !== void 0 ? _o : false);
-            this.height = +((_p = record.height) !== null && _p !== void 0 ? _p : 0);
-            this.width = +((_q = record.width) !== null && _q !== void 0 ? _q : 0);
-            this.length = +((_r = record.length) !== null && _r !== void 0 ? _r : 0);
-            this.weight = +((_s = record.weight) !== null && _s !== void 0 ? _s : 0);
+            this.amount_in_stock = +((_p = record.onhand) !== null && _p !== void 0 ? _p : 0);
+            this.total_recipe_items = +((_q = record.total_recipe_items) !== null && _q !== void 0 ? _q : 0);
+            this.height = +((_r = record.height) !== null && _r !== void 0 ? _r : 0);
+            this.width = +((_s = record.width) !== null && _s !== void 0 ? _s : 0);
+            this.length = +((_t = record.length) !== null && _t !== void 0 ? _t : 0);
+            this.weight = +((_u = record.weight) !== null && _u !== void 0 ? _u : 0);
             if (record.unit_of_measure) {
                 this.unit_of_measure = record.unit_of_measure;
             }
-            base_price = +((_t = record.regular_sellprice) !== null && _t !== void 0 ? _t : 0);
-            base_price_with_tax = +((_u = record.regular_sellprice_inclusive) !== null && _u !== void 0 ? _u : 0);
-            sell_price = +((_v = record.sellprice) !== null && _v !== void 0 ? _v : 0);
-            sell_price_with_tax = +((_w = record.sellprice_inclusive) !== null && _w !== void 0 ? _w : 0);
+            base_price = +((_v = record.regular_sellprice) !== null && _v !== void 0 ? _v : 0);
+            base_price_with_tax = +((_w = record.regular_sellprice_inclusive) !== null && _w !== void 0 ? _w : 0);
+            sell_price = +((_x = record.sellprice) !== null && _x !== void 0 ? _x : 0);
+            sell_price_with_tax = +((_y = record.sellprice_inclusive) !== null && _y !== void 0 ? _y : 0);
             if ((record.tags) && (record.tags.length > 0)) {
                 for (const tag of record.tags) {
                     this.tags.push(new EsolveTag(tag));
@@ -3111,8 +3157,8 @@ class EsolveStockItemBase {
             if (record.custom_fields) {
                 this.custom_fields = record.custom_fields;
             }
-            seo_title = (_x = record.seo_page_title) !== null && _x !== void 0 ? _x : '';
-            seo_keywords = (_y = record.seo_keywords) !== null && _y !== void 0 ? _y : '';
+            seo_title = (_z = record.seo_page_title) !== null && _z !== void 0 ? _z : '';
+            seo_keywords = (_0 = record.seo_keywords) !== null && _0 !== void 0 ? _0 : '';
         }
         this.price = new EsolveStockPrice(base_price, base_price_with_tax, sell_price, sell_price_with_tax);
         if (seo_title.trim() === '') {
@@ -3150,6 +3196,9 @@ class EsolveStockItemBase {
     get original_image_src() {
         return this.getImagePath('original');
     }
+    get available() {
+        return (this.amount_in_stock > 0);
+    }
     getImagePath(image_size) {
         if (this.image_name !== '') {
             return `/images/stock/${image_size}/${this.image_name}`;
@@ -3605,9 +3654,9 @@ class EsolveStockService {
         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: [{
+EsolveStockService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveStockService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveStockService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -3749,9 +3798,9 @@ class EsolveSpecialsService {
         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: [{
+EsolveSpecialsService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveSpecialsService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveSpecialsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root'
@@ -3796,7 +3845,7 @@ class EsolveCartItem {
 }
 
 class EsolveCartStockItem {
-    constructor(code, name, sef_name, description, active, items_in_pack, delivery_category, image_name) {
+    constructor(code, name, sef_name, description, active, items_in_pack, delivery_category, onhand, image_name) {
         this.code = code;
         this.name = name;
         this.sef_name = sef_name;
@@ -3804,6 +3853,7 @@ class EsolveCartStockItem {
         this.active = active;
         this.items_in_pack = items_in_pack;
         this.delivery_category = delivery_category;
+        this.onhand = onhand;
         this.image_name = image_name;
     }
     /**
@@ -4016,7 +4066,7 @@ class EsolveCartService {
         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);
+                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.onhand, 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));
             }
         }
@@ -4033,9 +4083,9 @@ class EsolveCartService {
         return cart_totals;
     }
 }
-EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveCartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCartService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveCartService, decorators: [{
+EsolveCartService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCartService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveCartService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCartService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveCartService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -4047,6 +4097,8 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
                     }] }, { type: i1$2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }];
     } });
 
+// Only export the types that are accessible to the public API
+
 class EsolveBankingDetails {
     constructor(bank_name, account_holder, account, account_type, swift_number, branch_code) {
         this.bank_name = bank_name;
@@ -4058,6 +4110,78 @@ class EsolveBankingDetails {
     }
 }
 
+class EsolvePaymentMethod {
+    constructor(record) {
+        this.id = +record.id;
+        this.location_id = +record.location_id;
+        this.paymethod_name = record.paymethod_name;
+        this.description = record.description;
+        this.display_banking_details = record.display_banking_details;
+        this.currency_code = record.currency_code;
+        this.merchant_id = record.merchant_id;
+        this.application_id = record.application_id;
+        this.api_signature = record.api_signature;
+        this.is_gateway = record.is_gateway;
+        this.must_store_card_details = record.must_store_card_details;
+        this.allow_budget = record.allow_budget;
+        this.integration_type = record.integration_type;
+        this.bank_gateway_id = record.bank_gateway_id;
+        this.accepted_card_types = record.accepted_card_types;
+        this.post_transactions_to_gateway = record.post_transactions_to_gateway;
+        this.three_d_secure_url = record.three_d_secure_url;
+        this.gateway_url = record.gateway_url;
+        this.generate_token_url = record.generate_token_url;
+        this.widget_url = record.widget_url;
+        this.successful_url = record.successful_url;
+        this.failed_url = record.failed_url;
+        this.enable_callback = record.enable_callback;
+        this.live = record.live;
+        this.default_module_id = +record.default_module_id;
+        this.service_provider = record.service_provider;
+        this.on_account = record.on_account;
+        this.sort_priority = +record.sort_priority;
+        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 EsolvePaymentResult extends EsolveResponseResult {
+    constructor(response) {
+        var _a;
+        super(response);
+        this.redirect_required = false;
+        if (typeof response.service_provider !== 'undefined') {
+            this.service_provider = response.service_provider;
+        }
+        if (typeof response.redirect_required !== 'undefined') {
+            this.redirect_required = response.redirect_required;
+        }
+        this.gateway_error_message = (_a = response.gateway_error_message) !== null && _a !== void 0 ? _a : '';
+        // Check if redirect settings need to be set
+        if (this.redirect_required && this.service_provider) {
+            if (typeof response.redirect_url !== 'undefined') {
+                this.redirect_url = response.redirect_url;
+            }
+            // Check integration specific settings
+            if (this.service_provider === 'snapscan') {
+                // QR code scan is required
+                if (typeof response.qr_code_url !== 'undefined') {
+                    this.qr_code_url = response.qr_code_url;
+                }
+            }
+            else {
+                // Normal form posting redirect
+                if (typeof response.form_inputs !== 'undefined') {
+                    this.form_inputs = response.form_inputs;
+                }
+                if (typeof response.form_enctype !== 'undefined') {
+                    this.form_enctype = response.form_enctype;
+                }
+            }
+        }
+    }
+}
+
 class EsolveVaultItemResult extends EsolveResponseResult {
     constructor(response) {
         super(response);
@@ -4097,62 +4221,6 @@ class EsolveVaultItem {
     }
 }
 
-class EsolvePaymentResult extends EsolveResponseResult {
-    constructor(response) {
-        super(response);
-        if (typeof response.gateway_error_message !== 'undefined') {
-            this.gateway_error_message = response.gateway_error_message;
-        }
-        if (typeof response.three_d_secure !== 'undefined') {
-            this.three_d_secure = response.three_d_secure;
-        }
-        if (typeof response.redirect_url !== 'undefined') {
-            this.redirect_url = response.redirect_url;
-        }
-        if (typeof response.form_inputs !== 'undefined') {
-            this.form_inputs = response.form_inputs;
-        }
-        if (typeof response.form_html !== 'undefined') {
-            this.form_html = response.form_html;
-        }
-    }
-}
-
-class EsolvePaymentMethod {
-    constructor(record) {
-        this.id = +record.id;
-        this.location_id = +record.location_id;
-        this.paymethod_name = record.paymethod_name;
-        this.description = record.description;
-        this.display_banking_details = record.display_banking_details;
-        this.currency_code = record.currency_code;
-        this.merchant_id = record.merchant_id;
-        this.application_id = record.application_id;
-        this.api_signature = record.api_signature;
-        this.is_gateway = record.is_gateway;
-        this.must_store_card_details = record.must_store_card_details;
-        this.allow_budget = record.allow_budget;
-        this.integration_type = record.integration_type;
-        this.bank_gateway_id = record.bank_gateway_id;
-        this.accepted_card_types = record.accepted_card_types;
-        this.post_transactions_to_gateway = record.post_transactions_to_gateway;
-        this.three_d_secure_url = record.three_d_secure_url;
-        this.gateway_url = record.gateway_url;
-        this.generate_token_url = record.generate_token_url;
-        this.widget_url = record.widget_url;
-        this.successful_url = record.successful_url;
-        this.failed_url = record.failed_url;
-        this.enable_callback = record.enable_callback;
-        this.live = record.live;
-        this.default_module_id = +record.default_module_id;
-        this.service_provider = record.service_provider;
-        this.on_account = record.on_account;
-        this.sort_priority = +record.sort_priority;
-        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 EsolvePaymentService {
     constructor(config, http, errorHandler, responseHandler) {
         this.config = config;
@@ -4162,7 +4230,9 @@ class EsolvePaymentService {
     }
     /**
      * Retrieves a list of payment methods.
+     *
      * @param options Filter options
+     *
      * @returns An `Observable` with an array of payment methods
      */
     getPaymentMethods(options) {
@@ -4175,9 +4245,28 @@ class EsolvePaymentService {
             return this.processPaymentMethods(response.records);
         }));
     }
+    /**
+     * Retrieve the payment status of the specified transaction
+     *
+     * @param transaction_id ID of the transaction
+     *
+     * @returns An `Observable` with the success status of the payment
+     */
+    getPaymentStatus(transaction_id) {
+        return this.http
+            .get(`${this.config.api_url}/get-payment-status.php`, { params: { cart_id: transaction_id } })
+            .pipe(map((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return response.records.success;
+        }));
+    }
     /**
      * Retrieves a list of saved cards from the vault.
+     *
      * @param payment_methods_id eSolve ID of a payment method
+     *
      * @returns An `Observable` with an array of saved bank cards
      */
     getVault(payment_methods_id) {
@@ -4196,8 +4285,10 @@ class EsolvePaymentService {
     }
     /**
      * Sets a new card in the vault OR updates an existing one.
+     *
      * @param payment_methods_id Selected payment method
      * @param card_data Information of bank card
+     *
      * @returns An `Observable` with the result of the vault set.
      */
     setVaultItem(payment_methods_id, card_data) {
@@ -4222,6 +4313,13 @@ class EsolvePaymentService {
             return this.errorHandler.handleHttpPostError('set-vault', errorRes);
         }));
     }
+    /**
+     * Delete a card in the vault
+     *
+     * @param id ID of the vault item
+     *
+     * @returns An `Observable` with the result of the vault delete.
+     */
     deleteVaultItem(id) {
         return this.http
             .delete(`${this.config.api_url}/delete-vault.php`, {
@@ -4247,25 +4345,28 @@ class EsolvePaymentService {
      * @param transaction_id eSolve ID to the transaction
      * @param payment_methods_id eSolve ID to the selected payment method
      * @param card ID of selected card from the vault or information to a brand new card
+     *
      * @returns An `Observable` with the result of the payment
      */
     setPayment(transaction_id, payment_methods_id, card) {
         const body = {
             payment: {
                 cart_id: transaction_id,
-                payment_methods_id
+                payment_methods_id,
             },
         };
-        if (typeof card === 'number') {
-            body.payment.user_vault_id = card;
-        }
-        else {
-            body.card = {
-                card_number: card.card_number,
-                card_name: card.name,
-                card_cvv: card.cvv,
-                card_expiry: this.generateExpiry(card),
-            };
+        if (card) {
+            if (typeof card === 'number') {
+                body.payment.user_vault_id = card;
+            }
+            else {
+                body.card = {
+                    card_number: card.card_number,
+                    card_name: card.name,
+                    card_cvv: card.cvv,
+                    card_expiry: this.generateExpiry(card),
+                };
+            }
         }
         return this.http
             .post(`${this.config.api_url}/set-payment.php`, body, {
@@ -4281,7 +4382,9 @@ class EsolvePaymentService {
     }
     /**
      * Processes the eSolve payment method records.
+     *
      * @param records Records to process
+     *
      * @returns An array of processed payment methods.
      */
     processPaymentMethods(records) {
@@ -4296,7 +4399,9 @@ class EsolvePaymentService {
     }
     /**
      * Processes the eSolve vault records.
+     *
      * @param records Records to process
+     *
      * @returns An array of processed vault items (a.k.a. cards)
      */
     processVaultItems(records) {
@@ -4309,15 +4414,22 @@ class EsolvePaymentService {
         }
         return vault;
     }
+    /**
+     * Generate a concatenated string with the expiry month and year
+     *
+     * @param card_data Credit card data
+     *
+     *  @returns Expiry string
+     */
     generateExpiry(card_data) {
         const month_string = card_data.expiry_month.padStart(2, '0');
         const year_string = card_data.expiry_year.padStart(4, '0');
         return `${month_string}${year_string}`;
     }
 }
-EsolvePaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolvePaymentService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolvePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolvePaymentService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolvePaymentService, decorators: [{
+EsolvePaymentService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolvePaymentService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolvePaymentService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolvePaymentService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolvePaymentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -4479,9 +4591,9 @@ class EsolveShippingService {
         return shipping_cost;
     }
 }
-EsolveShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveShippingService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
-EsolveShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveShippingService, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImport: i0, type: EsolveShippingService, decorators: [{
+EsolveShippingService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveShippingService, deps: [{ token: ESOLVE_CONNECT_CONFIG }, { token: i1$2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable });
+EsolveShippingService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveShippingService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveShippingService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -4522,9 +4634,9 @@ class EsolveEnquiryService {
         }));
     }
 }
-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: [{
+EsolveEnquiryService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.11", 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.3.11", ngImport: i0, type: EsolveEnquiryService, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.11", ngImport: i0, type: EsolveEnquiryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',