limit charges on pickup to available charges
Merge pull request #4394, fixes #4391