apply product tax
Merge branch 'develop' into salon