Skip to content

fix: Fixed multiple tickets error & refactored order invoice logic #6133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 2, 2019
Merged

fix: Fixed multiple tickets error & refactored order invoice logic #6133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e793d27
Removed multi-row error
mrsaicharan1 Jul 2, 2019
f26c422
Refactored order invoice & fixed multiple entries bug
mrsaicharan1 Jul 2, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions app/api/helpers/order.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
14 changes: 7 additions & 7 deletions app/templates/pdf/order_invoice.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,23 +180,23 @@ <h3 style="text-align:center;">{{ ("Order Invoice") }}</h3>
</tr>
</thead>
<tbody>
{% for ticket in tickets %}
{% for order_ticket in order_tickets %}
<tr>
<td style="text-align:center">{{ ticket.name }}</td>
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ ticket.price }}</td>
<td style="text-align:center">{{ order_tickets_info.quantity }}</td>
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ order_tickets_info.quantity*ticket.price }}</td>
<td style="text-align:center">{{ order_ticket.ticket.name }}</td>
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ order_ticket.ticket.price }}</td>
<td style="text-align:center">{{ order_ticket.quantity }}</td>
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ order_ticket.quantity*order_ticket.ticket.price }}</td>
{% if tax %}
<td style="text-align:center">{{ tax.rate }}%</td>
{% else %}
<td style="text-align:center">{{ ("0%") }}</td>
{% endif %}
{% if tax %}
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ tax.rate*ticket.price/100 }}</td>
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}{{ tax.rate*order_ticket.ticket.price/100 }}</td>
{% else %}
<td style="text-align:center">{{ event.payment_currency | currency_symbol }}0</td>
{% endif %}
</tr>
</tr>
{% endfor %}
<tr>
<th scope="row"></th>
Expand Down