Fixed recently introduced issue where Payment amount did not include shipping charges because they were added after the Payment was created/updated