#464 add missing serializable, change text in top arrows when the eve…

…nt is free
alfio-event · Jul 5, 2018 · 7890a09 · 7890a09
1 parent 720c983
commit 7890a09
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 10 deletions.
diff --git a/src/main/java/alfio/controller/form/PaymentForm.java b/src/main/java/alfio/controller/form/PaymentForm.java
@@ -24,12 +24,13 @@
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.BindingResult;
 
+import java.io.Serializable;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
 @Data
-public class PaymentForm {
+public class PaymentForm implements Serializable {
 
     private String stripeToken;
     private String paypalPaymentId;

diff --git a/src/main/java/alfio/controller/form/WaitingQueueSubscriptionForm.java b/src/main/java/alfio/controller/form/WaitingQueueSubscriptionForm.java
@@ -20,10 +20,11 @@
 import alfio.model.Event;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Locale;
 
 @Data
-public class WaitingQueueSubscriptionForm {
+public class WaitingQueueSubscriptionForm implements Serializable {
     private String fullName;
     private String firstName;
     private String lastName;

diff --git a/src/main/resources/alfio/i18n/public.properties b/src/main/resources/alfio/i18n/public.properties
@@ -282,6 +282,7 @@ email-code.intro=Your code is\: {0}. Please click on "Click here if You have a P
 breadcrumb.step1=Tickets
 breadcrumb.step2=Contact Details
 breadcrumb.step3=Payment
+breadcrumb.step3.free=Overview
 breadcrumb.step4=Thank You
 error.STEP_1_CODE_USED=
 reservation-page-waiting.header.title=Payment required

diff --git a/src/main/resources/alfio/i18n/public_de.properties b/src/main/resources/alfio/i18n/public_de.properties
@@ -365,4 +365,5 @@ reservation-page.invoice-details=[DE]-Invoice details
 reservation-page.if-applicable=[DE]-if applicable
 error.emptyField=[DE]-This field is required
 error.tooLong=[DE]-The value is too long
-reservation-page.skipVatNr=[DE]-I don''t have a {0} number
+reservation-page.skipVatNr=[DE]-I don''t have a {0} number
+breadcrumb.step3.free=[DE]-Overview
diff --git a/src/main/resources/alfio/i18n/public_fr.properties b/src/main/resources/alfio/i18n/public_fr.properties
@@ -375,4 +375,5 @@ reservation-page.invoice-details=[FR]-Invoice details
 reservation-page.if-applicable=[FR]-if applicable
 error.emptyField=[FR]-This field is required
 error.tooLong=[FR]-The value is too long
-reservation-page.skipVatNr=[FR]-I don''t have a {0} number
+reservation-page.skipVatNr=[FR]-I don''t have a {0} number
+breadcrumb.step3.free=[FR]-Overview
diff --git a/src/main/resources/alfio/i18n/public_it.properties b/src/main/resources/alfio/i18n/public_it.properties
@@ -360,4 +360,5 @@ reservation-page.invoice-details=[IT]-Invoice details
 reservation-page.if-applicable=[IT]-if applicable
 error.emptyField=[IT]-This field is required
 error.tooLong=[IT]-The value is too long
-reservation-page.skipVatNr=[IT]-I don''t have a {0} number
+reservation-page.skipVatNr=[IT]-I don''t have a {0} number
+breadcrumb.step3.free=[IT]-Overview
diff --git a/src/main/resources/alfio/i18n/public_nl.properties b/src/main/resources/alfio/i18n/public_nl.properties
@@ -369,4 +369,5 @@ reservation-page.invoice-details=[NL]-Invoice details
 reservation-page.if-applicable=[NL]-if applicable
 error.emptyField=[NL]-This field is required
 error.tooLong=[NL]-The value is too long
-reservation-page.skipVatNr=[NL]-I don''t have a {0} number
+reservation-page.skipVatNr=[NL]-I don''t have a {0} number
+breadcrumb.step3.free=[NL]-Overview
diff --git a/src/main/webapp/WEB-INF/templates/event/overview.ms b/src/main/webapp/WEB-INF/templates/event/overview.ms
@@ -33,7 +33,7 @@
 <div class="wizard wMarginBottom wMarginTop center">
     <a><span class="badge">1</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step1{{/i18n}}</span></a>
     <a><span class="badge">2</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step2{{/i18n}}</span></a>
-    <a class="current"><span class="badge badge-inverse">3</span> {{#i18n}}breadcrumb.step3{{/i18n}}</a>
+    <a class="current"><span class="badge badge-inverse">3</span> {{#i18n}}breadcrumb.step3{{#event.free}}.free{{/event.free}}{{/i18n}}</a>
     <a><span class="badge">4</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step4{{/i18n}}</span></a>
 </div>
 

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
@@ -6,7 +6,7 @@
 <div class="wizard wMarginBottom wMarginTop center">
     <a><span class="badge">1</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step1{{/i18n}}</span></a>
     <a><span class="badge">2</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step2{{/i18n}}</span></a>
-    <a><span class="badge">3</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step3{{/i18n}}</span></a>
+    <a><span class="badge">3</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step3{{#event.free}}.free{{/event.free}}{{/i18n}}</span></a>
     <a class="current"><span class="badge badge-inverse">4</span> {{#i18n}}breadcrumb.step4{{/i18n}}</a>
 </div>
 {{/ticketsAreAllAssigned}}

diff --git a/src/main/webapp/WEB-INF/templates/event/reservation-page.ms b/src/main/webapp/WEB-INF/templates/event/reservation-page.ms
@@ -11,7 +11,7 @@
 <div class="wizard wMarginBottom wMarginTop center">
     <a><span class="badge">1</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step1{{/i18n}}</span></a>
     <a class="current"><span class="badge badge-inverse">2</span> {{#i18n}}breadcrumb.step2{{/i18n}}</a>
-    <a><span class="badge">3</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step3{{/i18n}}</span></a>
+    <a><span class="badge">3</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step3{{#event.free}}.free{{/event.free}}{{/i18n}}</span></a>
     <a><span class="badge">4</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step4{{/i18n}}</span></a>
 </div>
 

diff --git a/src/main/webapp/WEB-INF/templates/event/show-event.ms b/src/main/webapp/WEB-INF/templates/event/show-event.ms
@@ -22,7 +22,7 @@
 <div class="wizard wMarginBottom wMarginTop center">
     <a class="current"><span class="badge badge-inverse">1</span> {{#i18n}}breadcrumb.step1{{/i18n}}</a>
     <a><span class="badge">2</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step2{{/i18n}}</span></a>
-    <a><span class="badge">3</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step3{{/i18n}}</span></a>
+    <a><span class="badge">3</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step3{{#event.free}}.free{{/event.free}}{{/i18n}}</span></a>
     <a><span class="badge">4</span> <span class="hidden-xs">{{#i18n}}breadcrumb.step4{{/i18n}}</span></a>
 </div>