not include fixed type tax to option
Merge branch 'master' of https://github.com/fanha99/opencart