Skip to content

Commit

Permalink
#573 initial ui work
Browse files Browse the repository at this point in the history
  • Loading branch information
syjer committed Dec 31, 2018
1 parent 32f9088 commit bd971a8
Show file tree
Hide file tree
Showing 8 changed files with 73 additions and 6 deletions.
3 changes: 2 additions & 1 deletion src/main/java/alfio/controller/ReservationController.java
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,8 @@ public String showBookingPage(@PathVariable("eventName") String eventName,
.addAttribute("vatNrIsLinked", orderSummary.isVatExempt() || contactAndTicketsForm.getHasVatCountryCode())
.addAttribute("attendeeAutocompleteEnabled", ticketsInReservation.size() == 1 && configurationManager.getBooleanConfigValue(partialConfig.apply(ENABLE_ATTENDEE_AUTOCOMPLETE), true))
.addAttribute("billingAddressLabel", invoiceAllowed ? "reservation-page.billing-address" : "reservation-page.receipt-address")
.addAttribute("customerReferenceEnabled", configurationManager.getBooleanConfigValue(partialConfig.apply(ENABLE_CUSTOMER_REFERENCE), false));
.addAttribute("customerReferenceEnabled", configurationManager.getBooleanConfigValue(partialConfig.apply(ENABLE_CUSTOMER_REFERENCE), false))
.addAttribute("enabledItalyEInvoicing", configurationManager.getBooleanConfigValue(partialConfig.apply(ENABLE_ITALY_E_INVOICING), false));

Map<String, Object> modelMap = model.asMap();
modelMap.putIfAbsent("paymentForm", contactAndTicketsForm);
Expand Down
6 changes: 6 additions & 0 deletions src/main/resources/alfio/i18n/public.properties
Original file line number Diff line number Diff line change
Expand Up @@ -383,3 +383,9 @@ error.tooLong=The value is too long
reservation-page.skipVatNr=I don''t have a {0} number
common.required-fields=Required Fields
error.STEP2_DISCOUNT_CODE_USAGE_EXCEEDED=Too many tickets acquired for the given code

invoice-fields.fiscalCode=Fiscal Code
invoice-fields.i-have=I have
invoice-fields.addressee-code=Addressee code
invoice-fields.pec=PEC
invoice.fields.neither=Neither
7 changes: 6 additions & 1 deletion src/main/resources/alfio/i18n/public_de.properties
Original file line number Diff line number Diff line change
Expand Up @@ -370,4 +370,9 @@ breadcrumb.step3.free=\u00DCberblick
error.STEP2_WHITELIST=Einige Emailadressen sind nicht g\u00FCltig. Bitte pr\u00FCfen Sie die Eingabe.
error.STEP_2_WHITELIST_CHECK_FAILED=Die \u00DCberpr\u00FCfung der Emailadresse ist fehlgeschlagen wegen Beschr\u00E4nkungen.
common.required-fields=Erforderliche Angaben
reservation-page-waiting.invoice-will-be-sent=[DE] The invoice will be sent separately
reservation-page-waiting.invoice-will-be-sent=[DE] The invoice will be sent separately

invoice-fields.fiscalCode=[DE] Fiscal Code
invoice-fields.i-have=[DE] I have
invoice-fields.addressee-code=[DE] Addressee code
invoice.fields.neither=[DE] Neither
6 changes: 5 additions & 1 deletion src/main/resources/alfio/i18n/public_fr.properties
Original file line number Diff line number Diff line change
Expand Up @@ -380,4 +380,8 @@ breadcrumb.step3.free=R\u00E9sum\u00E9
error.STEP2_WHITELIST=Une ou plusieurs adresses e-mail ne sont pas valides ou d\u00E9ja r\u00E9serv\u00E9es pour cet \u00E9v\u00E9nement
error.STEP_2_WHITELIST_CHECK_FAILED=Impossible d''obtenir un ticket avec cette adresse e-mail (acc\u00E8s limit\u00E9)
common.required-fields=Champs obligatoires
reservation-page-waiting.invoice-will-be-sent=[FR] The invoice will be sent separately
reservation-page-waiting.invoice-will-be-sent=[FR] The invoice will be sent separately
invoice-fields.fiscalCode=[FR] Fiscal Code
invoice-fields.i-have=[FR] I have
invoice-fields.addressee-code=[FR] Addressee code
invoice.fields.neither=[FR] Neither
7 changes: 6 additions & 1 deletion src/main/resources/alfio/i18n/public_it.properties
Original file line number Diff line number Diff line change
Expand Up @@ -365,4 +365,9 @@ error.tooLong=La lunghezza del valore immesso supera il massimo consentito
reservation-page.skipVatNr=Non ho un numero {0}
breadcrumb.step3.free=Sommario
common.required-fields=Campi obbligatori
reservation-page-waiting.invoice-will-be-sent=[IT] The invoice will be sent separately
reservation-page-waiting.invoice-will-be-sent=[IT] The invoice will be sent separately

invoice-fields.fiscalCode=Codice fiscale
invoice-fields.i-have=Ho un
invoice-fields.addressee-code=Codice destinatario
invoice.fields.neither=Nessuno dei due
6 changes: 5 additions & 1 deletion src/main/resources/alfio/i18n/public_nl.properties
Original file line number Diff line number Diff line change
Expand Up @@ -355,4 +355,8 @@ error.STEP2_WHITELIST=Een of meerdere emails zijn al gebruikt of zijn niet toege
error.STEP_2_WHITELIST_CHECK_FAILED=Kan geen ticket toewijzen aan het opgegeven email. Toegang is beperkt.
common.required-fields=Verplichte velden
error.STEP2_DISCOUNT_CODE_USAGE_EXCEEDED=Te veel tickets geselecteerd voor deze kortingscode
reservation-page-waiting.invoice-will-be-sent=[NL] The invoice will be sent separately
reservation-page-waiting.invoice-will-be-sent=[NL] The invoice will be sent separately
invoice-fields.fiscalCode=[NL] Fiscal Code
invoice-fields.i-have=[NL] I have
invoice-fields.addressee-code=[NL] Addressee code
invoice.fields.neither=[NL] Neither
38 changes: 37 additions & 1 deletion src/main/webapp/WEB-INF/templates/event/invoice-fields.ms
Original file line number Diff line number Diff line change
Expand Up @@ -88,4 +88,40 @@
</div>
</div>
</div>
</div>
</div>
{{#enabledItalyEInvoicing}}
<div class="row">
<div>
<div class="col-md-12">
<div class="form-group {{#field-has-error}}[italyEInvoicingFiscalCode] has-error{{/field-has-error}}">
<label for="italyEInvoicingFiscalCode">{{#i18n}}invoice-fields.fiscalCode{{/i18n}}</label>
<input id="italyEInvoicingFiscalCode" type="text" name="italyEInvoicingFiscalCode" class="form-control">
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label for="">
{{#i18n}}invoice-fields.i-have{{/i18n}}
</label>
</div>
</div>
<div class="col-md-12">
<div class="form-group {{#field-has-error}}[italyEInvoicingReferenceAddresseeCode] has-error{{/field-has-error}}">
<label><input type="radio" name="italyEInvoicingReferenceType"><span class="label-after-radio">{{#i18n}}invoice-fields.addressee-code{{/i18n}}</span></label>
<input type="text" class="form-control" name="italyEInvoicingReferenceAddresseeCode">
</div>
</div>
<div class="col-md-12">
<div class="form-group {{#field-has-error}}[italyEInvoicingReferencePEC] has-error{{/field-has-error}}">
<label><input type="radio" name="italyEInvoicingReferenceType"><span class="label-after-radio">{{#i18n}}invoice-fields.pec{{/i18n}}</span></label>
<input type="text" class="form-control" name="italyEInvoicingReferencePEC">
</div>
</div>
<div class="col-md-12">
<div class="form-group">
<label><input type="radio" name="italyEInvoicingReferenceType"><span class="label-after-radio">{{#i18n}}invoice.fields.neither{{/i18n}}</span></label>
</div>
</div>
</div>
</div>
{{/enabledItalyEInvoicing}}
6 changes: 6 additions & 0 deletions src/main/webapp/resources/css/application.css
Original file line number Diff line number Diff line change
Expand Up @@ -199,6 +199,12 @@ html[lang=it] .alfio-lang a[lang=it] {
font-weight:normal;
}

.label-after-radio {
padding-left: 6px;
position: relative;
bottom: 2px;
}

.show-event.g-recaptcha, .overview.g-recaptcha {
text-align:center;
}
Expand Down

0 comments on commit bd971a8

Please sign in to comment.