feat: Made invoice similar to Eventbrite #5952

mrsaicharan1 · 2019-05-24T20:05:24Z

Fixes #5891

Checklist

I have read the Contribution & Best practices Guide and my PR follows them.
My branch is up-to-date with the Upstream development branch.
The unit tests pass locally with my changes
I have added tests that prove my fix is effective or that my feature works
I have added necessary documentation (if appropriate)

All the functions created/modified in this PR contain relevant docstrings.

Short description of what this resolves:

Structured the order invoice with order and related ticket info

Changes proposed in this pull request:

Added VAT and VAT amount to invoice
Added checks for billing info

app/api/helpers/order.py

mrsaicharan1 · 2019-05-24T20:09:04Z

@shreyanshdwivedi @uds5501 Could you suggest some design changes to this invoice structure?

codecov · 2019-05-24T20:34:06Z

Codecov Report

Merging #5952 into development will decrease coverage by <.01%.
The diff coverage is 33.33%.

@@               Coverage Diff               @@
##           development    #5952      +/-   ##
===============================================
- Coverage        66.46%   66.46%   -0.01%     
===============================================
  Files              284      284              
  Lines            13905    13907       +2     
===============================================
+ Hits              9242     9243       +1     
- Misses            4663     4664       +1

Impacted Files	Coverage Δ
app/api/helpers/order.py	`39.06% <33.33%> (+0.35%)`	⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update eb349a6...57baefc. Read the comment docs.

uds5501 · 2019-05-25T06:40:15Z

@mrsaicharan1 I will pull the changes on my local and suggest edits in a while

mrsaicharan1 · 2019-05-25T06:51:41Z

Sure

…

On Sat, 25 May 2019 at 1:40 AM, Uddeshya Singh ***@***.***> wrote: @mrsaicharan1 <https://github.com/mrsaicharan1> I will pull the changes on my local and suggest edits in a while — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#5952?email_source=notifications&email_token=AGAHUW3GWGRP6CHRGVDLQALPXDNNDA5CNFSM4HPSLVDKYY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODWHFXDI#issuecomment-495868813>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AGAHUW2WZE4MUJBHXZVZOPDPXDNNDANCNFSM4HPSLVDA> .

uds5501

Try this on your local and post results, it seems to be working for me

app/templates/pdf/order_invoice.html

kushthedude

@mrsaicharan1 Some suggestions for invoice -:

The above two sub heading Order and order details can be replace with Order Details centre aligned .
Begin the alignment of Order Details from extreme right margin .
Try to have Margins for the tables and highlight the Order Details Headings as done in invoices generated by E-Com Sites .
Ensure the following order of details in the Order Details table -:
- Ticket Type
- Price
- Quantity
- Discount (If Exist)
- Net Amount
- Tax Rate
- Tax Amount
- Total Amount

@uds5501 @shreyanshdwivedi @iamareebjamal Your views upon the following suggestions

mrsaicharan1 · 2019-06-03T05:24:18Z

@mrsaicharan1 Some suggestions for invoice -:

The above two sub heading Order and order details can be replace with Order Details centre aligned .

Begin the alignment of Order Details from extreme right margin .

Try to have Margins for the tables and highlight the Order Details Headings as done in invoices generated by E-Com Sites .

Ensure the following order of details in the Order Details table -:

Ticket Type

Price

Quantity

Discount (If Exist)

Net Amount

Tax Rate

Tax Amount

Total Amount

@uds5501 @shreyanshdwivedi @iamareebjamal Your views upon the following suggestions

Keeping the headings bold is a way of highlighting them. Even though I try to place the margins, they aren't showing up for some weird reason.
Apart from this, I'll take care of the rest.

mrsaicharan1 · 2019-06-03T06:16:09Z

@shreyanshdwivedi @uds5501 @iamareebjamal Please review. The order invoice looks like this now.

uds5501 · 2019-06-03T06:18:38Z

@mrsaicharan1 how would it look without any billing information? in case the buyer chooses not to provide any billing info?

mrsaicharan1 · 2019-06-03T06:21:15Z

@mrsaicharan1 how would it look without any billing information? in case the buyer chooses not to provide any billing info?

kushthedude · 2019-06-03T06:21:29Z

@mrsaicharan1 Can you please show an invoice with Discount Amount ?

kushthedude · 2019-06-03T06:22:33Z

I still dont see Net Amount and Price of Ticket in invoice .

mrsaicharan1 · 2019-06-03T06:24:34Z

@kushthedude Please try to check clearly. Net amount is Sub-total(net). Price of ticket is price

uds5501

Please see the comment

app/api/helpers/order.py

kushthedude · 2019-06-03T06:25:38Z

@kushthedude Please try to check clearly. Net amount is Sub-total(net). Price of ticket is price

Can you shift that column to the last and shift tax columns before Net , It would look nice

app/api/helpers/order.py

Re-arranged the order items

mrsaicharan1 · 2019-06-03T06:29:46Z

@shreyanshdwivedi @uds5501 Hound issues fixed. Please review. :)

mrsaicharan1 · 2019-06-03T06:32:01Z

EventBrite follows this format. Therefore, I wouldn't want to change that.

houndci-bot reviewed May 24, 2019

View reviewed changes

app/api/helpers/order.py Outdated Show resolved Hide resolved

auto-label bot added the feature label May 24, 2019

mrsaicharan1 force-pushed the invoice-fix branch from 82efef2 to 3af80f2 Compare May 24, 2019 20:06

uds5501 suggested changes May 25, 2019

View reviewed changes

app/templates/pdf/order_invoice.html Outdated Show resolved Hide resolved

mrsaicharan1 force-pushed the invoice-fix branch 2 times, most recently from 6d19142 to 3128633 Compare May 25, 2019 07:27

kushthedude suggested changes May 26, 2019

View reviewed changes

Structured tax invoice according to eventbrite

503ddfb

mrsaicharan1 force-pushed the invoice-fix branch from c58113a to 503ddfb Compare June 3, 2019 05:16

mrsaicharan1 force-pushed the invoice-fix branch from bfd8f9b to 5dd4843 Compare June 3, 2019 06:11

uds5501 previously approved these changes Jun 3, 2019

View reviewed changes

app/api/helpers/order.py Outdated Show resolved Hide resolved

mrsaicharan1 dismissed uds5501’s stale review via 0a402bf June 3, 2019 06:27

mrsaicharan1 force-pushed the invoice-fix branch from 5dd4843 to 0a402bf Compare June 3, 2019 06:27

houndci-bot reviewed Jun 3, 2019

View reviewed changes

app/api/helpers/order.py Outdated Show resolved Hide resolved

app/api/helpers/order.py Outdated Show resolved Hide resolved

Center aligned Order details

57baefc

Re-arranged the order items

mrsaicharan1 force-pushed the invoice-fix branch from 606b120 to 57baefc Compare June 3, 2019 06:29

kushthedude approved these changes Jun 3, 2019

View reviewed changes

iamareebjamal approved these changes Jun 3, 2019

View reviewed changes

iamareebjamal merged commit 1f3b50f into fossasia:development Jun 3, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Made invoice similar to Eventbrite #5952

feat: Made invoice similar to Eventbrite #5952

mrsaicharan1 commented May 24, 2019 •

edited

Loading

mrsaicharan1 commented May 24, 2019 •

edited

Loading

codecov bot commented May 24, 2019 •

edited

Loading

uds5501 commented May 25, 2019

mrsaicharan1 commented May 25, 2019 via email

uds5501 left a comment

kushthedude left a comment •

edited

Loading

mrsaicharan1 commented Jun 3, 2019 •

edited

Loading

mrsaicharan1 commented Jun 3, 2019

uds5501 commented Jun 3, 2019

mrsaicharan1 commented Jun 3, 2019

kushthedude commented Jun 3, 2019

kushthedude commented Jun 3, 2019

mrsaicharan1 commented Jun 3, 2019

uds5501 left a comment

kushthedude commented Jun 3, 2019 •

edited

Loading

mrsaicharan1 commented Jun 3, 2019 •

edited

Loading

mrsaicharan1 commented Jun 3, 2019 •

edited

Loading

feat: Made invoice similar to Eventbrite #5952

feat: Made invoice similar to Eventbrite #5952

Conversation

mrsaicharan1 commented May 24, 2019 • edited Loading

Checklist

Short description of what this resolves:

Changes proposed in this pull request:

mrsaicharan1 commented May 24, 2019 • edited Loading

codecov bot commented May 24, 2019 • edited Loading

Codecov Report

uds5501 commented May 25, 2019

mrsaicharan1 commented May 25, 2019 via email

uds5501 left a comment

Choose a reason for hiding this comment

kushthedude left a comment • edited Loading

Choose a reason for hiding this comment

mrsaicharan1 commented Jun 3, 2019 • edited Loading

mrsaicharan1 commented Jun 3, 2019

uds5501 commented Jun 3, 2019

mrsaicharan1 commented Jun 3, 2019

kushthedude commented Jun 3, 2019

kushthedude commented Jun 3, 2019

mrsaicharan1 commented Jun 3, 2019

uds5501 left a comment

Choose a reason for hiding this comment

kushthedude commented Jun 3, 2019 • edited Loading

mrsaicharan1 commented Jun 3, 2019 • edited Loading

mrsaicharan1 commented Jun 3, 2019 • edited Loading

mrsaicharan1 commented May 24, 2019 •

edited

Loading

mrsaicharan1 commented May 24, 2019 •

edited

Loading

codecov bot commented May 24, 2019 •

edited

Loading

kushthedude left a comment •

edited

Loading

mrsaicharan1 commented Jun 3, 2019 •

edited

Loading

kushthedude commented Jun 3, 2019 •

edited

Loading

mrsaicharan1 commented Jun 3, 2019 •

edited

Loading

mrsaicharan1 commented Jun 3, 2019 •

edited

Loading