From c6c10574a1df998d087d05d7be8ceac05e7ac8c7 Mon Sep 17 00:00:00 2001 From: Michael Schertenleib Date: Tue, 5 Feb 2019 01:24:44 +0100 Subject: [PATCH] add message "thankYouWaitingList" (#23) --- .../list/category/event/confirmation.js | 2 +- .../list/category/event/confirmation.hbs | 20 ++++++++++++------- public/locale/de-CH.js | 1 + public/locale/fr-CH.js | 1 + 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/app/routes/list/category/event/confirmation.js b/app/routes/list/category/event/confirmation.js index bc3b82ed..fe24866e 100644 --- a/app/routes/list/category/event/confirmation.js +++ b/app/routes/list/category/event/confirmation.js @@ -41,7 +41,7 @@ export default Route.extend({ return postSubscription(subscriptionData); }).then(() => { - return tableData; + return { tableData: tableData, statusIsRed: event.get('status') === 'red' }; }).catch(error => { if (error instanceof Error) { console.error(error); // eslint-disable-line no-console diff --git a/app/templates/list/category/event/confirmation.hbs b/app/templates/list/category/event/confirmation.hbs index 4e809176..0b17c367 100644 --- a/app/templates/list/category/event/confirmation.hbs +++ b/app/templates/list/category/event/confirmation.hbs @@ -6,18 +6,24 @@ {{translate "confirmation"}} -

{{translate "thankYou"}}

+

+ {{#if model.statusIsRed}} + {{translate "thankYouWaitingList"}} + {{else}} + {{translate "thankYou"}} + {{/if}} +

{{translate "youWillReceiveAConfirmationEMail"}}

{{translate "officeAddress"}}

-{{#if model.fields}} +{{#if model.tableData.fields}}

{{translate "yourDetails"}}

{{translate "addressFields"}}

- {{#each model.fields as |field|}} + {{#each model.tableData.fields as |field|}} @@ -26,10 +32,10 @@
{{{field.label}}} {{field.value}}
{{/if}} -{{#if model.companyFields}} +{{#if model.tableData.companyFields}}

{{translate "companyFields"}}

- {{#each model.companyFields as |companyField|}} + {{#each model.tableData.companyFields as |companyField|}} @@ -38,10 +44,10 @@
{{{companyField.label}}} {{companyField.value}}
{{/if}} -{{#if model.subscriptionDetailFields}} +{{#if model.tableData.subscriptionDetailFields}}

{{translate "subscriptionDetailFields"}}

- {{#each model.subscriptionDetailFields as |subscriptionDetailField|}} + {{#each model.tableData.subscriptionDetailFields as |subscriptionDetailField|}} diff --git a/public/locale/de-CH.js b/public/locale/de-CH.js index ab46176e..711dfb23 100644 --- a/public/locale/de-CH.js +++ b/public/locale/de-CH.js @@ -24,6 +24,7 @@ window.kursausschreibung.locale["de-CH"] = { "back": "zurück", "backToCourses": "Zurück zur Kursübersicht", "thankYou": "Besten Dank für Ihre Anmeldung", + "thankYouWaitingList": "Besten Dank für Ihre Anmeldung auf die Warteliste", "youWillReceiveAConfirmationEMail": "Sie erhalten eine Anmeldebestätigung per E-Mail.", "officeAddress": "Kurssekretariat
Telefon 031 123 45 67
info@kurssekretariat.ch", "yourDetails": "Ihre Angaben", diff --git a/public/locale/fr-CH.js b/public/locale/fr-CH.js index 09a1c2f7..3976f171 100644 --- a/public/locale/fr-CH.js +++ b/public/locale/fr-CH.js @@ -22,6 +22,7 @@ window.kursausschreibung.locale["fr-CH"] = { "back": "Retour", "backToCourses": "Retour", "thankYou": "Merci pour votre inscription", + "thankYouWaitingList": "Merci pour votre inscription", "youWillReceiveAConfirmationEMail": "Vous recevrez une confirmation d'inscription par e-mail.", "officeAddress": "Secrétariat du cours
Phone 031 123 45 67 67
info@kurssekretariat.ch", "yourDetails": "Vos coordonnées.",
{{{subscriptionDetailField.label}}} {{subscriptionDetailField.value}}