Updated all base email templates (#39)

Most notable changes:
- emails going to clients have much less info fields
- template contents are now closer to each other contentwise

.gitignore

@@ -2,3 +2,4 @@ node_modules
 build/**/*.html
 .idea/
 !build/*/.gitkeep
+/.vscode

pages/monitori/en/en-reservation_created.html

@@ -3,9 +3,11 @@
 <p>Reservation details:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>

pages/monitori/en/en-reservation_created_by_official.html

@@ -3,9 +3,11 @@
 <p>Reservation details:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>

pages/monitori/en/en-reservation_modified.html

@@ -3,9 +3,11 @@
 <p>Updated reservation details:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>

pages/monitori/en/en-reservation_modified_by_official.html

@@ -3,9 +3,11 @@
 <p>Updated reservation details:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>

pages/monitori/fi/fi-reservation_created.html

@@ -3,9 +3,11 @@
 <p>Tässä varauksesi tiedot:</p>
 <hr />
 <p>Palvelu: {{ resource }}</p>
+<p>Aika: {{ time_range_alt  }}</p>
 <p>Toimipiste: {{ unit }}</p>
-<p>Alkaa: {{ begin }}</p>
-<p>Loppuu: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Osoite: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Varaajan nimi: {{ reserver_name }}</p>
 <p>Varaajan sähköposti: {{ reserver_email_address }}</p>

pages/monitori/fi/fi-reservation_created_by_official.html

@@ -3,9 +3,11 @@
 <p>Tässä varauksesi tiedot:</p>
 <hr />
 <p>Palvelu: {{ resource }}</p>
+<p>Aika: {{ time_range_alt  }}</p>
 <p>Toimipiste: {{ unit }}</p>
-<p>Alkaa: {{ begin }}</p>
-<p>Loppuu: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Osoite: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Varaajan nimi: {{ reserver_name }}</p>
 <p>Varaajan sähköposti: {{ reserver_email_address }}</p>

pages/monitori/fi/fi-reservation_modified.html

@@ -2,9 +2,11 @@
 <p>Olet muokannut varaustasi. Tässä varauksen uudet tiedot:</p>
 <hr />
 <p>Palvelu: {{ resource }}</p>
+<p>Aika: {{ time_range_alt  }}</p>
 <p>Toimipiste: {{ unit }}</p>
-<p>Alkaa: {{ begin }}</p>
-<p>Loppuu: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Osoite: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Varaajan nimi: {{ reserver_name }}</p>
 <p>Varaajan sähköposti: {{ reserver_email_address }}</p>

pages/monitori/fi/fi-reservation_modified_by_official.html

@@ -3,9 +3,11 @@
 <p>Tässä varauksen uudet tiedot:</p>
 <hr />
 <p>Palvelu: {{ resource }}</p>
+<p>Aika: {{ time_range_alt  }}</p>
 <p>Toimipiste: {{ unit }}</p>
-<p>Alkaa: {{ begin }}</p>
-<p>Loppuu: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Osoite: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Varaajan nimi: {{ reserver_name }}</p>
 <p>Varaajan sähköposti: {{ reserver_email_address }}</p>

pages/monitori/sv/sv-reservation_created.html

@@ -3,9 +3,11 @@
 <p>Här är bokningsuppgifterna:</p>
 <hr />
 <p>Utrymme: {{ resource }}</p>
+<p>Tid: {{ time_range_alt  }}</p>
 <p>Plats: {{ unit }}</p>
-<p>Börjar: {{ begin }}</p>
-<p>Slutar: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Adress: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Bokarens namn: {{ reserver_name }}</p>
 <p>Bokarens e-post: {{ reserver_email_address }}</p>

pages/monitori/sv/sv-reservation_created_by_official.html

@@ -3,9 +3,11 @@
 <p>Här är information om bokningen:</p>
 <hr />
 <p>Utrymme: {{ resource }}</p>
+<p>Tid: {{ time_range_alt  }}</p>
 <p>Plats: {{ unit }}</p>
-<p>Börjar: {{ begin }}</p>
-<p>Slutar: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Adress: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Bokarens namn: {{ reserver_name }}</p>
 <p>Bokarens e-post: {{ reserver_email_address }}</p>

pages/monitori/sv/sv-reservation_modified.html

@@ -3,9 +3,11 @@
 <p>Här är uppdaterade bokningsuppgifterna:</p>
 <hr />
 <p>Utrymme: {{ resource }}</p>
+<p>Tid: {{ time_range_alt  }}</p>
 <p>Plats: {{ unit }}</p>
-<p>Börjar: {{ begin }}</p>
-<p>Slutar: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Adress: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Bokarens namn: {{ reserver_name }}</p>
 <p>Bokarens e-post: {{ reserver_email_address }}</p>

pages/monitori/sv/sv-reservation_modified_by_official.html

@@ -3,9 +3,11 @@
 <p>Här är bokningens uppdaterade information:</p>
 <hr />
 <p>Utrymme: {{ resource }}</p>
+<p>Tid: {{ time_range_alt  }}</p>
 <p>Plats: {{ unit }}</p>
-<p>Börjar: {{ begin }}</p>
-<p>Slutar: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Adress: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Bokarens namn: {{ reserver_name }}</p>
 <p>Bokarens e-post: {{ reserver_email_address }}</p>

pages/varaamo/en/en-recurring_reservation_created.html

@@ -16,14 +16,12 @@
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>
-{% if event_subject is defined and event_subject %}
-    <p>Name of reservation: {{ event_subject }}</p>
+{% if reserver_phone_number is defined and reserver_phone_number %}
+<p>Reserver phone number: {{ reserver_phone_number }}</p>
 {% endif %}
-{% if event_description is defined and event_description %}
-    <p>Reservation description: {{ event_description }}</p>
-{% endif %}
-{% if number_of_participants is defined %}
-    <p>Number of participants: {{ number_of_participants }}</p>
+{% if universal_data is defined and universal_data %}
+<!--inject:universal-field:html-->
+<!-- endinject -->
 {% endif %}
 {% if unit_map_service_id is defined %}
 {% set linkUrl = '<--map_url-->' + unit_map_service_id|string + '#' %}

pages/varaamo/en/en-reservation_cancelled.html

@@ -3,26 +3,23 @@
 <p>You have cancelled the following reservation:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>
 {% if reserver_phone_number is defined and reserver_phone_number %}
 <p>Reserver phone number: {{ reserver_phone_number }}</p>
 {% endif %}
-{% if event_subject is defined and event_subject %}
-    <p>Name of reservation: {{ event_subject }}</p>
-{% endif %}
-{% if event_description is defined and event_description %}
-    <p>Reservation description: {{ event_description }}</p>
-{% endif %}
-{% if number_of_participants is defined %}
-    <p>Number of participants: {{ number_of_participants }}</p>
-{% endif %}
 {% if universal_data is defined and universal_data %}
 <!--inject:universal-field:html-->
 <!-- endinject -->
 {% endif %}
+{% if unit_map_service_id is defined %}
+{% set linkUrl = '<--map_url-->' + unit_map_service_id|string + '#' %}
+<a href="{{ linkUrl }}">Show location on the servicemap</a>
+{% endif %}
 <p>Best regards, Varaamo</p>

pages/varaamo/en/en-reservation_cancelled_by_official.html

@@ -1,25 +1,18 @@
 <p>Hello,</p>
-<p>We have cancelled the following reservation for you:</p>
+<p>The service personnel has cancelled the following reservation:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>
 {% if reserver_phone_number is defined and reserver_phone_number %}
 <p>Reserver phone number: {{ reserver_phone_number }}</p>
 {% endif %}
-{% if event_subject is defined and event_subject %}
-    <p>Name of reservation: {{ event_subject }}</p>
-{% endif %}
-{% if event_description is defined and event_description %}
-    <p>Reservation description: {{ event_description }}</p>
-{% endif %}
-{% if number_of_participants is defined %}
-    <p>Number of participants: {{ number_of_participants }}</p>
-{% endif %}
 {% if universal_data is defined and universal_data %}
 <!--inject:universal-field:html-->
 <!-- endinject -->

pages/varaamo/en/en-reservation_cancelled_official.html

@@ -2,9 +2,11 @@
 <p>A customer has cancelled the following reservation:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>
@@ -13,23 +15,17 @@
 {% else %}
 <p>Reserver phone number: --</p>
 {% endif %}
-{% if home_municipality_id is defined and home_municipality_id %}
-<p>Reserver home municipality: {{ home_municipality_id }}</p>
-{% endif %}
 {% if event_subject is defined and event_subject %}
-    <p>Name of reservation: {{ event_subject }}</p>
+<p>Name of reservation: {{ event_subject }}</p>
 {% endif %}
 {% if event_description is defined and event_description %}
-    <p>Reservation description: {{ event_description }}</p>
+<p>Reservation description: {{ event_description }}</p>
 {% endif %}
 {% if number_of_participants is defined %}
-    <p>Number of participants: {{ number_of_participants }}</p>
+<p>Number of participants: {{ number_of_participants }}</p>
 {% endif %}
 {% if universal_data is defined and universal_data %}
 <!--inject:universal-field:html-->
 <!-- endinject -->
 {% endif %}
-{% if extra_content is defined and extra_content %}
-{{ extra_content }}
-{% endif %}
 <p>Best regards, Varaamo</p>

pages/varaamo/en/en-reservation_confirmed.html

@@ -1,15 +1,17 @@
 <p>Hello,</p>
-<p>Your reservation has been confirmed.</p>
+<p>Your reservation has been approved.</p>
 {% if order is defined %}
 {% if order.payment_method == 'cash' %}
 <p>The reservation payment will be done on-site.</p>
 {% endif%}
 {% endif %}
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 {% if universal_data is defined and universal_data %}
 <!--inject:universal-field:html-->
 <!-- endinject -->

pages/varaamo/en/en-reservation_created.html

@@ -3,31 +3,24 @@
 <p>Reservation details:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>
 {% if reserver_phone_number is defined and reserver_phone_number %}
 <p>Reserver phone number: {{ reserver_phone_number }}</p>
 {% endif %}
-{% if event_subject is defined and event_subject %}
-    <p>Name of reservation: {{ event_subject }}</p>
-{% endif %}
-{% if event_description is defined and event_description %}
-    <p>Reservation description: {{ event_description }}</p>
-{% endif %}
-{% if number_of_participants is defined %}
-    <p>Number of participants: {{ number_of_participants }}</p>
-{% endif %}
 {% if universal_data is defined and universal_data %}
 <!--inject:universal-field:html-->
 <!-- endinject -->
 {% endif %}
 {% if unit_map_service_id is defined %}
 {% set linkUrl = '<--map_url-->' + unit_map_service_id|string + '#' %}
-    <a href="{{ linkUrl }}">Show location on the servicemap</a>
+<a href="{{ linkUrl }}">Show location on the servicemap</a>
 {% endif %}
 {% if order is defined %}
 <hr />

pages/varaamo/en/en-reservation_created_by_official.html

@@ -1,26 +1,19 @@
 <p>Hello,</p>
-<p>We have made a reservation for you.</p>
+<p>A reservation has been made for you.</p>
 <p>Reservation details:</p>
 <hr />
 <p>Resource: {{ resource }}</p>
+<p>Time: {{ time_range_alt  }}</p>
 <p>Unit: {{ unit }}</p>
-<p>Start: {{ begin }}</p>
-<p>End: {{ end }}</p>
+{% if not takes_place_virtually and unit_address is defined %}
+<p>Address: {{ unit_address }}</p>
+{% endif %}
 <p></p>
 <p>Reserver name: {{ reserver_name }}</p>
 <p>Reserver email: {{ reserver_email_address }}</p>
 {% if reserver_phone_number is defined and reserver_phone_number %}
 <p>Reserver phone number: {{ reserver_phone_number }}</p>
 {% endif %}
-{% if event_subject is defined and event_subject %}
-    <p>Name of reservation: {{ event_subject }}</p>
-{% endif %}
-{% if event_description is defined and event_description %}
-    <p>Reservation description: {{ event_description }}</p>
-{% endif %}
-{% if number_of_participants is defined %}
-    <p>Number of participants: {{ number_of_participants }}</p>
-{% endif %}
 {% if universal_data is defined and universal_data %}
 <!--inject:universal-field:html-->
 <!-- endinject -->