all repos — caroster @ 160ca45e1ae4d372f4874247c43d192161bfe346

[Octree] Group carpool to your event https://caroster.io

🚑 Fix ContactTripCreator email notification #565
Tim Izzo tim@octree.ch
Wed, 18 Dec 2024 10:37:49 +0100
commit

160ca45e1ae4d372f4874247c43d192161bfe346

parent

e6df524bf4e90efcb82e2474df6c26952d86b7a4

M backend/src/api/email/locales/en.jsonbackend/src/api/email/locales/en.json

@@ -58,7 +58,7 @@ "content": "## There is something new in your event \"<%= event.name %>\"\n\n⏳ Count of passengers looking for a seat : <%= waitingListCount %>\n🚗 Count of trips : <%= travelsCount %>\n🆕 Count of new trips: <%= newTravelsCount %>\n\nLink to your Caroster: <%= host %>/e/<%= event.uuid %>\n\nYou receive this e-mail because you are the creator of this event."

}, "ContactTripCreator": { "title": "<%= event.name %> - Contact trip driver", - "content": "To organize your journey to [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), please contact the driver of the trip you've registered.\n\n**Trip: <%= vehicleName %>**\nDeparture: <%= travel.meeting %>\nDate/time: <%= datetime %>\nPhone: <%= travel.phone_mumber | 'Not provided' %>\nE-mail: <%= driver.email %>" + "content": "To organize your journey to [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), please contact the driver of the trip you've registered.\n\n**Trip: <%= vehicleName %>**\nDeparture: <%= travel.meeting %>\nDate/time: <%= datetime %>\nPhone: <%= travel.phone_number || 'Not provided' %>\nE-mail: <%= driver.email %>" }, "EnabledCarosterPlus": { "title": "<%= event.name %> - Caroster Plus is now active for your event",
M backend/src/api/email/locales/fr.jsonbackend/src/api/email/locales/fr.json

@@ -58,7 +58,7 @@ "content": "## Il y a du nouveau dans votre Ă©vĂ©nement \"<%= event.name %>\"\n\n⏳ Nombre de passagers en recherche d'une place : <%= waitingListCount %>\n🚗 Nombre de trajets : <%= travelsCount %>\n🆕 Nombre de nouveaux trajets : <%= newTravelsCount %>\n\nLien vers votre Caroster: <%= host %>/e/<%= event.uuid %>\n\nVous recevez cet e-mail car vous ĂȘtes le crĂ©ateur de cet Ă©vĂ©nement."

}, "ContactTripCreator": { "title": "<%= event.name %> - Contacter la conductrice ou le conducteur du trajet", - "content": "Afin d'organiser votre voyage pour [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), merci de contacter la conductrice ou le conducteur du trajet pour lequel vous vous ĂȘtes inscritâž±e.\n\n**Trajet: <%= vehicleName %>**\nDĂ©part: <%= travel.meeting %>\nDate/heure: <%= datetime %>\nTĂ©lĂ©phone: <%= travel.phone_mumber || 'Non prĂ©cisĂ©' %>\nE-mail: <%= driver.email %>" + "content": "Afin d'organiser votre voyage pour [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), merci de contacter la conductrice ou le conducteur du trajet pour lequel vous vous ĂȘtes inscritâž±e.\n\n**Trajet: <%= vehicleName %>**\nDĂ©part: <%= travel.meeting %>\nDate/heure: <%= datetime %>\nTĂ©lĂ©phone: <%= travel.phone_number || 'Non prĂ©cisĂ©' %>\nE-mail: <%= driver.email %>" }, "EnabledCarosterPlus": { "title": "<%= event.name %> - Caroster Plus a Ă©tĂ© activĂ© pour votre Ă©vĂ©nement",
M backend/src/api/email/locales/it.jsonbackend/src/api/email/locales/it.json

@@ -9,7 +9,7 @@ "content": "## Benvenuto/a a Caroster!\nPer favore conferma la registrazione del tuo account cliccando su questo link\n\n[<%= confirmationLink %>](<%= confirmationLink %>)",

"title": "Conferma il tuo indirizzo e-mail" }, "ContactTripCreator": { - "content": "Per raggiungere l'evento [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), contatta il conducente del passaggio al quale ti sei registrato/a\n\n**Passaggio: <%= vehicleName %>**\nPartenza: <%= travel.meeting %>\nData/orario: <%= datetime %>\nTelefono: <%= travel.phone_mumber | 'Non fornito' %>\nE-mail: <%= driver.email %>", + "content": "Per raggiungere l'evento [<%= event.name %>](<%= host %>/e/<%= event.uuid %>), contatta il conducente del passaggio al quale ti sei registrato/a\n\n**Passaggio: <%= vehicleName %>**\nPartenza: <%= travel.meeting %>\nData/orario: <%= datetime %>\nTelefono: <%= travel.phone_number || 'Non fornito' %>\nE-mail: <%= driver.email %>", "title": "<%= event.name %> - Contatta il conducente del passaggio" }, "NewTripAlert": {
M backend/src/api/email/locales/nl.jsonbackend/src/api/email/locales/nl.json

@@ -46,7 +46,7 @@ "content": "## Er hebben wijzigingen plaatsgevonden aan ‘<%= event.name %>’\n\n⏳ Aantal passagiers op wachtlijst: <%= waitingListCount %>\n🚗 Aantal voertuigen: <%= travelsCount %>\n🆕 Aantal nieuwe voertuigen: <%= newTravelsCount %>\n\nLink naar uw Caroster: <%= host %>/e/<%= event.uuid %>\n\nU ontvangt deze e-mail omdat u de afspraak hebt aangemaakt."

}, "ContactTripCreator": { "title": "<%= event.name %> - Contact opnemen met bestuurder", - "content": "Als u de reis naar ‘<%= event.name %>’ wilt organiseren, neem dan contact op met de bestuurder.\n\n**Voertuig: <%= vehicleName %>**\nVertrek: <%= travel.meeting %>\nDatum/Tijd: <%= datetime %>\nTelefoonnummer: <%= travel.phone_mumber | 'Not provided' %>\nE-mailadres: <%= driver.email %>" + "content": "Als u de reis naar ‘<%= event.name %>’ wilt organiseren, neem dan contact op met de bestuurder.\n\n**Voertuig: <%= vehicleName %>**\nVertrek: <%= travel.meeting %>\nDatum/Tijd: <%= datetime %>\nTelefoonnummer: <%= travel.phone_number || 'Not provided' %>\nE-mailadres: <%= driver.email %>" }, "EnabledCarosterPlus": { "title": "<%= event.name %> - Caroster+ is geactiveerd op uw afspraak",
M backend/src/graphql/travel/index.tsbackend/src/graphql/travel/index.ts

@@ -1,5 +1,43 @@

export default [ ({ nexus, strapi }) => ({ + types: [ + nexus.extendType({ + type: "Mutation", + definition(t) { + t.field("createTravel", { + type: "TravelEntityResponse", + args: { + data: nexus.nonNull("TravelInput"), + createVehicle: "Boolean", + }, + }); + }, + }), + ], + resolvers: { + Mutation: { + createTravel: { + async resolve(_root, args, context) { + const { + state: { user }, + } = context; + const createdTravel = await strapi.entityService.create( + "api::travel.travel", + { + data: { + ...args.data, + user: user?.id, + }, + } + ); + return { + value: createdTravel, + info: { args, resourceUID: "api::travel.travel" }, + }; + }, + }, + }, + }, resolversConfig: { "Mutation.createTravel": { auth: false,
M frontend/containers/NewTravelDialog/index.tsxfrontend/containers/NewTravelDialog/index.tsx

@@ -58,15 +58,11 @@ !phoneError &&

phone; const clearState = () => { - setFirstname(''); - setLastname(''); setSeats(4); setMeeting(''); setMeetingLatitude(null); setMeetingLongitude(null); setDate(moment()); - setPhone(''); - setPhoneCountry(''); setDetails(''); };