Updated the following files to fix the Promotions issue and payment issue.