2 Commits

Author	SHA1	Message	Date
Alys	613f51b08d	use new email template when joining a group plan for customisation of subscription cancellation information (#8637) ... * use new email template when subscription is cancelled from joining a group plan * use new email template when subscription is cancelled from joining a group plan - needs more code, tests * change from sending new email as a cancel-subscription option to sending as a group plan join email Uses a new group-member-join email template instead of old group-member-joining because new template includes mandril conditional merge tags. Also adds tests and comments. Edits some comments for accuracy and typo fixes. * adapt group-member-join email template for manual cancel message for iOS and Android subscriptions * save test user so its profile name can be read by calls to sendTxn * add documentation for the user model cancelSubscription function * add constants for strings passed to mandrill email templates	2017-06-07 10:25:37 -07:00
Keith Holliday	2bbc4f4f4d	Paypal refactor lib (#8420) ... * Abstracted paypal logic from controller. Added intial tests * Added checkout tests * Added checkout success test * Added subscribe test * Added subscribeSuccess tests * Added subscribeCancel tests * Added ipn tests * Fixed broken test * Added integration tests and fixed linting issues * Added errors for paypal checkout success integration test * Removed extra test * Removed pending status from subscribe cancel test * Added more error checking and tests * Fixed lint issues	2017-01-22 09:59:47 -07:00