Fixed a bug in the handling of multiple charges to the same customer

This is a break-out pull request from #745, which I am splitting into this pull request (for Stripe) and another pull request (for Balanced).