Improve when fees and amount are set on order payment