From a6524de2df648b9c2afcdb98d39cdc001bdc3519 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Fri, 21 May 2021 18:58:13 +0200 Subject: [PATCH] Prepare changelog for the 2.4.67-rc1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérôme Benoit --- src/app/release-notes/release-notes.component.ts | 12 ++++++++++-- src/app/services/central-server.service.ts | 2 +- src/app/services/config.service.ts | 2 +- src/app/services/locale.service.ts | 2 +- src/app/services/message.service.ts | 3 ++- src/app/services/stripe.service.ts | 4 ++-- src/assets/configs-aws | 2 +- 7 files changed, 18 insertions(+), 9 deletions(-) diff --git a/src/app/release-notes/release-notes.component.ts b/src/app/release-notes/release-notes.component.ts index fa3b5e64e4..4063ff325f 100644 --- a/src/app/release-notes/release-notes.component.ts +++ b/src/app/release-notes/release-notes.component.ts @@ -27,12 +27,20 @@ export class ReleaseNotesComponent { this.releaseNotes = [ { version: packageJsonVersion, - date: new Date('2021-05-20'), + date: new Date('2021-05-21'), componentChanges: [ { name: 'Dashboard', changes: [ - `Add a visual ID field to badge`, + `Various fixes to the billing dashboard UI`, + `Add billing invoices detailed description support`, + `Add assets information refresh interval support`, + `Add notification support for billing payment failure`, + `Fix badge ID support to search filter`, + `Fix consumption computation from MeterValues Current.Import measurand`, + `Fix organizations read permission for admin role with also site admin role`, + `Allow site admin role to view transaction badge ID if done on their site`, + `Add a visual ID field to badge record`, `Fix badges CSV import/export`, `Fix user site assignment`, `Server side german translation update`, diff --git a/src/app/services/central-server.service.ts b/src/app/services/central-server.service.ts index 32cc13a222..f6146deb6a 100644 --- a/src/app/services/central-server.service.ts +++ b/src/app/services/central-server.service.ts @@ -7,7 +7,6 @@ import { StatusCodes } from 'http-status-codes'; import { BehaviorSubject, EMPTY, Observable, TimeoutError, of, throwError } from 'rxjs'; import { catchError, switchMap } from 'rxjs/operators'; import SafeUrlAssembler from 'safe-url-assembler'; -import { OicpEndpoint } from 'types/oicp/OICPEndpoint'; import { Asset, AssetConsumption } from '../types/Asset'; import { BillingInvoice, BillingPaymentMethod, BillingTax } from '../types/Billing'; @@ -24,6 +23,7 @@ import { AssetInError, ChargingStationInError, TransactionInError } from '../typ import { Log } from '../types/Log'; import { OcpiEndpoint } from '../types/ocpi/OCPIEndpoint'; import { OCPPResetType } from '../types/ocpp/OCPP'; +import { OicpEndpoint } from '../types/oicp/OICPEndpoint'; import { RefundReport } from '../types/Refund'; import { RegistrationToken } from '../types/RegistrationToken'; import { ServerAction, ServerRoute } from '../types/Server'; diff --git a/src/app/services/config.service.ts b/src/app/services/config.service.ts index a5b9691b07..97eadfdd28 100644 --- a/src/app/services/config.service.ts +++ b/src/app/services/config.service.ts @@ -1,6 +1,5 @@ import { HttpClient } from '@angular/common/http'; import { Injectable } from '@angular/core'; -import Landscape, { LandscapeType } from 'types/configuration/Landscape'; import AdvancedConfiguration from '../types/configuration/AdvancedConfiguration'; import AssetConfiguration from '../types/configuration/AssetConfiguration'; @@ -11,6 +10,7 @@ import CompanyConfiguration from '../types/configuration/CompanyConfiguration'; import { Configuration } from '../types/configuration/Configuration'; import Debug from '../types/configuration/Debug'; import FrontEndConfiguration from '../types/configuration/FrontEndConfiguration'; +import Landscape, { LandscapeType } from '../types/configuration/Landscape'; import LocalesConfiguration from '../types/configuration/LocalesConfiguration'; import SiteAreaConfiguration from '../types/configuration/SiteAreaConfiguration'; import SiteConfiguration from '../types/configuration/SiteConfiguration'; diff --git a/src/app/services/locale.service.ts b/src/app/services/locale.service.ts index 98b2033a2d..5b74e2ac37 100644 --- a/src/app/services/locale.service.ts +++ b/src/app/services/locale.service.ts @@ -1,10 +1,10 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { BehaviorSubject } from 'rxjs'; -import { Utils } from 'utils/Utils'; import { KeyValue } from '../types/GlobalType'; import { UserToken } from '../types/User'; +import { Utils } from '../utils/Utils'; import { CentralServerService } from './central-server.service'; import { ConfigService } from './config.service'; diff --git a/src/app/services/message.service.ts b/src/app/services/message.service.ts index 68032b8369..1c344442ec 100644 --- a/src/app/services/message.service.ts +++ b/src/app/services/message.service.ts @@ -1,6 +1,7 @@ import { Injectable } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { ActionsResponse } from 'types/DataResult'; + +import { ActionsResponse } from '../types/DataResult'; declare let $: any; diff --git a/src/app/services/stripe.service.ts b/src/app/services/stripe.service.ts index a600e0604d..30dac497ca 100644 --- a/src/app/services/stripe.service.ts +++ b/src/app/services/stripe.service.ts @@ -25,9 +25,9 @@ export class StripeService { } public async initializeStripe(): Promise { - if ( !StripeService.stripeFacade ) { + if (!StripeService.stripeFacade) { const billingSettings = await this.loadBillingConfiguration(); - if ( billingSettings?.stripe?.publicKey ) { + if (billingSettings?.stripe?.publicKey) { loadStripe.setLoadParameters({ advancedFraudSignals: false }); StripeService.stripeFacade = await loadStripe(billingSettings.stripe.publicKey); } diff --git a/src/assets/configs-aws b/src/assets/configs-aws index b399d5c07e..cce8c74bf9 160000 --- a/src/assets/configs-aws +++ b/src/assets/configs-aws @@ -1 +1 @@ -Subproject commit b399d5c07e9ce7c2d8f90407b869c156995dd56e +Subproject commit cce8c74bf9373c920ff2a2a132fc2db84d88d8ff