added shipping tax, discount tax, subtotal tax. Changed calculation logic.
Merge branch 'feature/taxes' into feature/freeze
Merge branch 'feature/freeze' into develop