[T2299] add settlement based on payment option

Merged Joel Maglioni requested to merge T2299 into 15.0-stage

Merge request reports