fix for shipping and discount with tax