#134: Credit card errors

I also included a couple of miscellaneous fixes in this pull request which I happened to be working on at the same time.
a potential issue with the !DEV_BOX check here is that we won't be able to test this functionality on a dev box, which is something I did with both the staging server and locally for 8.5