Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Scan pay back 7 - clean #4171

Open
wants to merge 109 commits into
base: master-qa
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
09614ad
Scan and pay first look
Nov 2, 2022
5209794
scan and pay first look
Nov 2, 2022
3e994a8
commit to merge
Nov 7, 2022
3eb3266
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Nov 7, 2022
b6eb4bd
Merge branch 'master-qa' into scan-pay-back
cabch Nov 10, 2022
f8b6e89
send email with verify button
cabch Nov 10, 2022
de3aeae
need to clear interfaces
cabch Nov 10, 2022
7148c86
commented send email dev env
cabch Nov 10, 2022
b8affcc
capture method payment
Nov 14, 2022
62814e8
comments to complete the flow
cabch Nov 15, 2022
9c289f5
Merge branch 'master-qa' into scan-pay-back
cabch Nov 15, 2022
463bfa1
scan pay create user + email working + createpaymentintent
cabch Nov 16, 2022
b42e04c
separate setupPaymentMethod from setupPaymentIntent
Nov 16, 2022
3652f34
create virtual tag when scan-pay
Nov 17, 2022
2c0ca16
start transaction scan pay
Nov 18, 2022
0391ce7
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Nov 18, 2022
fb4f54c
- changed scanAndPay to scanPay
cabch Nov 21, 2022
e801b14
handle tag error
cabch Nov 22, 2022
cef54ac
Merge branch 'master-qa' into scan-pay-back
cabch Nov 22, 2022
2d5652a
added connector id and charging station id for testing purpose
cabch Nov 22, 2022
2568c9a
renamed capture as we don't capture for the moment
cabch Nov 22, 2022
37e5219
cleaned capture -> retrieve
cabch Nov 22, 2022
83be255
required fields en trop
cabch Nov 23, 2022
8ec1456
added new role external in auth def
cabch Nov 24, 2022
03f0378
forgot to push external role in athorizations ...
cabch Nov 25, 2022
53d7b9a
Save payment intent Id in transaction
Nov 26, 2022
ea1994e
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Nov 26, 2022
8b2e9ed
first try on stopping transaction
cabch Dec 2, 2022
0687949
Merge branch 'master-qa' into scan-pay-back
cabch Dec 2, 2022
d702f34
modified connector id -> transactionId
cabch Dec 5, 2022
4f8553e
bypass the default payment method while scan and pay
Dec 6, 2022
8c9a2fe
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Dec 6, 2022
5994169
capture payment
Dec 6, 2022
5e15656
finalize invoice after capture
Dec 8, 2022
fc41cde
Merge branch 'master-qa' into scan-pay-back
cabch Dec 13, 2022
da675ff
Merge branch 'master-qa' into scan-pay-back
cabch Dec 21, 2022
6ff91af
Add payment intent ID to invoice's metadata
Jan 5, 2023
515768f
Mark invoice as paid with the out of band parameter
Jan 5, 2023
42adc6b
Merge branch 'master-qa' into scan-pay-back
cabch Jan 9, 2023
3c2a7f6
Save user Eula in scan and pay
Jan 9, 2023
f9763c7
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Jan 11, 2023
7905499
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Jan 13, 2023
c1aefa1
Hash user data in url scan pay
Jan 13, 2023
c4fb88a
modifs send start email
cabch Jan 17, 2023
b4d5b2d
stop transaction beta
Jan 17, 2023
b15f584
dé Hash user data in url scan pay
cabch Jan 17, 2023
7107986
re qdded user in get trqnsqction
cabch Jan 18, 2023
c22350b
it misses the verify body in validateBillingScanPayReq
cabch Jan 26, 2023
6baa51f
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Jan 27, 2023
c20b33b
save verification token
Jan 30, 2023
a79e325
added uuid to email address to avoid duplicates and easy the double c…
cabch Jan 30, 2023
a7d9b03
hash password
Jan 31, 2023
b92eae0
fixed sending email with + sign
cabch Jan 31, 2023
53360ac
handled password hashed
cabch Feb 1, 2023
95329c9
tried to handle stop transaction WIP
cabch Feb 1, 2023
09e9c78
changed capture amount to 100 euros
cabch Feb 2, 2023
3702a60
Merge branch 'master-qa' into scan-pay-back
cabch Feb 2, 2023
bd666ef
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Feb 9, 2023
6cf9b50
Save password for external users
Feb 9, 2023
5d36612
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Feb 13, 2023
8600a2f
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Feb 15, 2023
f0e0c21
secure get stripe facede
Feb 15, 2023
e003ab5
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Feb 16, 2023
7eac7cf
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Feb 20, 2023
71457fd
secure scan pay endpoint
Feb 20, 2023
3c3b409
secure scan pay endpoints
Feb 22, 2023
5d040a7
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Feb 22, 2023
d5f451f
capture the maximum amount in case of exeeding
Feb 23, 2023
ce09f1a
change i18n for end of session
cabch Mar 7, 2023
ac91bc3
update submodule
Mar 7, 2023
b025fda
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Mar 7, 2023
0e378f7
split payment options depending on capturing or not
cabch Mar 7, 2023
ace57c7
Customize emails for scan pay
Mar 8, 2023
2de7d79
i18n alignment
cabch Mar 9, 2023
b96b8f7
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Mar 9, 2023
d1a63d2
fixed endofsession notif url
cabch Mar 13, 2023
e4ee58b
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back
Mar 20, 2023
c465112
added scan pay component
cabch Mar 20, 2023
c4ffd72
settings scan pay hold amount in billing settings
cabch Mar 21, 2023
6386764
Generate Qr code for scan pay
Mar 21, 2023
f96a6bb
added scanpayamount linked to the ui
cabch Mar 22, 2023
109ade2
trying re merged master-qa into scan pay copy
cabch Mar 31, 2023
45c1f96
added separate scan pay setting
cabch Mar 31, 2023
957f706
code review part 1
cabch Apr 3, 2023
f44d841
check connector availability
cabch Apr 4, 2023
4021cd6
Merge branch 'master-qa' into scan-pay-back-7
cabch Apr 4, 2023
d9b0d05
french missing
cabch Apr 4, 2023
39abd18
checkStripePaymentMethod condition to tell we are in scan pay mode
cabch Apr 4, 2023
0b9bbf5
updated scan_pay server actions
cabch Apr 4, 2023
8f7cd31
usernotification forgot comment
cabch Apr 4, 2023
0bc5757
subdomain not needed anymore + BL + comments
cabch Apr 4, 2023
e2e87ef
Remove irrelevant modifiations
Apr 13, 2023
f84a779
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back-7
Apr 13, 2023
db51d8b
Merge branch 'master-qa' into scan-pay-back-7
cabch Apr 17, 2023
d6d4a68
forgot locale from front
cabch Apr 18, 2023
c7d6687
changed the email template for unpaid scan pay invoices
cabch Apr 19, 2023
a73133f
Merge branch 'master-qa' into scan-pay-back-7
cabch Apr 19, 2023
cd547ae
replace wait with void
Apr 19, 2023
0e460c3
simplify checkStripePaymentMethod
Apr 20, 2023
183aac4
added currency from pricing setting
cabch Apr 20, 2023
f4c7779
fixed the validator as it has never been touched from the beginning w…
cabch Apr 20, 2023
c00443d
fixed useless siteAreaID param and others in validators ...
cabch Apr 21, 2023
3bb9333
Merge branch 'master-qa' into scan-pay-back-7
cabch Apr 21, 2023
f1d4478
fix scan pay qr code
Apr 21, 2023
9881f94
fixed invoice download
cabch Apr 21, 2023
07c667a
paymentMethodId -> paymentMethodID + deleted useless old stuff
cabch Apr 24, 2023
0a2a671
forgot commented return
cabch Apr 24, 2023
4f69415
Merge branch 'master-qa' into scan-pay-back-7
cabch Apr 27, 2023
4f8a86b
Merge remote-tracking branch 'origin/master-qa' into scan-pay-back-7
May 14, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions src/assets/i18n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Billing - New Invoice",
"buttonText": "Pay Invoice",
"text": [
"Please follow the link below to finalize the payment.",
"",
"The invoice {{invoiceNumber}} has been generated. You can download the corresponding document following the link below once paid"
],
"table": [
{
"label": "Amount Due",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Charging Station Connected",
"buttonText": "View Charging Station",
Expand Down Expand Up @@ -400,6 +415,15 @@
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}."
]
},
"scan-pay-session-started": {
"title": "Session Started",
"buttonText": "Stop Session",
"text": [
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}.",
"",
"Click on the link below to stop the transaction"
]
},
"verification-email": {
"title": "User Account Activation",
"buttonText": "Activate your Account",
Expand Down Expand Up @@ -530,6 +554,13 @@
"An administrator will soon check and activate your account."
]
},
"scan-pay-account-verification-notification": {
"title": "Verify your email and proceed to charging",
"buttonText": "Proceed to charging",
"text": [
"Click on the link below to verify your email and proceed to charging."
]
},
"admin-account-verification-notification": {
"title": "User Account Verification",
"buttonText": "Verify Account",
Expand Down
31 changes: 31 additions & 0 deletions src/assets/i18n/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Billing - New Invoice",
"buttonText": "Pay Invoice",
"text": [
"Please follow the link below to finalize the payment.",
"",
"The invoice {{invoiceNumber}} has been generated. You can download the corresponding document following the link below once paid"
],
"table": [
{
"label": "Amount Due",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Ladestation Verbunden",
"buttonText": "Ladestation anzeigen",
Expand Down Expand Up @@ -400,6 +415,15 @@
"Ihr Fahrzeug wurde mit der Ladestation {{chargeBoxID}} an Ladepunkt {{connectorId}} verbunden."
]
},
"scan-pay-session-started": {
"title": "Session Started",
"buttonText": "Stop Session",
"text": [
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}.",
"",
"Click on the link below to stop the transaction"
]
},
"verification-email": {
"title": "Benutzerkonto Aktivieren",
"buttonText": "Aktivieren Sie Ihr Benutzerkonto",
Expand Down Expand Up @@ -530,6 +554,13 @@
"Ein Administrator wird Ihr Benutzerkonto prüfen und es aktivieren."
]
},
"scan-pay-account-verification-notification": {
"title": "Verify your email and proceed to charging",
"buttonText": "Proceed to charging",
"text": [
"Click on the link below to verify your email and proceed to charging."
]
},
"admin-account-verification-notification": {
"title": "Benutzerkonto - Verifizierung",
"buttonText": "Benutzerkonto verifizieren",
Expand Down
31 changes: 31 additions & 0 deletions src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Billing - New Invoice",
"buttonText": "Pay Invoice",
"text": [
"Please follow the link below to finalize the payment.",
"",
"The invoice {{invoiceNumber}} has been generated. You can download the corresponding document following the link below once paid"
],
"table": [
{
"label": "Amount Due",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Charging Station Connected",
"buttonText": "View Charging Station",
Expand Down Expand Up @@ -400,6 +415,15 @@
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}."
]
},
"scan-pay-session-started": {
"title": "Session Started",
"buttonText": "Stop Session",
"text": [
"Your vehicle connected to the charging station {{chargeBoxID}} on connector {{connectorId}} is now charging.",
"",
"Click on the link below to stop the transaction"
]
},
"verification-email": {
"title": "User Account Activation",
"buttonText": "Activate your Account",
Expand Down Expand Up @@ -530,6 +554,13 @@
"An administrator will soon check and activate your account."
]
},
"scan-pay-account-verification-notification": {
"title": "Verify your email and proceed to charging",
"buttonText": "Proceed to charging",
"text": [
"Click on the link below to verify your email and proceed to charging."
]
},
"admin-account-verification-notification": {
"title": "User Account Verification",
"buttonText": "Verify Account",
Expand Down
31 changes: 31 additions & 0 deletions src/assets/i18n/es.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Billing - New Invoice",
"buttonText": "Pay Invoice",
"text": [
"Please follow the link below to finalize the payment.",
"",
"The invoice {{invoiceNumber}} has been generated. You can download the corresponding document following the link below once paid"
],
"table": [
{
"label": "Amount Due",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Estación de carga conectada",
"buttonText": "Vista de la estación de carga",
Expand Down Expand Up @@ -400,6 +415,15 @@
"Su vehículo ha sido conectado a la estación de carga {{chargeBoxID}} en el conector {{connectorId}}."
]
},
"scan-pay-session-started": {
"title": "Session Started",
"buttonText": "Stop Session",
"text": [
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}.",
"",
"Click on the link below to stop the transaction"
]
},
"verification-email": {
"title": "Activación de su cuenta de usuario",
"buttonText": "Activar cuenta de usuario",
Expand Down Expand Up @@ -530,6 +554,13 @@
"Un administrador verificará y activará su cuenta."
]
},
"scan-pay-account-verification-notification": {
"title": "Verify your email and proceed to charging",
"buttonText": "Proceed to charging",
"text": [
"Click on the link below to verify your email and proceed to charging."
]
},
"admin-account-verification-notification": {
"title": "Verificación de una nueva cuenta de usuario",
"buttonText": "Verificar la cuenta",
Expand Down
31 changes: 31 additions & 0 deletions src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Facturation - Nouvelle facture émise",
"buttonText": "Payer la facture",
"text": [
"Veuillez suivre le lien ci-dessous pour finaliser le paiement.",
"",
"La facture numéro {{invoiceNumber}} a été émise et le document correspondant peut être téléchargé en suivant le lien ci-dessous après paiement."
],
"table": [
{
"label": "Montant dû",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Borne connectée",
"buttonText": "Voir la borne",
Expand Down Expand Up @@ -400,6 +415,15 @@
"Votre véhicule est connecté sur le connecteur {{connectorId}} de la borne {{chargeBoxID}}."
]
},
"scan-pay-session-started": {
"title": "Session démarrée",
"buttonText": "Stopper la session",
"text": [
"Votre véhicule est connecté sur le connecteur {{connectorId}} de la borne {{chargeBoxID}}.",
"",
"Veuillez suivre le lien ci-dessous pour stopper la session."
]
},
"verification-email": {
"title": "Activation de votre compte utilisateur",
"buttonText": "Activer le compte",
Expand Down Expand Up @@ -530,6 +554,13 @@
"Votre compte va être activé par un administrateur. Merci de patienter."
]
},
"scan-pay-account-verification-notification": {
"title": "Vérifier votre compte et procéder au chargement",
"buttonText": "Procéder au chargement",
"text": [
"Veuillez suivre le lien ci-dessous pour vérifier votre e-mail et procéder au chargement."
]
},
"admin-account-verification-notification": {
"title": "Vérification d'un nouveau compte utilisateur",
"buttonText": "Vérifier le compte",
Expand Down
43 changes: 43 additions & 0 deletions src/assets/i18n/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@
{
"label": "Livello di carica della batteria",
"value": "{{stateOfCharge}} %"
},
{
"label": "Battery Level",
"value": "{{stateOfCharge}} %"
}
]
},
Expand All @@ -234,6 +238,10 @@
"La sessione sulla stazione di ricarica {{chargeBoxID}}, presa {{connectorId}} é appena terminata."
],
"table": [
{
"label": "Session",
"value": "{{transactionId}}"
},
{
"label": "Consumo",
"value": "{{totalConsumption}} kW.h"
Expand Down Expand Up @@ -278,6 +286,10 @@
"Il veicolo, connesso alla stazione di ricarica {{chargeBoxID}}, presa {{connectorId}}, ha appena finito la ricarica."
],
"table": [
{
"label": "Session",
"value": "{{transactionId}}"
},
{
"label": "Consumo",
"value": "{{totalConsumption}} kW.h"
Expand Down Expand Up @@ -320,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Billing - New Invoice",
"buttonText": "Pay Invoice",
"text": [
"Please follow the link below to finalize the payment.",
"",
"The invoice {{invoiceNumber}} has been generated. You can download the corresponding document following the link below once paid"
],
"table": [
{
"label": "Amount Due",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Stazione di Ricarica Connessa",
"buttonText": "Visualizzare la stazione di ricarica",
Expand Down Expand Up @@ -388,6 +415,15 @@
"Il veicolo é stato connesso alla stazione di ricarica {{chargeBoxID}} sulla presa {{connectorId}}."
]
},
"scan-pay-session-started": {
"title": "Session Started",
"buttonText": "Stop Session",
"text": [
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}.",
"",
"Click on the link below to stop the transaction"
]
},
"verification-email": {
"title": "Attivazione dell'account",
"buttonText": "Attivare l'account",
Expand Down Expand Up @@ -518,6 +554,13 @@
"Un amministratore procederà alla validazione e all'attivazione dell'account."
]
},
"scan-pay-account-verification-notification": {
"title": "Verify your email and proceed to charging",
"buttonText": "Proceed to charging",
"text": [
"Click on the link below to verify your email and proceed to charging."
]
},
"admin-account-verification-notification": {
"title": "Verifica dell'account",
"buttonText": "Verifica account",
Expand Down
31 changes: 31 additions & 0 deletions src/assets/i18n/pt.json
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,21 @@
}
]
},
"billing-new-invoice-unpaid-scan-pay": {
"title": "Billing - New Invoice",
"buttonText": "Pay Invoice",
"text": [
"Please follow the link below to finalize the payment.",
"",
"The invoice {{invoiceNumber}} has been generated. You can download the corresponding document following the link below once paid"
],
"table": [
{
"label": "Amount Due",
"value": "{{invoiceAmount}}"
}
]
},
"charging-station-registered": {
"title": "Charging Station Connected",
"buttonText": "View Charging Station",
Expand Down Expand Up @@ -400,6 +415,15 @@
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}."
]
},
"scan-pay-session-started": {
"title": "Session Started",
"buttonText": "Stop Session",
"text": [
"Your vehicle has been connected to the charging station {{chargeBoxID}} on connector {{connectorId}}.",
"",
"Click on the link below to stop the transaction"
]
},
"verification-email": {
"title": "User Account Activation",
"buttonText": "Activate your Account",
Expand Down Expand Up @@ -530,6 +554,13 @@
"An administrator will soon check and activate your account."
]
},
"scan-pay-account-verification-notification": {
"title": "Verify your email and proceed to charging",
"buttonText": "Proceed to charging",
"text": [
"Click on the link below to verify your email and proceed to charging."
]
},
"admin-account-verification-notification": {
"title": "User Account Verification",
"buttonText": "Verify Account",
Expand Down
Loading