Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Commit

Permalink
Merge pull request #2705 from sap-labs-france/master-qa
Browse files Browse the repository at this point in the history
Merge master-qa
  • Loading branch information
LucasBrazi06 authored Jul 29, 2021
2 parents 6ac340b + 936b28b commit 49c8995
Show file tree
Hide file tree
Showing 111 changed files with 2,485 additions and 1,093 deletions.
2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ev-server",
"version": "2.4.79",
"version": "2.4.80",
"engines": {
"node": "14.x.x",
"npm": "6.x.x"
Expand Down
2 changes: 1 addition & 1 deletion src/assets/configs-aws
37 changes: 37 additions & 0 deletions src/assets/server/notification/email/de/user-create-password.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- subdomain %> organisation.",
"Click on the link bellow to create your password.",
"<strong>You will have to log in at least once to this organisation to be able to charge your car.</strong>"
],
"actions": [{
"title": "Create your password",
"url": "<%- evseDashboardCreatePasswordURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- tenantName %> organisation.",
"",
"Click on the link below to complete the activation."
],
"actions": [{
"title": "Activate your Account",
"url": "<%- evseDashboardVerifyEmailURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}

37 changes: 37 additions & 0 deletions src/assets/server/notification/email/en/user-create-password.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- tenantName %> organisation.",
"Click on the link bellow to create your password.",
"<strong>You will have to log in at least once to this organisation to be able to charge your car.</strong>"
],
"actions": [{
"title": "Create your password",
"url": "<%- evseDashboardCreatePasswordURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- tenantName %> organisation.",
"",
"Click on the link below to complete the activation."
],
"actions": [{
"title": "Activate your Account",
"url": "<%- evseDashboardVerifyEmailURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}

37 changes: 37 additions & 0 deletions src/assets/server/notification/email/es/user-create-password.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- subdomain %> organisation.",
"Click on the link bellow to create your password.",
"<strong>You will have to log in at least once to this organisation to be able to charge your car.</strong>"
],
"actions": [{
"title": "Create your password",
"url": "<%- evseDashboardCreatePasswordURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- tenantName %> organisation.",
"",
"Click on the link below to complete the activation."
],
"actions": [{
"title": "Activate your Account",
"url": "<%- evseDashboardVerifyEmailURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"url": "<%- evseDashboardURL %>"
}],
"afterActionLines": [
"Best Regards,",
"Cordialement,",
"EV Admins."
],
"footer": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"url": "<%- evseUserToVerifyURL %>"
}],
"afterActionLines": [
"Best Regards,",
"Cordialement,",
"EV Admins."
],
"footer": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"url": "<%- evseDashboardURL %>"
},
"afterActionLines": [
"Best Regards,",
"Cordialement,",
"EV Admins."
],
"footer": {
Expand Down
37 changes: 37 additions & 0 deletions src/assets/server/notification/email/fr/user-create-password.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"subject": "Nouveau compte créé",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "Nouveau compte créé",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Bonjour <%- (user.firstName?user.firstName:user.name) %>,",
"",
"Un compte a été créé en votre nom sur l'organisation <%- subdomain %>.",
"Cliquez sur le lien ci-dessous pour créer un mot de passe.",
"<strong>Vous devrez vous connecter au moins une fois sur cette organisation pour pouvoir charger votre voiture.</strong>"
],
"actions": [{
"title": "Créer votre mot de passe",
"url": "<%- evseDashboardCreatePasswordURL %>"
}],
"afterActionLines": [
"Cordialement,",
"EV Admins."
],
"footer": {
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"subject": "Nouveau compte créé",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "Nouveau compte créé",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Bonjour <%- (user.firstName?user.firstName:user.name) %>,",
"",
"Un compte a été créé en votre nom sur l'organisation <%- subdomain %>.",
"Cliquez sur le lien ci-dessous pour compléter l'activation."
],
"actions": [{
"title": "Activez votre Compte",
"url": "<%- evseDashboardVerifyEmailURL %>"
}],
"afterActionLines": [
"Cordialement,",
"EV Admins."
],
"footer": {
}
}
}

37 changes: 37 additions & 0 deletions src/assets/server/notification/email/it/user-create-password.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
{
"subject": "New account created",
"tenant": "",
"baseURL": "<%- evseDashboardURL %>",
"body": {
"header": {
"title": "New account created",
"image": {
"left": {
"height": 60,
"url": "<%- tenantLogoURL %>"
},
"right": {
"height": 50,
"url": "<%- evseDashboardURL %>/assets/img/info.png"
}
}
},
"beforeActionLines": [
"Hi <%- (user.firstName?user.firstName:user.name) %>,",
"",
"An account has just been created on your behalf in <%- subdomain %> organisation.",
"Click on the link bellow to create your password.",
"<strong>You will have to log in at least once to this organisation to be able to charge your car.</strong>"
],
"actions": [{
"title": "Create your password",
"url": "<%- evseDashboardCreatePasswordURL %>"
}],
"afterActionLines": [
"Best Regards,",
"EV Admins."
],
"footer": {
}
}
}
Loading

0 comments on commit 49c8995

Please sign in to comment.