From febf3f00242d8957f098bf03d5cd5761a0eec81b Mon Sep 17 00:00:00 2001 From: mleah Date: Tue, 17 Jan 2017 16:48:21 -0500 Subject: [PATCH] Adding "How to gift subscription" copy to Settings > Subscription Page: Fixes Issue 8341 (#8386) * Issue 8341 updating subscriber json and subscription settings page with gifting a subscription directions * Issue-8341 updating the layout of the settings - subscription page * Issue-8341 removing extra comma from gift subscription copy * Issue-8341 removing extra spans in subscription jade file --- website/common/locales/en/subscriber.json | 5 +++ .../views/options/settings/subscription.jade | 32 ++++++++++++------- 2 files changed, 25 insertions(+), 12 deletions(-) diff --git a/website/common/locales/en/subscriber.json b/website/common/locales/en/subscriber.json index a54577d483..3ebf1481b3 100644 --- a/website/common/locales/en/subscriber.json +++ b/website/common/locales/en/subscriber.json @@ -14,6 +14,11 @@ "mysteryItemText": "Each month you will receive a unique cosmetic item for your avatar! Plus, for every three months of consecutive subscription, the Mysterious Time Travelers will grant you access to historic (and futuristic!) cosmetic items.", "supportDevs": "Supports the developers", "supportDevsText": "Your subscription helps keep Habitica thriving and helps fund the development of new features. Thank you for your generosity!", + "giftSubscription": "Want to gift a subscription to someone?", + "giftSubscriptionText1": "Open their profile! You can do this by clicking on their avatar in your party header or by clicking on their name in chat.", + "giftSubscriptionText2": "Click on the gift icon in the bottom left of their profile.", + "giftSubscriptionText3": "Select \"subscription\" and enter your payment information.", + "giftSubscriptionText4": "Thanks for supporting Habitica!", "monthUSD": "USD / Month", "organization": "Organization", "groupPlans": "Corporate Plans", diff --git a/website/views/options/settings/subscription.jade b/website/views/options/settings/subscription.jade index e8903da0c1..65259a4082 100644 --- a/website/views/options/settings/subscription.jade +++ b/website/views/options/settings/subscription.jade @@ -1,7 +1,6 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template', ng-init="groupPane = 'subscription'") //-h2=env.t('individualSub') //- +groupSubscription - .container-fluid(ng-init='_subscription={key:"basic_earned"}') h3= env.t('benefits') .row @@ -50,14 +49,23 @@ script(id='partials/options.settings.subscription.html',type='text/ng-template', .btn.btn-primary(ng-if='!user.purchased.plan.dateTerminated && user.purchased.plan.paymentMethod=="Stripe"', ng-click='Payments.showStripeEdit()')=env.t('subUpdateCard') .btn.btn-sm.btn-danger(ng-if='!user.purchased.plan.dateTerminated', ng-click='Payments.cancelSubscription()')=env.t('cancelSub') - .container-fluid.slight-vertical-padding(ng-if='!user.purchased.plan.customerId || (user.purchased.plan.customerId && user.purchased.plan.dateTerminated)') - small.muted=env.t('subscribeUsing') - .row.text-center - .col-xs-4 - a.purchase.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card') - .col-xs-4 - a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{User.settings.auth.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') - img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt=env.t('paypal')) - .col-xs-4 - a.purchase(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})") - img(src='https://payments.amazon.com/gp/cba/button',alt=env.t('amazonPayments')) + .container-fluid.slight-vertical-padding(ng-if='!user.purchased.plan.customerId || (user.purchased.plan.customerId && user.purchased.plan.dateTerminated)') + small.muted=env.t('subscribeUsing') + .row.text-center + .col-xs-4 + a.purchase.btn.btn-primary(ng-click='Payments.showStripe({subscription:_subscription.key, coupon:_subscription.coupon})', ng-disabled='!_subscription.key')= env.t('card') + .col-xs-4 + a.purchase(href='/paypal/subscribe?_id={{user._id}}&apiToken={{User.settings.auth.apiToken}}&sub={{_subscription.key}}{{_subscription.coupon ? "&coupon="+_subscription.coupon : ""}}', ng-disabled='!_subscription.key') + img(src='https://www.paypalobjects.com/webstatic/en_US/i/buttons/pp-acceptance-small.png',alt=env.t('paypal')) + .col-xs-4 + a.purchase(ng-click="Payments.amazonPayments.init({type: 'subscription', subscription:_subscription.key, coupon:_subscription.coupon})") + img(src='https://payments.amazon.com/gp/cba/button',alt=env.t('amazonPayments')) + + h3= env.t('giftSubscription') + .row + .col-lg-12 + ol + li= env.t('giftSubscriptionText1') + li= env.t('giftSubscriptionText2') + li= env.t('giftSubscriptionText3') + h4= env.t('giftSubscriptionText4')