Skip to content

Commit e3e27b7

Browse files
authored
Org: Includes payment details in additional reservation emails
TYPE: Feature LINK: OGC-2437
1 parent 45679a4 commit e3e27b7

5 files changed

Lines changed: 24 additions & 2 deletions

File tree

src/onegov/org/templates/mail_new_reservation_notification.pt

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,17 @@
1717
<p><b>${resource.title}</b></p>
1818
<tal:b metal:use-macro="layout.macros['reservations']"></tal:b>
1919

20-
<tal:b condition="show_submission|nothing">
20+
<tal:b tal:condition="show_submission|nothing">
2121
<hr class="large">
2222
<metal:b use-macro="layout.macros['display_form']"/>
2323
</tal:b>
24+
<tal:b tal:condition="ticket.handler.payment">
25+
<hr class="large">
26+
<metal:b tal:define="payment ticket.handler.payment; show_vat ticket.handler.show_vat" use-macro="layout.macros['payment']" />
27+
</tal:b>
28+
<tal:b tal:define="show_submission show_submission|False" tal:condition="show_submission or ticket.handler.payment">
29+
<hr class="large">
30+
</tal:b>
2431
<p i18n:translate>Have a great day!</p>
2532
</tal:b>
2633
<tal:b metal:fill-slot="above-footer">

src/onegov/org/templates/mail_reservation_accepted.pt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,9 @@
2828
<hr class="large">
2929
<metal:b use-macro="layout.macros['display_form']"/>
3030
</tal:b>
31+
<tal:b tal:condition="ticket.handler.payment">
32+
<hr class="large">
33+
<metal:b tal:define="payment ticket.handler.payment; show_vat ticket.handler.show_vat" use-macro="layout.macros['payment']" />
34+
</tal:b>
3135
</tal:b>
3236
</div>

src/onegov/org/views/reservation.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -990,6 +990,7 @@ def recipients_which_have_registered_for_mail() -> Iterator[str]:
990990
'title': title,
991991
'form': form,
992992
'model': self,
993+
'ticket': ticket,
993994
'resource': resource,
994995
'reservations': reservations,
995996
'show_submission': show_submission,

src/onegov/town6/templates/mail_new_reservation_notification.pt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,15 @@
1717
<p><b>${resource.title}</b></p>
1818
<tal:b metal:use-macro="layout.macros['reservations']"></tal:b>
1919

20-
<tal:b condition="show_submission|nothing">
20+
<tal:b tal:condition="show_submission|nothing">
2121
<hr class="large">
2222
<metal:b use-macro="layout.macros['display_form']"/>
23+
</tal:b>
24+
<tal:b tal:condition="ticket.handler.payment">
25+
<hr class="large">
26+
<metal:b tal:define="payment ticket.handler.payment; show_vat ticket.handler.show_vat" use-macro="layout.macros['payment']" />
27+
</tal:b>
28+
<tal:b tal:define="show_submission show_submission|False" tal:condition="show_submission or ticket.handler.payment">
2329
<hr class="large">
2430
</tal:b>
2531
<p i18n:translate>Have a great day!</p>

src/onegov/town6/templates/mail_reservation_accepted.pt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,9 @@
2828
<hr class="large">
2929
<metal:b use-macro="layout.macros['display_form']"/>
3030
</tal:b>
31+
<tal:b tal:condition="ticket.handler.payment">
32+
<hr class="large">
33+
<metal:b tal:define="payment ticket.handler.payment; show_vat ticket.handler.show_vat" use-macro="layout.macros['payment']" />
34+
</tal:b>
3135
</tal:b>
3236
</div>

0 commit comments

Comments
 (0)