use discounts in total price calculation for orders
Merge branch 'master' of github.com:glysellin/glysellin