working on discount
Merge branch 'develop' into salon
discount percentage only
Merge branch 'develop' into salon