Skip to content

fix: Made ticket invoice generation similar to tickets #5886

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
May 16, 2019
Merged

fix: Made ticket invoice generation similar to tickets #5886

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
c578d76
Order Invoice generation method added
mrsaicharan1 May 15, 2019
a067156
Merge branch 'development' into invoice-fix
mariobehling May 16, 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
21 changes: 21 additions & 0 deletions app/api/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,3 +304,24 @@ def ticket_attendee_authorized(order_identifier):
return ForbiddenError({'source': ''}, 'Unauthorized Access').respond()
else:
return ForbiddenError({'source': ''}, 'Authentication Required to access ticket').respond()


@ticket_blueprint.route('/orders/invoices/<string:order_identifier>')
Copy link

@houndci-bot houndci-bot May 15, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

expected 2 blank lines, found 1

@jwt_required()
def order_invoices(order_identifier):
if current_user:
try:
order = Order.query.filter_by(identifier=order_identifier).first()
user_id = order.user.id
except NoResultFound:
return NotFoundError({'source': ''}, 'Order Invoice not found').respond()
if current_user.id == user_id:
key = UPLOAD_PATHS['pdf']['order'].format(identifier=order_identifier)
file_path = '../generated/invoices/{}/{}/'.format(key, generate_hash(key)) + order_identifier + '.pdf'
response = make_response(send_file(file_path))
response.headers['Content-Disposition'] = 'attachment; filename=invoice-%s.zip' % order_identifier
return response
else:
return ForbiddenError({'source': ''}, 'Unauthorized Access').respond()
else:
return ForbiddenError({'source': ''}, 'Authentication Required to access Invoice').respond()
8 changes: 7 additions & 1 deletion app/api/helpers/order.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,14 @@ def set_expiry_for_order(order, override=False):

def create_pdf_tickets_for_holder(order):
"""
Create tickets for the holders of an order.
Create tickets and invoices for the holders of an order.
:param order: The order for which to create tickets for.
"""
if order.status == 'completed':
pdf = create_save_pdf(render_template('pdf/ticket_purchaser.html', order=order),
UPLOAD_PATHS['pdf']['ticket_attendee'],
dir_path='/static/uploads/pdf/tickets/', identifier=order.identifier, upload_dir='generated/tickets/')

order.tickets_pdf_url = pdf

for holder in order.ticket_holders:
Expand All @@ -67,6 +68,11 @@ def create_pdf_tickets_for_holder(order):
pdf = order.tickets_pdf_url
holder.pdf_url = pdf
save_to_db(holder)

# create order invoices pdf
create_save_pdf(render_template('pdf/order_invoice.html', order=order, event=order.event),
UPLOAD_PATHS['pdf']['order'], dir_path='/static/uploads/pdf/tickets/',
identifier=order.identifier, upload_dir='generated/invoices/')
save_to_db(order)


Expand Down
3 changes: 2 additions & 1 deletion app/api/helpers/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
'system_image': 'event_topic/{event_topic_id}/system_image'
},
'pdf': {
'ticket_attendee': 'attendees/tickets/pdf/{identifier}'
'ticket_attendee': 'attendees/tickets/pdf/{identifier}',
'order': 'orders/invoices/pdf/{identifier}'
}
}

Expand Down
126 changes: 126 additions & 0 deletions app/templates/pdf/order_invoice.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title> {{ ("Order Invoice") }}</title>
<style type="text/css">
{% include 'bootstrap/bootstrap_pdf.css' %}
table th {
text-align: left;
}

table td {
text-align: left;
border-spacing: 1em;
}

table {
margin-top: 20px;
border-collapse: separate;
}

.total-row {
margin-top: 25px;
}

.order-total {
margin-right: 50px;
}

tr.padded td{
padding-top : 40px;
}
</style>
</head>
<body id="body">
<h3 style="text-align:center;">{{ ("Order Invoice") }}</h3>
<br>
<table class="table with-datatable" id="orders-table" width="100%">
<thead>
<tr>
<th>
{{ ("Order") }}
</th>
<th>
{{ ("Order Details") }}
</th>
<th>
{{ ("Billing Info") }}
</th>
</tr>
</thead>
<tbody>
{% if order.status != "deleted" %}
<tr class="padded">
<td><br>
Order Number :<br>
Order By :<br>
Order Status :<br>
Quantity :<br>
Total Amount :<br>
Payment Mode :<br>
Discount Code :<br>
</td>
<td><br>
<strong>{{ order.get_invoice_number() }}</strong><br>
{% if order.user and order.user.first_name and order.user.last_name %}
{{ order.user.fullname }}
{% elif order.user %}
{{ order.user.email }}
{% else %}
{{ ('Information unavailable') }}
{% endif %}<br>
{% if order.status == 'completed' %}
{{ order.status | capitalize }}
{% elif order.status == 'pending' or order.status == 'initialized' %}
{{ ("Pending") }}
{% elif order.status == 'placed' %}
{{ order.status | capitalize }}
{% elif order.status == 'cancelled' %}
{{ order.status | capitalize }}
{% else %}
{{ order.status | capitalize }}
{% endif %}<br>
{{ order.tickets_count }}<br>
{{ event.payment_currency | currency_symbol }}{{ order.amount | money }}<br>
{% if order.status == 'completed' %}
{{ order.paid_via | capitalize }}
{% else %}
{{ ('Payment pending') }}
{% endif %}<br>
{% if order.discount_code %}
{{ order.discount_code.code }}<br>
{% else %}
{{ ('NA') }}
{% endif %}<br>
</td>
{% if order.is_billing_enabled %}
<td style="text-align:center;"><br>
<strong>
Company :<br>
Tax Info :<br>
Address :<br>
City :<br>
State/Province :<br>
Zip Code: <br>
Country: <br>
</strong>
</td>
<td><br>
<strong>
{{ order.company }}<br>
{{ order.tax_business_info }}<br>
{{ order.address }}<br>
{{ order.city }}<br>
{{ order.state }}<br>
{{ order.zipcode }}<br>
{{ order.country }}<br>
</strong>
</td>
{% endif %}
</tr>
{% endif %}
</tbody>
</table>
</body>
</html>