Add payment and invoice variables

This way we can chain saveEverything properly. This might have problems
now because emails are being sent saying "Authorization failed, or the
invoice is not yet created. $invoice->canCapture()=false." when try to
capture...