Fix Shipping discount with percentage

Shipping discount with percentage must be calculated after shipping selection.