Fix distance tax rate and amount not updating offline and inaccurate tax amount and refactor code

Fix distance tax rate and amount not updating offline and inaccurate tax amount and refactor code #105845