Fixes  #126 use the capture function inside the payment method instead of event handler
Merge remote-tracking branch 'upstream/develop-2.1.2' into develop-2.1.2