Skip to content

Commit 64fa057

Browse files
committed
#219 expose invoice/receipt pdf link in reservation page complete/waiting for payment
1 parent 3217fad commit 64fa057

File tree

7 files changed

+61
-9
lines changed

7 files changed

+61
-9
lines changed

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

+10
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,8 @@ reservation-page-complete.confirm-cancellation.text=Your ticket will be invalida
135135
reservation-page-complete.confirm-cancellation.button.yes=Yes
136136
reservation-page-complete.confirm-cancellation.button.no=No
137137
reservation-page-complete.release-button.text=Release
138+
reservation-page-complete.download-your-receipt=Download your receipt
139+
reservation-page-complete.download-your-invoice=Download your invoice
138140

139141
#show-ticket
140142
show-ticket.header.title=Your Ticket for {0}
@@ -212,6 +214,14 @@ receipt.billing-address=Billing address:
212214
receipt.date=Date:
213215
receipt.payment-for=Payment for:
214216

217+
#invoice
218+
invoice.invoice=Invoice
219+
invoice.order-information=Order information
220+
invoice.buyer=Buyer:
221+
invoice.billing-address=Billing address:
222+
invoice.date=Date:
223+
invoice.payment-for=Payment for:
224+
215225

216226
#mail messages
217227
email.confirmation-email-sent=The confirmation email has been sent.

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

+8
Original file line numberDiff line numberDiff line change
@@ -299,3 +299,11 @@ show-event.additional-services=Zusatzoptionen
299299
reservation-page.postpone-assignment=Ich weiss es noch nicht, wer wird die Veranstaltung teilnehmen.
300300
reservation-page.attendees=Teihlnemer
301301
error.STEP_2_MISSING_ATTENDEE_DATA=Bitte Teilnehmersdetail erg\u00E4nzen.
302+
invoice.invoice=[DE] Invoice
303+
invoice.order-information=Bestellinformationen
304+
invoice.buyer=K\u00E4ufer:
305+
invoice.billing-address=Rechnungsadresse:
306+
invoice.date=Datum:
307+
invoice.payment-for=Bezahlung f\u00FCr:
308+
reservation-page-complete.download-your-invoice=[DE] Download your invoice
309+
reservation-page-complete.download-your-receipt=[DE] Download your receipt

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

+9-1
Original file line numberDiff line numberDiff line change
@@ -290,4 +290,12 @@ error.email=Email non valido.
290290
show-event.additional-services=Opzioni aggiuntive
291291
reservation-page.postpone-assignment=Non conosco ancora i dati dei partecipanti all''evento.
292292
reservation-page.attendees=Partecipanti
293-
error.STEP_2_MISSING_ATTENDEE_DATA=\u00C8 necessario specificare i dati dei partecipanti.
293+
error.STEP_2_MISSING_ATTENDEE_DATA=\u00C8 necessario specificare i dati dei partecipanti.
294+
invoice.invoice=[IT] Invoice
295+
invoice.order-information=Info ordine
296+
invoice.buyer=Acquirente:
297+
invoice.billing-address=Dati di fatturazione:
298+
invoice.date=Data:
299+
invoice.payment-for=Pagamento a favore di:
300+
reservation-page-complete.download-your-invoice=[IT] Download your invoice
301+
reservation-page-complete.download-your-receipt=[IT] Download your receipt

src/main/resources/alfio/i18n/public_nl.properties

+12-4
Original file line numberDiff line numberDiff line change
@@ -197,10 +197,10 @@ ticket.payment-required=Dit ticket is nog niet betaald. U moet dus het bedrag no
197197
#receipt.ms
198198
receipt.receipt=Factuur
199199
receipt.order-information=Bestel informatie
200-
receipt.buyer=Koper\:
201-
receipt.billing-address=Factuuradres\:
202-
receipt.date=Datum\:
203-
receipt.payment-for=Betaling voor\:
200+
receipt.buyer=Koper:
201+
receipt.billing-address=Factuuradres:
202+
receipt.date=Datum:
203+
receipt.payment-for=Betaling voor:
204204

205205

206206
#mail messages
@@ -302,3 +302,11 @@ show-event.additional-services=Extra opties
302302
reservation-page.postpone-assignment=Ik weet nog niet wie er aanwezig zal zijn.
303303
reservation-page.attendees=Deelnemers
304304
error.STEP_2_MISSING_ATTENDEE_DATA=Vul alstublieft de details van de deelnemers in.
305+
invoice.invoice=[NL] Invoice
306+
invoice.order-information=Bestel informatie
307+
invoice.buyer=Koper:
308+
invoice.billing-address=Factuuradres:
309+
invoice.date=Datum:
310+
invoice.payment-for=Betaling voor:
311+
reservation-page-complete.download-your-invoice=[NL] Download your invoice
312+
reservation-page-complete.download-your-receipt=[NL] Download your receipt

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@
4545
<td style="text-align: center; vertical-align: middle;"><h1>{{event.displayName}}</h1></td>
4646
</tr>
4747
</table>
48-
<h2>INVOICE: TBD: {{#i18n}}receipt.receipt{{/i18n}}</h2>
48+
<h2>{{#i18n}}invoice.invoice{{/i18n}}</h2>
4949

50-
<h3>{{#i18n}}receipt.order-information{{/i18n}} {{ticketReservation.id}}</h3>
50+
<h3>{{#i18n}}invoice.order-information{{/i18n}} {{ticketReservation.id}}</h3>
5151

52-
<div>{{#i18n}}receipt.date{{/i18n}} {{#format-date}}{{confirmationDate}} EEE dd MMM yyyy HH:mm (z) locale:{{#i18n}}locale{{/i18n}}{{/format-date}}</div>
52+
<div>{{#i18n}}invoice.date{{/i18n}} {{#format-date}}{{confirmationDate}} EEE dd MMM yyyy HH:mm (z) locale:{{#i18n}}locale{{/i18n}}{{/format-date}}</div>
5353

5454

55-
<div>{{#i18n}}receipt.buyer{{/i18n}}</div>
55+
<div>{{#i18n}}invoice.buyer{{/i18n}}</div>
5656
<pre style="font-size: 110%">
5757
{{ticketReservation.fullName}}
5858
{{#ticketReservation.hasBillingAddress}}

src/main/webapp/WEB-INF/templates/event/reservation-page-complete.ms

+8
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,14 @@
9898
<div class="text-center">
9999
{{#i18n}}reservation-page-complete.order-information [{{reservation.id}}] [{{reservation.fullName}}]{{/i18n}}
100100
</div>
101+
<div class="text-center">
102+
{{#reservation.hasInvoiceNumber}}
103+
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/invoice" target="_blank">{{#i18n}}reservation-page-complete.download-your-invoice{{/i18n}}</a>
104+
{{/reservation.hasInvoiceNumber}}
105+
{{^reservation.hasInvoiceNumber}}
106+
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/receipt" target="_blank">{{#i18n}}reservation-page-complete.download-your-receipt{{/i18n}}</a>
107+
{{/reservation.hasInvoiceNumber}}
108+
</div>
101109
<div class="text-center wMarginTop30px">
102110
<span class="text-muted"><a href="https://alf.io" title="{{#i18n}}alfio.credits{{/i18n}}" target="_blank">{{#i18n}}alfio.credits{{/i18n}}</a></span>
103111
</div>

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

+10
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,16 @@
1919
<div class="text-center wMarginTop">
2020
<h4>{{#i18n}}reservation-page-waiting.questions [{{emailAddress}}] [{{reservation.id}}]{{/i18n}}</h4>
2121
</div>
22+
<div class="text-center">
23+
<h4>
24+
{{#reservation.hasInvoiceNumber}}
25+
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/invoice" target="_blank">{{#i18n}}reservation-page-complete.download-your-invoice{{/i18n}}</a>
26+
{{/reservation.hasInvoiceNumber}}
27+
{{^reservation.hasInvoiceNumber}}
28+
<a href="{{request.contextPath}}/event/{{event.shortName}}/reservation/{{reservationId}}/receipt" target="_blank">{{#i18n}}reservation-page-complete.download-your-receipt{{/i18n}}</a>
29+
{{/reservation.hasInvoiceNumber}}
30+
</h4>
31+
</div>
2232
<div class="wMarginBottom">&nbsp;</div>
2333
<div class="container-fluid" id="back-to-event-site">
2434
<div class="pull-left"><a href="{{event.websiteUrl}}" class="btn btn-default">{{#i18n}}to-event-site{{/i18n}}</a></div>

0 commit comments

Comments
 (0)