Solve conflict
Extract discounts fields in partials instead of ruby code