@esolve/ng-esolve-connect 0.46.2 → 0.47.0

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

@@ -1,26 +1,27 @@
 import { isPlatformBrowser, CommonModule, IMAGE_LOADER, DOCUMENT } from '@angular/common';
-import * as i2 from '@angular/common/http';
-import { HttpErrorResponse, HttpParams, HttpHeaders, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi, HttpClientModule } from '@angular/common/http';
+import { HttpErrorResponse, HttpClient, HttpParams, HttpHeaders, HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi, HttpClientModule } from '@angular/common/http';
 import * as i0 from '@angular/core';
-import { InjectionToken, Injectable, Inject, PLATFORM_ID, APP_INITIALIZER, NgModule, Directive, Input, HostListener, inject } from '@angular/core';
+import { InjectionToken, inject, Injectable, PLATFORM_ID, APP_INITIALIZER, NgModule, ElementRef, Directive, Input, HostListener } from '@angular/core';
 import * as i1 from 'ngx-cookie-service-ssr';
 import { SsrCookieService } from 'ngx-cookie-service-ssr';
-import { throwError, BehaviorSubject, Subject, map, switchMap, timer, takeUntil, combineLatest, shareReplay, filter, distinctUntilChanged, of, firstValueFrom, iif } from 'rxjs';
+import { throwError, BehaviorSubject, Subject, map, switchMap, timer, takeUntil, combineLatest, debounceTime, shareReplay, filter, distinctUntilChanged, of, firstValueFrom, iif } from 'rxjs';
 import { map as map$1, catchError, switchMap as switchMap$1, tap } from 'rxjs/operators';
 import { fromUnixTime } from 'date-fns';
-import * as i2$1 from '@angular/platform-browser';
+import { Title, Meta } from '@angular/platform-browser';
 
 const ESOLVE_CONNECT_CONFIG = new InjectionToken('esolve.connect.config');
 
 class EsolveConfigService {
-    constructor(config) {
+    constructor() {
         this.api_url = '';
         this.site_url = '';
         this.wsid = '';
         this.title_separator = '|';
         this.session_storage_key = '_ng_eslv_token';
         this.coupon_storage_key = '_ng_eslv_coupons';
+        this.voucher_storage_key = '_ng_eslv_vouchers';
         this.device_designation = 'web';
+        const config = inject(ESOLVE_CONNECT_CONFIG);
         if (config.api_url === '' || config.wsid === '') {
             throw new Error('Invalid eSolve Eurus config');
         }
@@ -42,6 +43,9 @@ class EsolveConfigService {
         if (config.coupon_storage_key) {
             this.coupon_storage_key = config.coupon_storage_key;
         }
+        if (config.voucher_storage_key) {
+            this.voucher_storage_key = config.voucher_storage_key;
+        }
         if (this.native && config.device_designation) {
             this.device_designation = config.device_designation;
         }
@@ -52,18 +56,15 @@ class EsolveConfigService {
         }
         this.error_image_path = config.error_image_path;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveConfigService, deps: [{ token: ESOLVE_CONNECT_CONFIG }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveConfigService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveConfigService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveConfigService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveConfigService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveConfigService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [ESOLVE_CONNECT_CONFIG]
-                }] }]; } });
+        }], ctorParameters: function () { return []; } });
 
 class EsolveHttpError extends Error {
     constructor(type, code, message) {
@@ -159,10 +160,10 @@ class EsolveErrorHandlerService {
     parseDeleteError(result) {
         return new EsolveHttpError('error', result.code, result.message);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveErrorHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveErrorHandlerService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveErrorHandlerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -185,10 +186,10 @@ class EsolveCookieService {
     delete(name, path, domain, secure) {
         this.cookieService.delete(name, path, domain, secure);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCookieService, deps: [{ token: i1.SsrCookieService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCookieService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCookieService, deps: [{ token: i1.SsrCookieService }], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCookieService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCookieService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCookieService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -222,10 +223,10 @@ function esolveHexHash(...values) {
 }
 
 class EsolveSessionService {
-    constructor(platformId, config, cookieService) {
-        this.platformId = platformId;
-        this.config = config;
-        this.cookieService = cookieService;
+    constructor() {
+        this.is_browser = isPlatformBrowser(inject(PLATFORM_ID));
+        this.config = inject(EsolveConfigService);
+        this.cookieService = inject(EsolveCookieService);
         this.token$ = new BehaviorSubject('');
         this.user_id$ = new BehaviorSubject(0);
         this.location_id$ = new BehaviorSubject(0);
@@ -238,7 +239,6 @@ class EsolveSessionService {
         this.session_end = new Subject();
         this.setStorageKey();
         this._session = this.initSession();
-        this.is_browser = isPlatformBrowser(this.platformId);
         this.getSession()
             .pipe(map(({ token, user_id, location_id }) => {
             return esolveHexHash(token, user_id, location_id);
@@ -265,7 +265,9 @@ class EsolveSessionService {
             user_id: this.onUserIdUpdate(),
             location_id: this.onLocationIdUpdate(),
         };
-        return combineLatest(session).pipe(shareReplay(1));
+        return combineLatest(session).pipe(
+        // Delays the emit only slightly incase multiple values are set
+        debounceTime(10), shareReplay(1));
     }
     isValid() {
         return this.getToken() !== '';
@@ -336,9 +338,10 @@ class EsolveSessionService {
         const expiry_date = fromUnixTime(expiry_date_unix);
         const grace_expiry_date = fromUnixTime(expiry_date_unix + grace_unix);
         this.setCache(session.token, grace_expiry_date);
-        this.updateToken(session.token);
         this.updateUserId(session.user_id);
         this.updateLocationId(session.location_id);
+        // Update token last to make sure session is correctly checked
+        this.updateToken(session.token);
         this.startTimer(expiry_date);
     }
     handleUpdateSession({ user_id, location_id, }) {
@@ -379,18 +382,15 @@ class EsolveSessionService {
         }
         localStorage.removeItem(this.storage_key);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSessionService, deps: [{ token: PLATFORM_ID }, { token: EsolveConfigService }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSessionService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSessionService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSessionService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSessionService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSessionService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [PLATFORM_ID]
-                }] }, { type: EsolveConfigService }, { type: EsolveCookieService }]; } });
+        }], ctorParameters: function () { return []; } });
 
 class EsolveResult {
     constructor(status, code, message) {
@@ -430,10 +430,10 @@ class EsolveResponseHandlerService {
         }
         return resultHandler(response);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveResponseHandlerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveResponseHandlerService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveResponseHandlerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -441,11 +441,11 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImpor
         }] });
 
 class EsolveSessionMetadataService {
-    constructor(config, http, errorHandler, responseHandler) {
-        this.config = config;
-        this.http = http;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.errorHandler = inject(EsolveErrorHandlerService);
+        this.responseHandler = inject(EsolveResponseHandlerService);
     }
     set(type, metadata) {
         return this.http
@@ -493,22 +493,22 @@ class EsolveSessionMetadataService {
             return this.errorHandler.handleHttpDeleteError('delete-sessions-metadata', errorRes);
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSessionMetadataService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSessionMetadataService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSessionMetadataService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSessionMetadataService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSessionMetadataService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSessionMetadataService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+        }] });
 
 class EsolveAuthService {
-    constructor(config, http, session, errorHandler) {
-        this.config = config;
-        this.http = http;
-        this.session = session;
-        this.errorHandler = errorHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.session = inject(EsolveSessionService);
+        this.errorHandler = inject(EsolveErrorHandlerService);
         this.session
             .onSessionEnd()
             .pipe(switchMap$1(() => this.checkAccessToken()), catchError(() => of(null)))
@@ -716,20 +716,20 @@ class EsolveAuthService {
         }
         return throwError(() => error);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAuthService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAuthService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAuthService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAuthService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAuthService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAuthService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }]; } });
+        }], ctorParameters: function () { return []; } });
 
 class EsolveAuthInterceptorService {
-    constructor(config, session) {
-        this.config = config;
-        this.session = session;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.session = inject(EsolveSessionService);
     }
     intercept(req, next) {
         if (req.url.startsWith(`${this.config.api_url}/`)) {
@@ -757,12 +757,12 @@ class EsolveAuthInterceptorService {
         }
         return next.handle(req);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAuthInterceptorService, deps: [{ token: EsolveConfigService }, { token: EsolveSessionService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAuthInterceptorService }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAuthInterceptorService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAuthInterceptorService }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAuthInterceptorService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAuthInterceptorService, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: EsolveSessionService }]; } });
+        }] });
 
 const ESOLVE_EURUS_AUTO_LOGIN = {
     provide: APP_INITIALIZER,
@@ -801,11 +801,11 @@ class NgEsolveConnectModule {
             providers: provideNgEsolveConnect(config, auto_login),
         };
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: NgEsolveConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
-    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.1.3", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule, HttpClientModule] }); }
-    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule, HttpClientModule] }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: NgEsolveConnectModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
+    static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.1.8", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule, HttpClientModule] }); }
+    static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: NgEsolveConnectModule, imports: [CommonModule, HttpClientModule] }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: NgEsolveConnectModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: NgEsolveConnectModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [CommonModule, HttpClientModule],
@@ -879,9 +879,9 @@ function provideEsolveImageLoader() {
  * An alternative to optimised images to load a new image
  */
 class EsolveCdnSrcDirective {
-    constructor(el, config) {
-        this.el = el;
-        this.config = config;
+    constructor() {
+        this.el = inject((ElementRef));
+        this.config = inject(EsolveConfigService);
         this.src = '';
         this.no_image = false;
         this.error_image_path = '/assets/no_image.jpg';
@@ -925,16 +925,16 @@ class EsolveCdnSrcDirective {
     isImage(el) {
         return 'loading' in this.el.nativeElement;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCdnSrcDirective, deps: [{ token: i0.ElementRef }, { token: EsolveConfigService }], target: i0.ɵɵFactoryTarget.Directive }); }
-    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.1.3", type: EsolveCdnSrcDirective, isStandalone: true, selector: "[eslvCdnSrc]", inputs: { src: ["eslvCdnSrc", "src"] }, host: { listeners: { "error": "onError()" } }, usesOnChanges: true, ngImport: i0 }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCdnSrcDirective, deps: [], target: i0.ɵɵFactoryTarget.Directive }); }
+    static { this.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.1.8", type: EsolveCdnSrcDirective, isStandalone: true, selector: "[eslvCdnSrc]", inputs: { src: ["eslvCdnSrc", "src"] }, host: { listeners: { "error": "onError()" } }, usesOnChanges: true, ngImport: i0 }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCdnSrcDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCdnSrcDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[eslvCdnSrc]',
                     standalone: true,
                 }]
-        }], ctorParameters: function () { return [{ type: i0.ElementRef }, { type: EsolveConfigService }]; }, propDecorators: { src: [{
+        }], ctorParameters: function () { return []; }, propDecorators: { src: [{
                 type: Input,
                 args: ['eslvCdnSrc']
             }], onError: [{
@@ -1169,10 +1169,10 @@ class EsolveSeoInfo {
 }
 
 class EsolveSeoService {
-    constructor(config, title, meta) {
-        this.config = config;
-        this.title = title;
-        this.meta = meta;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.title = inject(Title);
+        this.meta = inject(Meta);
         this.dom = inject(DOCUMENT);
         this.title_prefix = '';
         this.title_suffix = '';
@@ -1274,15 +1274,15 @@ class EsolveSeoService {
         }
         return pageSeo;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSeoService, deps: [{ token: EsolveConfigService }, { token: i2$1.Title }, { token: i2$1.Meta }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSeoService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSeoService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSeoService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSeoService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSeoService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2$1.Title }, { type: i2$1.Meta }]; } });
+        }], ctorParameters: function () { return []; } });
 
 class EsolveGeocodeAddressResult {
     constructor(street_number, street, suburb, city, province, country, postal_code) {
@@ -1315,9 +1315,9 @@ class EsolveGeocodeResult {
 }
 
 class EsolveGeocoderService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     geocode(street_number, street, suburb, city, province, country, postal_code) {
         return this.http
@@ -1364,15 +1364,15 @@ class EsolveGeocoderService {
         const geocode_result = new EsolveGeocodeResult(record.formatted_address, geocode_address, geocode_coords, record.status, record.checksum, record.cached);
         return geocode_result;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveGeocoderService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveGeocoderService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveGeocoderService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveGeocoderService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveGeocoderService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveGeocoderService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveLinkedAsset {
     constructor(record) {
@@ -1432,9 +1432,9 @@ class EsolveCategoryTreeItem {
 }
 
 class EsolveCategoryTreeService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves the category tree from eSolve instance and coverts it to the correct format.
@@ -1565,15 +1565,15 @@ class EsolveCategoryTreeService {
         }
         return null;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCategoryTreeService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCategoryTreeService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCategoryTreeService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCategoryTreeService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveManufacturer {
     get original_image_src() {
@@ -1636,9 +1636,9 @@ class EsolveManufacturer {
 }
 
 class EsolveManufacturersService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getManufacturer(id) {
         const params = new HttpParams({
@@ -1687,15 +1687,15 @@ class EsolveManufacturersService {
     processManufacturer(record) {
         return new EsolveManufacturer(record);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveManufacturersService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveManufacturersService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveManufacturersService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveManufacturersService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveManufacturersService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveManufacturersService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 // Types
 
@@ -1753,9 +1753,9 @@ class EsolveRange {
 }
 
 class EsolveRangesService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getRange(id) {
         const params = new HttpParams({
@@ -1807,15 +1807,15 @@ class EsolveRangesService {
     processRange(record) {
         return new EsolveRange(record);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveRangesService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveRangesService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveRangesService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveRangesService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveRangesService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveRangesService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveTag {
     /**
@@ -1853,9 +1853,9 @@ class EsolveTag {
 }
 
 class EsolveTagsService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves active topics from the list of topic ID's. Note that inactive or expired
@@ -1910,15 +1910,15 @@ class EsolveTagsService {
         }
         return tags;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTagsService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTagsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTagsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTagsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTagsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTagsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 // Types
 
@@ -1938,9 +1938,9 @@ class EsolveTopic {
 }
 
 class EsolveTopicService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves active topics from the list of topic ID's. Note that inactive or expired
@@ -1972,15 +1972,15 @@ class EsolveTopicService {
         }
         return topics;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTopicService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTopicService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTopicService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTopicService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTopicService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTopicService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveAsset {
     /**
@@ -2055,9 +2055,9 @@ class EsolveAsset {
 }
 
 class EsolveAssetsService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getAsset(id) {
         const params = new HttpParams({ fromObject: { assets_id: id } });
@@ -2165,15 +2165,15 @@ class EsolveAssetsService {
         const total = total_records;
         return new EsolveList(assets, page, rows, total);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAssetsService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAssetsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAssetsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAssetsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAssetsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAssetsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 // Types
 
@@ -2645,9 +2645,9 @@ class EsolveLocation {
 // Classes
 
 class EsolveLocationsService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves a list of stock locations
@@ -2706,15 +2706,15 @@ class EsolveLocationsService {
         }
         return stock_locations;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveLocationsService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveLocationsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveLocationsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveLocationsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveLocationsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveTransactionLocation extends EsolveLocation {
 }
@@ -2810,11 +2810,11 @@ class EsolveTransactionsService {
             this._user_id = value;
         }
     }
-    constructor(config, http, sessionService, errorHandler) {
-        this.config = config;
-        this.http = http;
-        this.sessionService = sessionService;
-        this.errorHandler = errorHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.sessionService = inject(EsolveSessionService);
+        this.errorHandler = inject(EsolveErrorHandlerService);
         this._user_id = 0;
         this.sessionService.getSession().subscribe((session) => {
             if (session.token !== '') {
@@ -2909,15 +2909,15 @@ class EsolveTransactionsService {
         }
         return transactions;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTransactionsService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTransactionsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTransactionsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTransactionsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveTransactionsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveTransactionsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }]; } });
+        }], ctorParameters: function () { return []; } });
 
 class EsolveEmptyCartResult extends EsolveResponseResult {
 }
@@ -3016,7 +3016,10 @@ class EsolveCartTotals {
      * Grand total of cart which includes discount and VAT (NOTE: shipping and insurance is not included)
      */
     get total() {
-        return this.sub_total + this.vat_total - this.discount_total;
+        return (this.sub_total +
+            this.vat_total -
+            this.discount_total -
+            this.voucher_total);
     }
     constructor(
     /**
@@ -3038,12 +3041,17 @@ class EsolveCartTotals {
     /**
      * Total discount of all the item in the cart
      */
-    discount_total = 0) {
+    discount_total = 0, 
+    /**
+     * Total of all vouchers used
+     */
+    voucher_total = 0) {
         this.records = records;
         this.items = items;
         this.sub_total = sub_total;
         this.vat_total = vat_total;
         this.discount_total = discount_total;
+        this.voucher_total = voucher_total;
     }
 }
 
@@ -3091,18 +3099,17 @@ class EsolveCoupon {
 }
 
 class EsolveCouponsService {
-    constructor(platformId, config, http, cookieService) {
-        this.platformId = platformId;
-        this.config = config;
-        this.http = http;
-        this.cookieService = cookieService;
+    constructor() {
+        this.is_browser = isPlatformBrowser(inject(PLATFORM_ID));
+        this.http = inject(HttpClient);
+        this.config = inject(EsolveConfigService);
+        this.cookieService = inject(EsolveCookieService);
         this.storage_key = '_ng_eslv_coupons';
-        this.coupons_cache = new Map();
+        this.cache = new Map();
         this.applied = new BehaviorSubject(undefined);
         this.validation_error = new Subject();
         this.setStorageKey();
-        this.coupons_cache = this.retrieveCache();
-        this.is_browser = isPlatformBrowser(this.platformId);
+        this.cache = this.retrieveCache();
     }
     onValidationError() {
         return this.validation_error.asObservable();
@@ -3155,15 +3162,15 @@ class EsolveCouponsService {
         }
     }
     removeCoupon(id) {
-        this.coupons_cache.delete(id);
+        this.cache.delete(id);
         this.cacheCoupons();
         this.applied.next();
     }
     getAppliedCouponKeys() {
-        return [...this.coupons_cache.values()];
+        return [...this.cache.values()];
     }
     getAppliedCoupons() {
-        const coupon_ids = [...this.coupons_cache.keys()];
+        const coupon_ids = [...this.cache.keys()];
         return this.http
             .get(`${this.config.api_url}/get-applied-coupons.php`, {
             params: {
@@ -3199,8 +3206,8 @@ class EsolveCouponsService {
         return new Map();
     }
     cacheCoupons() {
-        if (this.coupons_cache.size > 0) {
-            const coupons_json = this.jsonEncodeMap(this.coupons_cache);
+        if (this.cache.size > 0) {
+            const coupons_json = this.jsonEncodeMap(this.cache);
             this.cookieService.set(this.storage_key, coupons_json, undefined, '/');
             this.setBackup(coupons_json);
         }
@@ -3209,7 +3216,7 @@ class EsolveCouponsService {
         }
     }
     deleteCoupons() {
-        this.coupons_cache.clear();
+        this.cache.clear();
         this.cookieService.delete(this.storage_key, '/');
         this.removeBackup();
     }
@@ -3241,8 +3248,8 @@ class EsolveCouponsService {
         localStorage.removeItem(this.storage_key);
     }
     addCoupon(id, key) {
-        if (!this.coupons_cache.has(id)) {
-            this.coupons_cache.set(id, key);
+        if (!this.cache.has(id)) {
+            this.cache.set(id, key);
             this.cacheCoupons();
         }
         this.applied.next();
@@ -3293,28 +3300,258 @@ class EsolveCouponsService {
         }
         return coupons;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCouponsService, deps: [{ token: PLATFORM_ID }, { token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveCookieService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCouponsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCouponsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCouponsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCouponsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCouponsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
-                    type: Inject,
-                    args: [PLATFORM_ID]
-                }] }, { type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveCookieService }]; } });
+        }], ctorParameters: function () { return []; } });
+
+// Classes
+
+class EsolveVoucher {
+    constructor(record) {
+        this.id = 0;
+        this.identifier = '';
+        this.value = 0;
+        /**
+         * Shows either the short code or the coupon key (if short code is not set)
+         */
+        this.voucher_code = '';
+        if (record) {
+            this.id = +record.id;
+            this.identifier = record.identifier;
+            this.value = +record.value;
+            this.voucher_code = record.voucher_code;
+        }
+    }
+}
+
+class EsolveVouchersService {
+    constructor() {
+        this.is_browser = isPlatformBrowser(inject(PLATFORM_ID));
+        this.http = inject(HttpClient);
+        this.config = inject(EsolveConfigService);
+        this.cookieService = inject(EsolveCookieService);
+        this.storage_key = '_ng_eslv_vouchers';
+        this.cache = new Map();
+        this.applied = new BehaviorSubject(undefined);
+        this.validation_error = new Subject();
+        this.setStorageKey();
+        this.cache = this.retrieveCache();
+    }
+    onValidationError() {
+        return this.validation_error.asObservable();
+    }
+    onApplied() {
+        return this.applied.asObservable();
+    }
+    validate(voucher_key) {
+        return this.http
+            .get(`${this.config.api_url}/get-validate-voucher.php`, {
+            params: {
+                voucher_key,
+            },
+        })
+            .pipe(map$1((response) => {
+            if (response.records === undefined ||
+                Array.isArray(response.records)) {
+                throw response;
+            }
+            const valid = response.records.valid;
+            const result = {
+                valid,
+            };
+            if (!valid) {
+                const error = response.records.error;
+                this.validation_error.next(error);
+            }
+            else if (valid) {
+                result.id = response.records.id;
+            }
+            return result;
+        }), catchError(() => {
+            this.validation_error.next(undefined);
+            return [{ valid: false }];
+        }));
+    }
+    async applyVoucher(voucher_key) {
+        try {
+            if (voucher_key.trim() === '') {
+                return false;
+            }
+            const result = await firstValueFrom(this.validate(voucher_key));
+            if (result.valid && result.id) {
+                this.addVoucher(result.id, voucher_key);
+            }
+            return result.valid;
+        }
+        catch (error) {
+            return false;
+        }
+    }
+    removeVoucher(id) {
+        this.cache.delete(id);
+        this.cacheVouchers();
+        this.applied.next();
+    }
+    getAppliedVoucherKeys() {
+        return [...this.cache.values()];
+    }
+    getAppliedVouchers() {
+        const voucher_ids = [...this.cache.keys()];
+        return this.http
+            .get(`${this.config.api_url}/get-applied-vouchers.php`, {
+            params: {
+                vouchers: voucher_ids.join(','),
+            },
+        })
+            .pipe(map$1((response) => {
+            if (response.records === undefined) {
+                throw response;
+            }
+            return this.processVouchers(response.records);
+        }));
+    }
+    reset() {
+        this.deleteVouchers();
+    }
+    retrieveCache() {
+        if (this.cookieService.check(this.storage_key) || this.getBackup()) {
+            let vouchers_json = this.cookieService.get(this.storage_key);
+            if (vouchers_json === '') {
+                const local_store_data = this.getBackup();
+                if (local_store_data) {
+                    vouchers_json = local_store_data;
+                }
+            }
+            try {
+                return this.jsonDecodeMap(vouchers_json);
+            }
+            catch (error) {
+                // soft error
+            }
+        }
+        return new Map();
+    }
+    cacheVouchers() {
+        if (this.cache.size > 0) {
+            const vouchers_json = this.jsonEncodeMap(this.cache);
+            this.cookieService.set(this.storage_key, vouchers_json, undefined, '/');
+            this.setBackup(vouchers_json);
+        }
+        else {
+            this.deleteVouchers();
+        }
+    }
+    deleteVouchers() {
+        this.cache.clear();
+        this.cookieService.delete(this.storage_key, '/');
+        this.removeBackup();
+    }
+    getBackup() {
+        if (!this.is_browser) {
+            return null;
+        }
+        if (!localStorage) {
+            return null;
+        }
+        return localStorage.getItem(this.storage_key);
+    }
+    setBackup(data) {
+        if (!this.is_browser) {
+            return;
+        }
+        if (!localStorage) {
+            return;
+        }
+        localStorage.setItem(this.storage_key, data);
+    }
+    removeBackup() {
+        if (!this.is_browser) {
+            return;
+        }
+        if (!localStorage) {
+            return;
+        }
+        localStorage.removeItem(this.storage_key);
+    }
+    addVoucher(id, key) {
+        if (!this.cache.has(id)) {
+            this.cache.set(id, key);
+            this.cacheVouchers();
+        }
+        this.applied.next();
+    }
+    setStorageKey() {
+        if (typeof this.config.voucher_storage_key === 'string' &&
+            this.config.voucher_storage_key !== '') {
+            this.storage_key = this.config.voucher_storage_key;
+        }
+    }
+    jsonEncodeMap(data) {
+        if (!(data instanceof Map)) {
+            throw new Error('Invalid map type');
+        }
+        return JSON.stringify(data, (key, value) => {
+            if (value instanceof Map) {
+                return {
+                    dataType: 'Map',
+                    value: [...value],
+                };
+            }
+            else {
+                return value;
+            }
+        });
+    }
+    jsonDecodeMap(json_data) {
+        const data = JSON.parse(json_data, (key, value) => {
+            if (typeof value === 'object' && value !== null) {
+                if (value.dataType === 'Map') {
+                    return new Map(value.value);
+                }
+            }
+            return value;
+        });
+        if (data instanceof Map) {
+            return data;
+        }
+        throw new Error('Invalid map type');
+    }
+    processVouchers(records) {
+        const vouchers = [];
+        if (records) {
+            for (const record of records) {
+                const voucher = new EsolveVoucher(record);
+                vouchers.push(voucher);
+            }
+        }
+        return vouchers;
+    }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveVouchersService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveVouchersService, providedIn: 'root' }); }
+}
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveVouchersService, decorators: [{
+            type: Injectable,
+            args: [{
+                    providedIn: 'root',
+                }]
+        }], ctorParameters: function () { return []; } });
 
 // Classes
 
 class EsolveCartService {
-    constructor(config, http, errorHandler, responseHandler, coupons) {
-        this.config = config;
-        this.http = http;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
-        this.coupons = coupons;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.errorHandler = inject(EsolveErrorHandlerService);
+        this.responseHandler = inject(EsolveResponseHandlerService);
+        this.coupons = inject(EsolveCouponsService);
+        this.vouchers = inject(EsolveVouchersService);
         this._cached_tracking = 0;
     }
     /**
@@ -3391,12 +3628,17 @@ class EsolveCartService {
      * @returns An `Observable` with an object containing cart totals
      */
     getTotals(type) {
-        return this.http
-            .get(`${this.config.api_url}/get-cart-totals.php`, {
-            params: {
+        let params = new HttpParams({
+            fromObject: {
                 type: type ?? '',
             },
-        })
+        });
+        const vouchers = this.vouchers.getAppliedVoucherKeys();
+        if (vouchers.length > 0) {
+            params = params.set('vouchers', vouchers.join(','));
+        }
+        return this.http
+            .get(`${this.config.api_url}/get-cart-totals.php`, { params })
             .pipe(map$1((response) => {
             if (response.records === undefined ||
                 Array.isArray(response.records)) {
@@ -3472,6 +3714,10 @@ class EsolveCartService {
                 throw tracking;
             }
             body.tracking = tracking;
+            const voucher_keys = this.vouchers.getAppliedVoucherKeys();
+            if (voucher_keys.length > 0) {
+                body.vouchers = voucher_keys;
+            }
             return this.http
                 .post(`${this.config.api_url}/set-checkout.php`, body, {
                 headers: {
@@ -3511,18 +3757,18 @@ class EsolveCartService {
      * @returns Processed cart totals
      */
     processCartTotals(record) {
-        const cart_totals = new EsolveCartTotals(+record.records, +record.items, +record.total, +record.vat, +record.discount);
+        const cart_totals = new EsolveCartTotals(+record.records, +record.items, +record.total, +record.vat, +record.discount, +record.vouchers);
         return cart_totals;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCartService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }, { token: EsolveCouponsService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCartService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCartService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCartService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveCartService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveCartService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }, { type: EsolveCouponsService }]; } });
+        }] });
 
 class EsolveAccountService {
     get user_id() {
@@ -3534,12 +3780,12 @@ class EsolveAccountService {
             this._user_id = value;
         }
     }
-    constructor(config, http, sessionService, errorHandler, responseHandler) {
-        this.config = config;
-        this.http = http;
-        this.sessionService = sessionService;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.sessionService = inject(EsolveSessionService);
+        this.errorHandler = inject(EsolveErrorHandlerService);
+        this.responseHandler = inject(EsolveResponseHandlerService);
         this._user_id = 0;
         this.sessionService.getSession().subscribe((session) => {
             if (session.token !== '') {
@@ -3918,15 +4164,15 @@ class EsolveAccountService {
             return new EsolveLocationUpdateResult(response);
         })));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAccountService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveSessionService }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAccountService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAccountService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAccountService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveAccountService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveAccountService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveSessionService }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+        }], ctorParameters: function () { return []; } });
 
 class EsolveBanner {
     constructor(id, banner_display_container, identifier, type, title, article, sort_priority, link, images) {
@@ -3977,9 +4223,9 @@ class EsolveBannerImageHotspot {
 }
 
 class EsolveBannerService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves banners records from eSolve instance
@@ -4057,15 +4303,15 @@ class EsolveBannerService {
         }
         return banners;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveBannerService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveBannerService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveBannerService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveBannerService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveBannerService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveBannerService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 // Types
 
@@ -4101,9 +4347,9 @@ class EsolveMenuItem {
 }
 
 class EsolveMenuService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getMenuTree(identifier) {
         return this.http
@@ -4127,15 +4373,15 @@ class EsolveMenuService {
         }
         return menu;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveMenuService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveMenuService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveMenuService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveMenuService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveMenuService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveMenuService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveNewsGroup {
     get image_src() {
@@ -4246,9 +4492,9 @@ class EsolveNewsArticleList {
 }
 
 class EsolveNewsService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getNewsArticle(identifier) {
         const params = new HttpParams({
@@ -4342,15 +4588,15 @@ class EsolveNewsService {
         }
         return params;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveNewsService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveNewsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveNewsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveNewsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveNewsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveNewsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 // Types
 
@@ -4940,9 +5186,9 @@ class EsolveStockImageCollection {
 // Interfaces
 
 class EsolveStockService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves the stock record from the eSolve instance using the code.
@@ -5335,15 +5581,15 @@ class EsolveStockService {
     getStockHistoryRecords(params) {
         return this.http.get(`${this.config.api_url}/get-items-transaction-history.php`, { params });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveStockService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveStockService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveStockService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveStockService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveStockService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveStockService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveSpecialImage {
     constructor(record) {
@@ -5422,9 +5668,9 @@ class EsolveSpecial {
 }
 
 class EsolveSpecialsService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getSpecial(specials_id) {
         const params = new HttpParams({
@@ -5482,15 +5728,15 @@ class EsolveSpecialsService {
     processSpecial(record) {
         return new EsolveSpecial(record);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSpecialsService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSpecialsService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSpecialsService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSpecialsService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSpecialsService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSpecialsService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveBankingDetails {
     constructor(bank_name, account_holder, account, account_type, swift_number, branch_code) {
@@ -5615,11 +5861,11 @@ class EsolveVaultItem {
 }
 
 class EsolvePaymentService {
-    constructor(config, http, errorHandler, responseHandler) {
-        this.config = config;
-        this.http = http;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.errorHandler = inject(EsolveErrorHandlerService);
+        this.responseHandler = inject(EsolveResponseHandlerService);
     }
     /**
      * Retrieves a list of payment methods.
@@ -5823,15 +6069,15 @@ class EsolvePaymentService {
         const year_string = card_data.expiry_year.padStart(4, '0');
         return `${month_string}${year_string}`;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolvePaymentService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolvePaymentService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolvePaymentService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolvePaymentService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolvePaymentService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolvePaymentService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+        }] });
 
 class EsolveShippingTotals {
     constructor(total, vat, savings) {
@@ -5964,9 +6210,9 @@ class EsolveTimeSlotConfig {
 }
 
 class EsolveShippingService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     /**
      * Retrieves a list of shipping methods
@@ -6093,15 +6339,15 @@ class EsolveShippingService {
         const shipping_cost = new EsolveShippingCost(+record.shipping_total, +record.vat_on_shipping, +record.total_saving_on_shipping, +record.insurance_total, +record.vat_on_insurance, +record.total_saving_on_insurance);
         return shipping_cost;
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveShippingService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveShippingService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveShippingService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveShippingService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveShippingService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveShippingService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 class EsolveEnquiryResult extends EsolveResponseResult {
     constructor(response) {
@@ -6112,11 +6358,11 @@ class EsolveEnquiryResult extends EsolveResponseResult {
 }
 
 class EsolveEnquiryService {
-    constructor(config, http, errorHandler, responseHandler) {
-        this.config = config;
-        this.http = http;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.errorHandler = inject(EsolveErrorHandlerService);
+        this.responseHandler = inject(EsolveResponseHandlerService);
     }
     send(form_data) {
         if (!form_data.has('email')) {
@@ -6131,15 +6377,15 @@ class EsolveEnquiryService {
             return this.errorHandler.handleHttpPostError('set-enquiry', errorRes);
         }));
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveEnquiryService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveEnquiryService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveEnquiryService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveEnquiryService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveEnquiryService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveEnquiryService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+        }] });
 
 class EsolveWishlistItem {
     constructor(id, qty, vat_rate, price, price_incl, vat_total, total, total_incl, stock_item) {
@@ -6159,11 +6405,11 @@ class EsolveEmptyWishlistResult extends EsolveResponseResult {
 }
 
 class EsolveWishlistService {
-    constructor(config, http, errorHandler, responseHandler) {
-        this.config = config;
-        this.http = http;
-        this.errorHandler = errorHandler;
-        this.responseHandler = responseHandler;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
+        this.errorHandler = inject(EsolveErrorHandlerService);
+        this.responseHandler = inject(EsolveResponseHandlerService);
     }
     /**
      * Retrieves the current wishlist
@@ -6252,15 +6498,15 @@ class EsolveWishlistService {
     getWishlistRecords(params) {
         return this.http.get(`${this.config.api_url}/get-wishlist.php`, { params });
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveWishlistService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }, { token: EsolveErrorHandlerService }, { token: EsolveResponseHandlerService }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveWishlistService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveWishlistService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveWishlistService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveWishlistService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveWishlistService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }, { type: EsolveErrorHandlerService }, { type: EsolveResponseHandlerService }]; } });
+        }] });
 
 class EsolveSupplier {
     constructor(record) {
@@ -6290,9 +6536,9 @@ class EsolveSupplier {
 }
 
 class EsolveSuppliersService {
-    constructor(config, http) {
-        this.config = config;
-        this.http = http;
+    constructor() {
+        this.config = inject(EsolveConfigService);
+        this.http = inject(HttpClient);
     }
     getSuppliers(options) {
         let params = new HttpParams();
@@ -6326,15 +6572,15 @@ class EsolveSuppliersService {
     processSuppliers(record) {
         return new EsolveSupplier(record);
     }
-    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSuppliersService, deps: [{ token: EsolveConfigService }, { token: i2.HttpClient }], target: i0.ɵɵFactoryTarget.Injectable }); }
-    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSuppliersService, providedIn: 'root' }); }
+    static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSuppliersService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
+    static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSuppliersService, providedIn: 'root' }); }
 }
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImport: i0, type: EsolveSuppliersService, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.8", ngImport: i0, type: EsolveSuppliersService, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
                 }]
-        }], ctorParameters: function () { return [{ type: EsolveConfigService }, { type: i2.HttpClient }]; } });
+        }] });
 
 /*
  * Public API Surface of ng-esolve-connect
@@ -6344,5 +6590,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.1.3", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { ESOLVE_CONNECT_CONFIG, ESOLVE_EURUS_AUTO_LOGIN, EsolveAccountConfirmationResult, EsolveAccountService, EsolveAdditionalStockImage, EsolveAddress, EsolveAddressResult, EsolveAsset, EsolveAssetsService, EsolveAuthInterceptorService, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartStockItem, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveCdnSrcDirective, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveColour, EsolveConfigService, EsolveCookieService, EsolveCoupon, EsolveCouponsService, EsolveDependantItem, EsolveEmptyCartResult, EsolveEmptyWishlistResult, EsolveEnquiryResult, EsolveEnquiryService, EsolveErrorHandlerService, esolveFilterFactory as EsolveFilterFactory, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHttpError, EsolveLinkedAsset, EsolveLinkedStockItem, EsolveList, EsolveLocation, EsolveLocationAddress, EsolveLocationContactInfo, EsolveLocationGEO, EsolveLocationPOBoxAddress, EsolveLocationTradingDay, EsolveLocationTradingTimes, EsolveLocationUpdateResult, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaStockItem, EsolveMenuItem, EsolveMenuService, EsolveMultipleSelectFilter, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangeFilter, EsolveRangesService, EsolveRecipeStockItem, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSeoInfo, EsolveSeoService, EsolveSessionMetadataService, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveShippingTotals, EsolveSingleSelectFilter, EsolveSpecial, EsolveSpecialDates, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStatement, EsolveStatementAgeing, EsolveStatementBalances, EsolveStatementTransaction, EsolveStockBadge, EsolveStockGroup, EsolveStockGroupItem, EsolveStockImage, EsolveStockImageCollection, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, EsolveStockLeadTimes, EsolveStockPrice, EsolveStockService, EsolveSupplier, EsolveSuppliersService, EsolveTag, EsolveTagsService, EsolveTimeSlot, EsolveTimeSlotConfig, EsolveTimeSlotDate, EsolveTimeSlotDays, EsolveTimeSlotTimes, EsolveToggleFilter, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionAnalyticsData, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveTransactionsService, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveUserClientAccount, EsolveUserClientAccountBalances, EsolveVaultItem, EsolveVaultItemResult, EsolveWishlistItem, EsolveWishlistService, NgEsolveConnectModule, esolveHexHash, isEsolveCdnPath, isFtgCdnPath, isLegacyEsolveCdnPath, processEsolveImageSrc, provideEsolveImageLoader, provideNgEsolveConnect };
+export { ESOLVE_CONNECT_CONFIG, ESOLVE_EURUS_AUTO_LOGIN, EsolveAccountConfirmationResult, EsolveAccountService, EsolveAdditionalStockImage, EsolveAddress, EsolveAddressResult, EsolveAsset, EsolveAssetsService, EsolveAuthInterceptorService, EsolveAuthService, EsolveBankingDetails, EsolveBanner, EsolveBannerImage, EsolveBannerImageHotspot, EsolveBannerService, EsolveCartItem, EsolveCartService, EsolveCartStockItem, EsolveCartTotals, EsolveCategoryTreeItem, EsolveCategoryTreeService, EsolveCdnSrcDirective, EsolveChangePasswordResult, EsolveCheckoutResult, EsolveColour, EsolveConfigService, EsolveCookieService, EsolveCoupon, EsolveCouponsService, EsolveDependantItem, EsolveEmptyCartResult, EsolveEmptyWishlistResult, EsolveEnquiryResult, EsolveEnquiryService, EsolveErrorHandlerService, esolveFilterFactory as EsolveFilterFactory, EsolveGeocodeAddressResult, EsolveGeocodeCoordsResult, EsolveGeocodeResult, EsolveGeocoderService, EsolveHttpError, EsolveLinkedAsset, EsolveLinkedStockItem, EsolveList, EsolveLocation, EsolveLocationAddress, EsolveLocationContactInfo, EsolveLocationGEO, EsolveLocationPOBoxAddress, EsolveLocationTradingDay, EsolveLocationTradingTimes, EsolveLocationUpdateResult, EsolveLocationsService, EsolveManufacturer, EsolveManufacturersService, EsolveMediaStockItem, EsolveMenuItem, EsolveMenuService, EsolveMultipleSelectFilter, EsolveNewsArticle, EsolveNewsArticleAuthor, EsolveNewsArticleList, EsolveNewsGroup, EsolveNewsService, EsolvePaymentMethod, EsolvePaymentResult, EsolvePaymentService, EsolveRange, EsolveRangeFilter, EsolveRangesService, EsolveRecipeStockItem, EsolveRegistrationResult, EsolveResetPasswordResult, EsolveResponseHandlerService, EsolveResponseResult, EsolveResult, EsolveSeoInfo, EsolveSeoService, EsolveSessionMetadataService, EsolveSessionService, EsolveShippingCost, EsolveShippingMethod, EsolveShippingService, EsolveShippingTotals, EsolveSingleSelectFilter, EsolveSpecial, EsolveSpecialDates, EsolveSpecialImage, EsolveSpecialImageCollection, EsolveSpecialsService, EsolveStatement, EsolveStatementAgeing, EsolveStatementBalances, EsolveStatementTransaction, EsolveStockBadge, EsolveStockGroup, EsolveStockGroupItem, EsolveStockImage, EsolveStockImageCollection, EsolveStockItem, EsolveStockItemBase, EsolveStockItemList, EsolveStockLeadTimes, EsolveStockPrice, EsolveStockService, EsolveSupplier, EsolveSuppliersService, EsolveTag, EsolveTagsService, EsolveTimeSlot, EsolveTimeSlotConfig, EsolveTimeSlotDate, EsolveTimeSlotDays, EsolveTimeSlotTimes, EsolveToggleFilter, EsolveTopic, EsolveTopicService, EsolveTransaction, EsolveTransactionAddress, EsolveTransactionAnalyticsData, EsolveTransactionClient, EsolveTransactionItem, EsolveTransactionItemPrice, EsolveTransactionList, EsolveTransactionLocation, EsolveTransactionPaymentMethod, EsolveTransactionShippingMethod, EsolveTransactionUser, EsolveTransactionsService, EsolveUserAccount, EsolveUserAccountBusiness, EsolveUserAccountContact, EsolveUserAccountResult, EsolveUserClientAccount, EsolveUserClientAccountBalances, EsolveVaultItem, EsolveVaultItemResult, EsolveVoucher, EsolveVouchersService, EsolveWishlistItem, EsolveWishlistService, NgEsolveConnectModule, esolveHexHash, isEsolveCdnPath, isFtgCdnPath, isLegacyEsolveCdnPath, processEsolveImageSrc, provideEsolveImageLoader, provideNgEsolveConnect };
 //# sourceMappingURL=esolve-ng-esolve-connect.mjs.map