discount without tax
discount without tax
small change for pay option
Merge branch 'develop' into salon