Include voucher tax adjustment in revenues by hub report

[bmd08a1]

What? Why?

• Closes [Vouchers] [Reports] Include vouchers in report: Revenues by Hub #11774

• Include voucher tax adjustments on Revenues by hub report
• Solution proposed:
  • Build tax data of grouped orders (by distributor id):
  • orders.total_included_tax: orders.sum(&:total)
  • orders.total_tax: orders.sum(&:total_tax) + orders.voucher_tax_adjustments
  • orders.total_excluded_tax: orders.total_included_tax - orders.total_tax

What should we test?

• Set up an enterprise with vouchers and taxes.
• Place three orders (without tax, with tax incl. in price and with added tax)
• Run the report.
• Check the numbers (compare to order details and adjustments in back office).

Release notes

Changelog Category (reviewers may add a label for the release notes):

• User facing changes
• API changes (V0, V1, DFC or Webhook)
• Technical changes only
• Feature toggled

The title of the pull request will be included in the release notes.

Dependencies

Documentation updates

[mkllnk]

Thank you for working on this. Can you improve the spec setup?

[rioug]

Thanks for looking at this ! Vouchers can be a bit tricky to understand let us know if you need some help.

[rioug]

It should be included_in_price: false to get tax excluded from price. In this case it's not affecting the result as you are mocking VoucherAdjustmentsService

[rioug]

Just one last thing, see my comment.
Also. we prefer to rebase the branch on master instead of merging.

Thanks !

[rioug]

You need to add order.update_totals_and_states after VoucherAdjustmentsService.new(order).update otherwise the various order total won't take into account the voucher adjustment you just updated.

[bmd08a1]

thanks, I updated the specs as you suggested

[drummer83]

Hi @bmd08a1,
Thank you for this important fix! 💪

I did some testing and here are the results.

Each order had a value of 10 $, tax (if applied) was 10 %, fees (if applied) were 10 %, voucher (always applied) was 10 %.

I placed three orders before staging your PR:

• without tax,
• with added tax,
• with included tax.

After staging the PR I placed some orders again:

• same three orders as before,
• additional orders to check shipping fees and enterprise fees.

Results

No tax

Before:

After:

Tax excluded

Before:

After:

Tax included

Before:

After:

Total of all three orders

Before:

After:

With 1 $ shipping fee (no tax)

After - No tax:

After - Tax excl.:

After - Tax incl.:

Additional enterprise fee of 10 % (tax applies)

After - Tax excl.:

Summary

Excellent work! 💪 I couldn't find any issues with this. There are more complex scenarios for sure, but I tried to cover it systematically.

This one is ready for merging! 🎉 🚀
Thanks again!!!