(cherry picked from commit 2e2ccc6d)
(cherry picked from commit 1d6be3b4)delivery charge display as decimal