Re-order how discounts are applied so they use the subtotal plus subtotal tax but not postage