diff --git a/app/api/helpers/order.py b/app/api/helpers/order.py index 4b0d3015fb..e1806efa17 100644 --- a/app/api/helpers/order.py +++ b/app/api/helpers/order.py @@ -73,9 +73,10 @@ def create_pdf_tickets_for_holder(order): save_to_db(holder) # create order invoices pdf - order_ticket_info = OrderTicket.query.filter_by(order_id=order.id).one() + order_tickets = OrderTicket.query.filter_by(order_id=order.id, deleted_at=None).all() + create_save_pdf(render_template('pdf/order_invoice.html', order=order, event=order.event, - tax=order.event.tax, tickets=order.tickets, order_tickets_info=order_ticket_info), + tax=order.event.tax, order_tickets=order_tickets), UPLOAD_PATHS['pdf']['order'], dir_path='/static/uploads/pdf/tickets/', identifier=order.identifier, upload_dir='generated/invoices/') save_to_db(order) diff --git a/app/templates/pdf/order_invoice.html b/app/templates/pdf/order_invoice.html index 16b810d8e2..1a7279444e 100644 --- a/app/templates/pdf/order_invoice.html +++ b/app/templates/pdf/order_invoice.html @@ -180,23 +180,23 @@

{{ ("Order Invoice") }}

- {% for ticket in tickets %} + {% for order_ticket in order_tickets %} - {{ ticket.name }} - {{ event.payment_currency | currency_symbol }}{{ ticket.price }} - {{ order_tickets_info.quantity }} - {{ event.payment_currency | currency_symbol }}{{ order_tickets_info.quantity*ticket.price }} + {{ order_ticket.ticket.name }} + {{ event.payment_currency | currency_symbol }}{{ order_ticket.ticket.price }} + {{ order_ticket.quantity }} + {{ event.payment_currency | currency_symbol }}{{ order_ticket.quantity*order_ticket.ticket.price }} {% if tax %} {{ tax.rate }}% {% else %} {{ ("0%") }} {% endif %} {% if tax %} - {{ event.payment_currency | currency_symbol }}{{ tax.rate*ticket.price/100 }} + {{ event.payment_currency | currency_symbol }}{{ tax.rate*order_ticket.ticket.price/100 }} {% else %} {{ event.payment_currency | currency_symbol }}0 {% endif %} - + {% endfor %}