Fix Shipping discount with percentage

Shipping discount with percentage must be calculated after shipping selection.
Merge pull request #1051 from ramol/master

Fix Shipping discount with percentage