Refactor purchase form to move discount field above the payment method. #1318