Feature/taxes before discounts

Finished #511