From 503ddfb6a3bc8b38a56924d90045285ee71c1914 Mon Sep 17 00:00:00 2001 From: mrsaicharan1 Date: Sat, 25 May 2019 02:27:41 -0500 Subject: [PATCH 1/2] Structured tax invoice according to eventbrite --- app/api/helpers/order.py | 5 +- app/templates/pdf/order_invoice.html | 333 ++++++++++++++++++--------- 2 files changed, 222 insertions(+), 116 deletions(-) diff --git a/app/api/helpers/order.py b/app/api/helpers/order.py index ac4dd325b9..f9b112fce1 100644 --- a/app/api/helpers/order.py +++ b/app/api/helpers/order.py @@ -11,6 +11,7 @@ from app.models import db from app.models.ticket import Ticket from app.models.ticket_holder import TicketHolder +from app.models.order import OrderTicket def delete_related_attendees_for_order(order): @@ -70,7 +71,9 @@ def create_pdf_tickets_for_holder(order): save_to_db(holder) # create order invoices pdf - create_save_pdf(render_template('pdf/order_invoice.html', order=order, event=order.event), + order_ticket_info = OrderTicket.query.filter_by(order_id=order.id).one() + 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), 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 a45d624eca..5547062c56 100644 --- a/app/templates/pdf/order_invoice.html +++ b/app/templates/pdf/order_invoice.html @@ -1,126 +1,229 @@ - - + + - - {{ ("Order Invoice") }} - + - table { - margin-top: 20px; - border-collapse: separate; - } + +

{{ ("Order Invoice") }}

+ + + + + + {% if order.is_billing_enabled %} + + {% endif %} + + + + {% if order.status != "deleted" %} + + - .total-row { - margin-top: 25px; - } +
- .order-total { - margin-right: 50px; - } + + {% if order.is_billing_enabled %} + + + {% endif %} + + {% endif %} + + +
+ {{ ("Order") }} + + {{ ("Order Details") }} + + {{ ("Billing Info") }} +

+ Order Number :
+ Order By :
+ Order Status :
+ Quantity :
+ Total Amount :
+ Payment Mode :
+ Discount Code :
+
+ {{ order.get_invoice_number() }}
+ {% 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 %}
+ {% 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 %}
+ {{ order.tickets_count }}
+ {{ event.payment_currency | currency_symbol }}{{ order.amount | money }}
+ {% if order.status == 'completed' %} + {{ order.paid_via | capitalize }} + {% else %} + {{ ('Payment pending') }} + {% endif %}
+ {% if order.discount_code %} + {{ order.discount_code.code }}
+ {% else %} + {{ ('NA') }} + {% endif %}
+
+ + Company :
+ Tax Info :
+ Address :
+ City :
+ State/Province :
+ Zip Code:
+ Country:
+ +
+ + {{ order.company }}
+ {{ order.tax_business_info }}
+ {{ order.address }}
+ {{ order.city }}
+ {{ order.state }}
+ {{ order.zipcode }}
+ {{ order.country }}
+ +

- tr.padded td{ - padding-top : 40px; - } - - - -

{{ ("Order Invoice") }}

-
- - - - - - - - - - {% if order.status != "deleted" %} - - - + {% endif %} + + {% endfor %} + + + + + + + + + +
- {{ ("Order") }} - - {{ ("Order Details") }} - - {{ ("Billing Info") }} -

- Order Number :
- Order By :
- Order Status :
- Quantity :
- Total Amount :
- Payment Mode :
- Discount Code :
-
- {{ order.get_invoice_number() }}
- {% 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 %}
- {% 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 %}
- {{ order.tickets_count }}
- {{ event.payment_currency | currency_symbol }}{{ order.amount | money }}
- {% if order.status == 'completed' %} - {{ order.paid_via | capitalize }} +
+ + + + + + + + + + + + + + {% for ticket in tickets %} + + + + + + {% if tax %} + {% else %} - {{ ('Payment pending') }} - {% endif %}
- {% if order.discount_code %} - {{ order.discount_code.code }}
+ + {% endif %} + {% if tax %} + {% else %} - {{ ('NA') }} - {% endif %}
- - {% if order.is_billing_enabled %} - - - {% endif %} - - {% endif %} - -
NamePriceQuantitySub-Total(net)VATTax Amount
{{ ticket.name }}{{ event.payment_currency | currency_symbol }}{{ ticket.price }}{{ order_tickets_info.quantity }}{{ event.payment_currency | currency_symbol }}{{ order_tickets_info.quantity*ticket.price }}{{ tax.rate }}%{{ ("0%") }}{{ event.payment_currency | currency_symbol }}{{ tax.rate*ticket.price/100 }}
- - Company :
- Tax Info :
- Address :
- City :
- State/Province :
- Zip Code:
- Country:
- -
- - {{ order.company }}
- {{ order.tax_business_info }}
- {{ order.address }}
- {{ order.city }}
- {{ order.state }}
- {{ order.zipcode }}
- {{ order.country }}
- -
+ 		{{ event.payment_currency | currency_symbol }}0
Grand Total {{ event.payment_currency | currency_symbol }}{{ order.amount | money }}
+ + - + \ No newline at end of file From 57baefc99ff810c9a321604a1b646873ac8d5811 Mon Sep 17 00:00:00 2001 From: mrsaicharan1 Date: Mon, 3 Jun 2019 00:53:26 -0500 Subject: [PATCH 2/2] Center aligned Order details Re-arranged the order items --- app/api/helpers/order.py | 2 +- app/templates/pdf/order_invoice.html | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/app/api/helpers/order.py b/app/api/helpers/order.py index f9b112fce1..d3c854013c 100644 --- a/app/api/helpers/order.py +++ b/app/api/helpers/order.py @@ -73,7 +73,7 @@ def create_pdf_tickets_for_holder(order): # create order invoices pdf order_ticket_info = OrderTicket.query.filter_by(order_id=order.id).one() 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, tickets=order.tickets, order_tickets_info=order_ticket_info), 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 5547062c56..16b810d8e2 100644 --- a/app/templates/pdf/order_invoice.html +++ b/app/templates/pdf/order_invoice.html @@ -88,21 +88,6 @@

{{ ("Order Invoice") }}

- - - - - {% if order.is_billing_enabled %} - - {% endif %} - - {% if order.status != "deleted" %}
- {{ ("Order") }} - - {{ ("Order Details") }} - - {{ ("Billing Info") }} -