restore 'resend email' functionality

alfio-event · Nov 9, 2014 · 1c87438 · 1c87438
1 parent cc7a2a7
commit 1c87438
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/src/main/resources/io/bagarino/i18n/application.properties b/src/main/resources/io/bagarino/i18n/application.properties
@@ -74,7 +74,7 @@ reservation-page-error-status.your-reservation-identifier=Your reservation ident
 
 #reservation-page-complete.ms
 reservation-page-complete.header.title=Your ticket(s) for {0}
-reservation-page-complete.your-tickets=Your ticket(s) for {0}
+reservation-page-complete.your-tickets=Your tickets
 reservation-page-complete.assign-your-tickets=Assign your tickets
 reservation-page-complete.assign=Assign
 reservation-page-complete.update=Update
@@ -84,6 +84,7 @@ reservation-page-complete.resend-reservation-email=Resend reservation email
 reservation-page-complete.send-ticket-by-email-to=Send by email
 reservation-page-complete.info-update=You can update the owner of a ticket: a new email will be sent, the previously sent ticket will be invalidated.
 reservation-page-complete.info-assign=Your reservation for the event {0} <strong>has been completed</strong>. In order to view and download your tickets, please assign them.
+reservation-page-complete.info-assign-email=An email has already been sent to <strong>{0}</strong>. Didn''t you receive any message? Please check your ''spam'' folder and if nothing found click on the following button to send it again
 reservation-page-complete.show-ticket=View
 reservation-page-complete.update-ticket-owner=Update owner
 reservation-page-complete.assigned-to=Assigned to <strong>{0}</strong> &lt;{1}&gt;

diff --git a/src/main/resources/io/bagarino/i18n/application_it.properties b/src/main/resources/io/bagarino/i18n/application_it.properties
@@ -64,7 +64,7 @@ reservation-page-error-status.contact-text=Ti preghiamo di contattare l''organiz
 reservation-page-error-status.your-reservation-identifier=L''identificativo della tua prenotazione \u00E8: {0}
 
 #reservation-page-complete.ms
-reservation-page-complete.your-tickets=I tuoi biglietti per {0}
+reservation-page-complete.your-tickets=I tuoi biglietti
 reservation-page-complete.assign-your-tickets=Assegna i tuoi biglietti
 reservation-page-complete.assign=Assegna
 reservation-page-complete.update=Modifica
@@ -176,3 +176,4 @@ show-ticket.header.title=Il tuo biglietto per {0}
 breadcrumb.step1=Seleziona
 breadcrumb.step2=Prenota
 breadcrumb.step3=Assegna e scarica
+reservation-page-complete.info-assign-email=\u00C8 gi\u00E0 stata spedita un''email all''indirizzo <strong>{0}</strong>. Se non l''hai ricevuta\: hai gi\u00E0 controllato la cartella ''posta indesiderata''? Clicca sul  bottone sottostante per inviarla nuovamente
diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page-complete.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page-complete.ms
@@ -7,13 +7,15 @@
 </div>
 
 {{^ticketsAreAllAssigned}}
-<ol class="breadcrumb wMarginBottom wMarginTop">
+<ol class="breadcrumb wMarginTop">
     <li class="active">{{#i18n}}breadcrumb.step1{{/i18n}}</li>
     <li class="active">{{#i18n}}breadcrumb.step2{{/i18n}}</li>
     <li><i class="fa fa-download"></i> {{#i18n}}breadcrumb.step3{{/i18n}}</li>
 </ol>
 {{/ticketsAreAllAssigned}}
 
+<div class="wMarginBottom"></div>
+
 <h1>
 	{{#ticketsAreAllAssigned}}
 		{{#i18n}}reservation-page-complete.your-tickets [{{event.shortName}}]{{/i18n}} 
@@ -41,7 +43,26 @@
 {{/ticketsAreAllAssigned}}
 
 {{^ticketsAreAllAssigned}}
-<p class="alert alert-success">{{#i18n}}reservation-page-complete.info-assign [{{event.shortName}}]{{/i18n}}</p>
+<div class="alert alert-success">
+	<div class="row">
+		<div class="col-sm-12">
+			{{#i18n}}reservation-page-complete.info-assign [{{event.shortName}}]{{/i18n}}
+		</div>
+	</div>
+    <div class="row">
+        <div class="col-sm-12">
+			{{#i18n}}reservation-page-complete.info-assign-email [{{reservation.email}}]{{/i18n}}
+        </div>
+    </div>
+	<div class="row">
+		<div class="col-sm-4 col-sm-offset-8">
+		<form action="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/re-send-email" method="post" class="form-inline">
+			<button type="submit" class="btn btn-default">{{#i18n}}reservation-page-complete.resend-reservation-email{{/i18n}}</button>
+			<input type="hidden" name="{{_csrf.parameterName}}" value="{{_csrf.token}}">
+		</form>
+		</div>
+	</div>
+</div>
 {{/ticketsAreAllAssigned}}
 
 <ul class="list-group">