Merge pull request #2393 from nabinhait/fix1

Credit days and payment tool fixes