Fix postpurchase confirmation code
Reformat postpurchase conversion code
Merge branch 'develop' into feature/post-purchase-content