From 24a048b1d4e92f862ec52dc3e20a4e0971b21f0f Mon Sep 17 00:00:00 2001 From: vincent Date: Tue, 8 Mar 2022 12:16:43 +0100 Subject: [PATCH 1/9] Fix cookies modal's size --- .../src/stylesheets/modules/cookies.scss | 29 ++++++++++++------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/app/frontend/src/stylesheets/modules/cookies.scss b/app/frontend/src/stylesheets/modules/cookies.scss index 039bf2c60..eb386d59c 100644 --- a/app/frontend/src/stylesheets/modules/cookies.scss +++ b/app/frontend/src/stylesheets/modules/cookies.scss @@ -1,25 +1,28 @@ .cookies-consent { display: flex; position: fixed; - bottom: 3rem; - left: 3rem; - width: 40rem; + right: 0; + bottom: 0; + left: 0; background-color: #f5f5f5; padding: 3rem; flex-direction: column; z-index: 100; - -webkit-box-shadow: 0 4px 10px 2px rgba(224, 224, 224, 0.43); - -moz-box-shadow: 0 4px 10px 2px rgba(224, 224, 224, 0.43); - box-shadow: 0 4px 10px 2px rgba(224, 224, 224, 0.43); + -webkit-box-shadow: 0 4px 10px 2px rgba(0, 0, 0, 0.25); + -moz-box-shadow: 0 4px 10px 2px rgba(0, 0, 0, 0.25); + box-shadow: 0 4px 10px 2px rgba(0, 0, 0, 0.25); .cookies-actions { + flex-wrap: wrap; display: flex; - height: 45px; - + justify-content: space-between; + gap: 1rem; + margin-top: 1rem; + button { - flex-basis: 50%; + @extend .fab-button; + flex: 1; } - button.decline { background-color: transparent; border: 0; @@ -31,4 +34,10 @@ font-size: 17px; } } + + @media (min-width: 480px) { + bottom: 3rem; + left: 3rem; + width: 40rem; + } } From 60f2e9c53398eb6fb7372e8a46ec679c532a15b0 Mon Sep 17 00:00:00 2001 From: Nicolas Florentin Date: Tue, 8 Mar 2022 14:23:55 +0100 Subject: [PATCH 2/9] improves notify_admin_payment_schedule_failed and notify_member_payment_schedule_failed email texts --- config/locales/mails.en.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.en.yml b/config/locales/mails.en.yml index 149f681d5..92cf1b735 100644 --- a/config/locales/mails.en.yml +++ b/config/locales/mails.en.yml @@ -313,13 +313,13 @@ en: body: remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." error: "Unfortunately, this card debit was unable to complete successfully." - action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After about 24 hours, the card subscription will be cancelled." + action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." notify_member_payment_schedule_failed: subject: "[URGENT] Card debit failure" body: remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." error: "Unfortunately, this card debit was unable to complete successfully." - action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted." + action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." your_dashboard: "your dashboard" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Payment schedule canceled by the payment gateway" From c1651cff6525342dc50b40a918eff79908de200a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:29:35 +0100 Subject: [PATCH 3/9] New translations mails.en.yml (French) --- config/locales/mails.fr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index 3de801a1d..cf302beac 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -313,13 +313,13 @@ fr: body: remember: "Conformément à l'échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}." error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement." - action: "Veuillez vous mettre en relation avec le membre au plus tôt, puis vous rendre dans l'interface de gestion des échéanciers afin de régler le problème. Au delà d'environ 24 heures, l'abonnement par carte bancaire sera annulé." + action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." notify_member_payment_schedule_failed: subject: "[URGENT] Échec du prélèvement par carte" body: remember: "Conformément à votre échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}." error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement." - action_html: "Veuillez vous rendre dans %{DASHBOARD} ou prendre contact avec un gestionnaire sous 24 heures, faute de quoi votre abonnement risque d'être interrompu." + action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." your_dashboard: "votre tableau de bord" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Échéancier de paiement annulé par la passerelle de paiement" From 320468c03f13b3ef233be75c00713f952c5ec125 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:29:36 +0100 Subject: [PATCH 4/9] New translations mails.en.yml (Spanish) --- config/locales/mails.es.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.es.yml b/config/locales/mails.es.yml index f0d05d3f7..f82ec81ac 100644 --- a/config/locales/mails.es.yml +++ b/config/locales/mails.es.yml @@ -313,13 +313,13 @@ es: body: remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." error: "Unfortunately, this card debit was unable to complete successfully." - action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After about 24 hours, the card subscription will be cancelled." + action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." notify_member_payment_schedule_failed: subject: "[URGENT] Card debit failure" body: remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." error: "Unfortunately, this card debit was unable to complete successfully." - action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted." + action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." your_dashboard: "your dashboard" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Payment schedule canceled by the payment gateway" From 7b31ce165b631e936080abffc857068205e9a02a Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:29:37 +0100 Subject: [PATCH 5/9] New translations mails.en.yml (German) --- config/locales/mails.de.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.de.yml b/config/locales/mails.de.yml index 9888ffc2f..b44103d8d 100644 --- a/config/locales/mails.de.yml +++ b/config/locales/mails.de.yml @@ -313,13 +313,13 @@ de: body: remember: "Gemäß dem Zahlungsplan von %{REFERENCE} wurde für %{DATE} eine Belastung der Karte in Höhe von %{AMOUNT} geplant." error: "Leider konnte die Abbuchung über die Karte nicht erfolgreich abgeschlossen werden." - action: "Bitte kontaktieren Sie das Mitglied so bald wie möglich und lösen Sie dann das Problem in der Verwaltung der Zahlungsfristen. Nach etwa 24 Stunden wird das Kartenabonnement storniert." + action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." notify_member_payment_schedule_failed: subject: "[URGENT] Kartenbelastungsfehler" body: remember: "Gemäß Ihrem Zahlungsplan von %{REFERENCE} wurde für %{DATE} eine Belastung der Karte in Höhe von %{AMOUNT} geplant." error: "Leider konnte die Abbuchung über die Karte nicht erfolgreich abgeschlossen werden." - action_html: "Bitte überprüfen Sie %{DASHBOARD} oder kontaktieren Sie einen Manager innerhalb von 24 Stunden. Andernfalls kann Ihr Abonnement unterbrochen werden." + action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." your_dashboard: "Ihr Dashboard" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Zahlungsplan vom Zahlungs-Gateway abgebrochen" From f9c52dd586606bcc40105db3b0f14db25ccff8d2 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:29:38 +0100 Subject: [PATCH 6/9] New translations mails.en.yml (Norwegian) --- config/locales/mails.no.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.no.yml b/config/locales/mails.no.yml index 3685f5538..b02fdc717 100644 --- a/config/locales/mails.no.yml +++ b/config/locales/mails.no.yml @@ -313,13 +313,13 @@ body: remember: "In accordance with the %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." error: "Unfortunately, this card debit was unable to complete successfully." - action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After about 24 hours, the card subscription will be cancelled." + action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." notify_member_payment_schedule_failed: subject: "[URGENT] Card debit failure" body: remember: "In accordance with your %{REFERENCE} payment schedule, a debit by card of %{AMOUNT} was scheduled on %{DATE}." error: "Unfortunately, this card debit was unable to complete successfully." - action_html: "Please check %{DASHBOARD} or contact a manager before 24 hours, otherwise your subscription may be interrupted." + action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." your_dashboard: "your dashboard" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Payment schedule canceled by the payment gateway" From 6a5546d5c7fac8f5f5b91b2cbe08e0479728ced7 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:29:39 +0100 Subject: [PATCH 7/9] New translations mails.en.yml (Portuguese) --- config/locales/mails.pt.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.pt.yml b/config/locales/mails.pt.yml index fcc81dda8..112b236f5 100755 --- a/config/locales/mails.pt.yml +++ b/config/locales/mails.pt.yml @@ -313,13 +313,13 @@ pt: body: remember: "De acordo com o calendário de pagamento de %{REFERENCE}, um débito por cartão de %{AMOUNT} foi agendado em %{DATE}." error: "Infelizmente, não foi possível completar o débito no cartão com sucesso." - action: "Por favor, entre em contato com o membro assim que possível, depois vá à interface de gestão de horários de pagamento para resolver o problema. Após cerca de 24 horas, a assinatura do cartão será cancelada." + action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." notify_member_payment_schedule_failed: subject: "[URGENT] Falha no débito do cartão" body: remember: "De acordo com a sua agenda de pagamentos %{REFERENCE}, um débito por cartão de %{AMOUNT} foi agendado para %{DATE}." error: "Infelizmente, não foi possível completar o débito no cartão com sucesso." - action_html: "Por favor, verifique %{DASHBOARD} ou entre em contato com um gerente antes de 24 horas, caso contrário sua assinatura pode ser interrompida." + action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." your_dashboard: "seu dashboard" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Payment schedule canceled by the payment gateway" From c7bb01b92f78efb2cb58c01fcd95be213b18d999 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:29:40 +0100 Subject: [PATCH 8/9] New translations mails.en.yml (Zulu) --- config/locales/mails.zu.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.zu.yml b/config/locales/mails.zu.yml index d01b5f847..aebe7a467 100644 --- a/config/locales/mails.zu.yml +++ b/config/locales/mails.zu.yml @@ -313,13 +313,13 @@ zu: body: remember: "crwdns21134:0%{REFERENCE}crwdnd21134:0%{AMOUNT}crwdnd21134:0%{DATE}crwdne21134:0" error: "crwdns21136:0crwdne21136:0" - action: "crwdns21138:0crwdne21138:0" + action: "crwdns22400:0crwdne22400:0" notify_member_payment_schedule_failed: subject: "crwdns21140:0[URGENT]crwdne21140:0" body: remember: "crwdns21142:0%{REFERENCE}crwdnd21142:0%{AMOUNT}crwdnd21142:0%{DATE}crwdne21142:0" error: "crwdns21144:0crwdne21144:0" - action_html: "crwdns21146:0%{DASHBOARD}crwdne21146:0" + action_html: "crwdns22402:0%{DASHBOARD}crwdne22402:0" your_dashboard: "crwdns21148:0crwdne21148:0" notify_admin_payment_schedule_gateway_canceled: subject: "crwdns22389:0[URGENT]crwdne22389:0" From a03d54f536bb621bfa2dadc57fc69adf22079427 Mon Sep 17 00:00:00 2001 From: Sylvain Date: Tue, 8 Mar 2022 14:38:34 +0100 Subject: [PATCH 9/9] New translations mails.en.yml (French) --- config/locales/mails.fr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/locales/mails.fr.yml b/config/locales/mails.fr.yml index cf302beac..3611b3d80 100644 --- a/config/locales/mails.fr.yml +++ b/config/locales/mails.fr.yml @@ -313,13 +313,13 @@ fr: body: remember: "Conformément à l'échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}." error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement." - action: "Please contact the member as soon as possible, then go to the payment schedule management interface to resolve the problem. After a certain period of time, the card subscription could be cancelled." + action: "Veuillez vous mettre en relation avec le membre au plus tôt, puis vous rendre dans l'interface de gestion des échéanciers afin de régler le problème. Au delà d'un certain délai, l'abonnement par carte bancaire pourrait être annulé." notify_member_payment_schedule_failed: subject: "[URGENT] Échec du prélèvement par carte" body: remember: "Conformément à votre échéancier de paiement %{REFERENCE}, un prélèvement par carte de %{AMOUNT} était prévu le %{DATE}." error: "Malheureusement, ce prélèvement n'a pas pu être effectué correctement." - action_html: "Please check %{DASHBOARD} or contact a manager quickly, otherwise your subscription may be interrupted." + action_html: "Veuillez vous rendre dans %{DASHBOARD} ou prendre contact avec un gestionnaire rapidement, faute de quoi votre abonnement risque d'être interrompu." your_dashboard: "votre tableau de bord" notify_admin_payment_schedule_gateway_canceled: subject: "[URGENT] Échéancier de paiement annulé par la passerelle de paiement"