Skip to content

Commit 94e29c6

Browse files
cbellonecbellone
committed
#219 - update layout
1 parent 5ee2767 commit 94e29c6

File tree

5 files changed

+37
-43
lines changed

5 files changed

+37
-43
lines changed

‎src/main/resources/alfio/i18n/public.properties

+2-2
Original file line numberDiff line numberDiff line change
@@ -225,8 +225,8 @@ invoice.buyer=Buyer:
225225
invoice.billing-address=Billing address:
226226
invoice.date=Invoice date:
227227
invoice.payment-for=Payment for:
228-
invoice.payment-instruction=Payment instruction
229-
invoice.payment-instruction-no-later-than=To complete the transaction, you have to make the payment not later than {0} using the details below.
228+
invoice.payment-instruction=Payment instructions
229+
invoice.payment-instruction-no-later-than=To complete the transaction, you have to make the payment <strong>not later than {0}</strong>.
230230
invoice.account-number=Account number: <strong>{0}</strong>
231231
invoice.payment-to=Payment to:
232232
invoice.payment-reason=With <strong>{0}</strong> as a payment reason.

‎src/main/resources/alfio/i18n/public_de.properties

+7-7
Original file line numberDiff line numberDiff line change
@@ -307,16 +307,16 @@ invoice.date=Datum:
307307
invoice.payment-for=Bezahlung f\u00FCr:
308308
reservation-page-complete.download-your-invoice=Rechnung herunterladen
309309
reservation-page-complete.download-your-receipt=Beleg herunterladen
310-
invoice.to=[DE] Invoice to:
310+
invoice.to=Rechnungsadresse:
311311
invoice.vat=MWST-Nr.:
312312
invoice.number=Rechnungsnummer:
313313
invoice.vat-invoice=Mehrwertsteuerrechnung
314314
invoice.regards=Freundliche Gr\u00FC\u00DFe,
315-
invoice.payment-instruction=[DE] Payment instruction
316-
invoice.payment-contact=[DE] Send us an e-mail ({0}) with the proof of payment. You will receive a confirmation e-mail.
317-
invoice.payment-instruction-no-later-than=[DE] To complete the transaction, you have to make the payment not later than {0} using the details below.
318-
invoice.account-number=[DE] Account number: <strong>{0}</strong>
319-
invoice.payment-to=[DE] Payment to:
320-
invoice.payment-reason=[DE] With <strong>{0}</strong> as a payment reason.
315+
invoice.payment-instruction=Zahlungsanweisungen
316+
invoice.payment-contact=Sende uns eine E-Mail ({0}) mit der Zahlungsbest\u00E4tigung. Du wirst eine Best\u00E4tigungsemail von uns bekommen.
317+
invoice.payment-instruction-no-later-than=F\u00FCr die Best\u00E4tigung einer Reservierung erwaten wir eine \u00DCberweisung <strong>bis zum {0}</strong>.
318+
invoice.account-number=Bankverbindung: <strong>{0}</strong>
319+
invoice.payment-to=Zahlung an:
320+
invoice.payment-reason=Bitte <strong>{0}</strong> als Zahlungsgrund/Verwendungszweck anzugeben.
321321
reservation-page-waiting.required-steps.1.with-bank-account-owner=\u00DCberweise den Betrag von <strong> {0} </strong> an folgende Bankverbindung: <strong> {1} </strong>.
322322
reservation-page-waiting.required-steps.1.with-bank-account-owner.2=Du bist verpflichtet, <strong> {0} </strong> als Zahlungsgrund/Verwendungszweck anzugeben

‎src/main/resources/alfio/i18n/public_it.properties

+6-6
Original file line numberDiff line numberDiff line change
@@ -304,11 +304,11 @@ invoice.vat=Nr. IVA:
304304
invoice.number=Fattura n.:
305305
invoice.vat-invoice=Fattura
306306
invoice.regards=Cordiali saluti,
307-
invoice.payment-instruction=[IT] Payment instruction
308-
invoice.payment-contact=[IT] Send us an e-mail ({0}) with the proof of payment. You will receive a confirmation e-mail.
309-
invoice.payment-instruction-no-later-than=[IT] To complete the transaction, you have to make the payment not later than {0} using the details below.
310-
invoice.account-number=[IT] Account number: <strong>{0}</strong>
311-
invoice.payment-to=[IT] Payment to:
312-
invoice.payment-reason=[IT] With <strong>{0}</strong> as a payment reason.
307+
invoice.payment-instruction=Indicazioni per il pagamento
308+
invoice.payment-contact=Inviaci una e-mail a {0} con la prova di avvenuto trasferimento. Non appena avremo completato le nostre verifiche, riceverai una email di conferma.
309+
invoice.payment-instruction-no-later-than=Per confermare la tua prenotazione, dobbiamo ricevere il pagamento <strong>entro il {0}</strong>.
310+
invoice.account-number=Numero del conto: <strong>{0}</strong>
311+
invoice.payment-to=Pagamento a:
312+
invoice.payment-reason=Specificando <strong>{0}</strong> quale causale del pagamento.
313313
reservation-page-waiting.required-steps.1.with-bank-account-owner=Invia l''importo di <strong>{0}</strong> al conto corrente: <strong>{1}</strong>
314314
reservation-page-waiting.required-steps.1.with-bank-account-owner.2=specificando <strong>{0}</strong> quale causale del pagamento

‎src/main/resources/alfio/templates/invoice.ms

+17-16
Original file line numberDiff line numberDiff line change
@@ -115,15 +115,15 @@
115115
<p>{{invoiceAddress}}</p>
116116
<p>{{#i18n}}invoice.vat{{/i18n}} {{vatNr}}</p>
117117
<p class="strong">{{#i18n}}invoice.number{{/i18n}} {{ticketReservation.invoiceNumber}}</p>
118-
<p>{{#i18n}}invoice.date{{/i18n}} {{#format-date}}{{confirmationDate}} dd MMM yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}</p>
118+
<p>{{#i18n}}invoice.date{{/i18n}} {{#format-date}}{{confirmationDate}} dd/MM/yyyy locale:{{#i18n}}locale{{/i18n}}{{/format-date}}</p>
119+
{{#isOfflinePayment}}<p class="strong">{{#i18n}}reservation-page-waiting.title [{{#format-date}}{{expirationDate}} {{#i18n}}datetime.pattern{{/i18n}} locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}</p>{{/isOfflinePayment}}
119120
</td>
120121
</tr>
121122
<tr class="mt">
122123
<td style="width:60%">
123124
&nbsp;
124125
</td>
125126
<td style="width:40%">
126-
<p class="margin-bottom-line">{{#i18n}}invoice.to{{/i18n}}</p>
127127
{{#ticketReservation.hasBillingAddress}}
128128
{{#ticketReservation.lineSplittedBillingAddress}}
129129
<p>{{.}}</p>
@@ -169,26 +169,27 @@
169169
</tfoot>
170170
</table>
171171

172-
<div class="small mb2" style="margin-top:1em">
172+
<div class="small {{^isOfflinePayment}}mb{{/isOfflinePayment}}" style="margin-top:1em">
173173
<p class="strong">{{#i18n}}invoice.order-information{{/i18n}}</p>
174174
<p>{{ticketReservation.id}}</p>
175175
<p>{{#i18n}}invoice.buyer{{/i18n}} {{ticketReservation.fullName}} &lt;{{ticketReservation.email}}&gt;</p>
176176
</div>
177177

178178
{{#isOfflinePayment}}
179-
<div class="small mb2" style="margin-top:1em">
180-
<p class="strong">{{#i18n}}invoice.payment-instruction{{/i18n}}</p>
181-
<p>{{#i18n}}invoice.payment-instruction-no-later-than [{{#format-date}}{{expirationDate}} {{#i18n}}datetime.pattern{{/i18n}} locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}</p>
182-
<p>{{#i18n}}invoice.account-number [{{bankAccountNr}}]{{/i18n}}</p>
183-
{{#hasBankAccountOnwer}}
184-
<p>{{#i18n}}invoice.payment-to{{/i18n}}</p>
185-
{{#bankAccountOnwerAsList}}
186-
<p style="padding-left:1em">{{.}}</p>
187-
{{/bankAccountOnwerAsList}}
188-
{{/hasBankAccountOnwer}}
189-
<p>{{#i18n}}invoice.payment-reason [{{paymentReason}}]{{/i18n}}</p>
190-
<p style="margin-top:1em">{{#i18n}}invoice.payment-contact [{{organization.email}}]{{/i18n}}</p>
191-
</div>
179+
<div class="mb" style="margin-top: 1em">
180+
<p>{{#i18n}}invoice.payment-instruction-no-later-than [{{#format-date}}{{expirationDate}} {{#i18n}}datetime.pattern{{/i18n}} locale:{{#i18n}}locale{{/i18n}}{{/format-date}}]{{/i18n}}</p>
181+
<br/>
182+
<p class="strong">{{#i18n}}invoice.payment-instruction{{/i18n}}</p>
183+
<p>{{#i18n}}invoice.account-number [{{bankAccountNr}}]{{/i18n}}</p>
184+
{{#hasBankAccountOnwer}}
185+
<p style="margin-bottom:0.5em">{{#i18n}}invoice.payment-to{{/i18n}}</p>
186+
{{#bankAccountOnwerAsList}}
187+
<p style="padding-left:1em">{{.}}</p>
188+
{{/bankAccountOnwerAsList}}
189+
{{/hasBankAccountOnwer}}
190+
<p style="margin-top: 0.5em">{{#i18n}}invoice.payment-reason [{{paymentReason}}]{{/i18n}}</p>
191+
<p style="margin-top:0.5em">{{#i18n}}invoice.payment-contact [{{organization.email}}]{{/i18n}}</p>
192+
</div>
192193
{{/isOfflinePayment}}
193194

194195
<p>{{#i18n}}invoice.regards{{/i18n}}</p>

‎src/main/webapp/WEB-INF/templates/event/reservation-waiting-for-payment.ms

+5-12
Original file line numberDiff line numberDiff line change
@@ -28,21 +28,14 @@
2828
<div class="text-center wMarginTop">
2929
<h4>{{#i18n}}reservation-page-waiting.questions [{{emailAddress}}] [{{reservation.id}}]{{/i18n}}</h4>
3030
</div>
31-
{{#reservation.hasInvoiceOrReceiptDocument}}
32-
<div class="text-center">
33-
<h4>
34-
{{#reservation.hasInvoiceNumber}}
35-
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/invoice" target="_blank">{{#i18n}}reservation-page-complete.download-your-invoice{{/i18n}}</a>
36-
{{/reservation.hasInvoiceNumber}}
37-
{{^reservation.hasInvoiceNumber}}
38-
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/receipt" target="_blank">{{#i18n}}reservation-page-complete.download-your-receipt{{/i18n}}</a>
39-
{{/reservation.hasInvoiceNumber}}
40-
</h4>
41-
</div>
42-
{{/reservation.hasInvoiceOrReceiptDocument}}
4331
<div class="wMarginBottom">&nbsp;</div>
4432
<div class="container-fluid" id="back-to-event-site">
4533
<div class="pull-left"><a href="{{event.websiteUrl}}" class="btn btn-default">{{#i18n}}to-event-site{{/i18n}}</a></div>
34+
{{#reservation.hasInvoiceNumber}}
35+
<div class="pull-right">
36+
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/invoice" class="btn btn-success" target="_blank">{{#i18n}}reservation-page-complete.download-your-invoice{{/i18n}}</a>
37+
</div>
38+
{{/reservation.hasInvoiceNumber}}
4639
</div>
4740
<div class="clearfix wMarginBottom"></div>
4841
<div class="text-center">

0 commit comments

Comments
 (0)