fix conflicts
cherry pick fixed price discount codes type from 0.3.1-fr branch
remove discount fields from variants and finalize 0.3.1-fr cherry-picking conflicts resolution