mirror of
https://github.com/sudoxnym/habitica.git
synced 2026-08-03 08:21:07 +00:00
feat(plans): cleanup plans' perks page, rename Time Trinket => Mystic Hourglass
This commit is contained in:
Tyler Renelle
parent
0fffd66588
commit
8c5842eb52
2 changed files with 54 additions and 42 deletions
|
|
@ -29,17 +29,21 @@ script(type='text/ng-template', id='partials/options.inventory.timetravelers.htm
|
|||
.arrow
|
||||
h3.popover-title Tyler and Vicky
|
||||
.popover-content
|
||||
p You'll need a Time Trinket to summon the mysterious Time Travelers! <a href='https://habitrpg.com/#/options/settings/subscription' target='_blank'>Subscribers</a> earn one Time Trinket for every three months of consecutive subscribing. Come back when you have a Time Trinket, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.
|
||||
p You'll need a Mystic Hourglass to summon the mysterious Time Travelers! <a href='https://habitrpg.com/#/options/settings/subscription' target='_blank'>Subscribers</a> earn one Mystic Hourglass for every three months of consecutive subscribing. Come back when you have a Mystic Hourglass, and the Time Travelers will fetch you a Subscriber Item Set from the past.... or maybe even the future.
|
||||
|
||||
.row.stable(ng-if='user.purchased.plan.consecutive.trinkets > 0')
|
||||
.col-md-2
|
||||
.npc_timetravelers
|
||||
.npc_timetravelers_active
|
||||
.col-md-10
|
||||
.popover.static-popover.fade.right.in
|
||||
.arrow
|
||||
h3.popover-title Mysterious Time Travelers
|
||||
.popover-content
|
||||
p We see you have a Time Trinket, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets <a href='http://habitrpg.wikia.com/wiki/Mystery_Item' target='_blank'>here</a>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?
|
||||
.pull-right
|
||||
span.inventory_special_trinket.inline-gems
|
||||
b x{{user.purchased.plan.consecutive.trinkets}}
|
||||
p We see you have a Mystic Hourglass, so we will happily travel back in time for you! Please choose the Mystery Item Set you would like. You can see a list of the past item sets <a href='http://habitrpg.wikia.com/wiki/Mystery_Item' target='_blank'>here</a>! If those don't satisfy you, perhaps you'd be interested in one of our fashionably futuristic Steampunk Item Sets?
|
||||
|
||||
.col-md-12
|
||||
li.customize-menu.inventory-gear
|
||||
menu.pets-menu(label='{{::set.text}}', ng-repeat='set in Content.timeTravelerStore(user.items.gear.owned)')
|
||||
|
|
@ -105,6 +109,10 @@ script(type='text/ng-template', id='partials/options.inventory.drops.html')
|
|||
button.customize-option(popover=env.t('subscriberItemText'), popover-trigger='mouseenter', popover-placement='right', class='inventory_present', ng-click="user.ops.openMysteryItem({})")
|
||||
.badge.badge-info.stack-count {{user.purchased.plan.mysteryItems.length}}
|
||||
|
||||
div(ng-if='user.purchased.plan.consecutive.trinkets')
|
||||
button.customize-option(popover="Mystic Hourglass allow you to purchase previous months' subscriber sets.", popover-trigger='mouseenter', popover-placement='right', class='inventory_special_trinket', ng-click="$state.go('options.inventory.timetravelers')")
|
||||
.badge.badge-info.stack-count {{user.purchased.plan.consecutive.trinkets}}
|
||||
|
||||
.col-md-6
|
||||
h2=env.t('market')
|
||||
.row-fluid
|
||||
|
|
|
|||
|
|
@ -192,14 +192,15 @@ script(id='partials/options.settings.export.html', type="text/ng-template")
|
|||
a(href="/export/userdata.xml")= ' ' + env.t('xml') + ' '
|
||||
a(href="/export/userdata.json")= env.t('json')
|
||||
|
||||
script(id='partials/options.settings.subscription.perks.html',type='text/ng-template')
|
||||
mixin subPerks()
|
||||
table.table.table-striped
|
||||
tr
|
||||
td
|
||||
span.hint(popover=env.t('disableAdsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('disableAds')
|
||||
tr
|
||||
td
|
||||
span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right')=env.t('buyGemsGold')
|
||||
span.hint(popover=env.t('buyGemsGoldText', {gemCost: "{{Shared.planGemLimits.convRate}}", gemLimit: "{{Shared.planGemLimits.convCap}}"}),popover-trigger='mouseenter',popover-placement='right') #{env.t('buyGemsGold')}
|
||||
span.badge.badge-success(ng-show='_subscription.months>1') Cap raised to {{ [25 + p.consecutive.gemCapExtra + Math.floor(_subscription.months/3*5), 50] | min }}
|
||||
tr
|
||||
td
|
||||
span.hint(popover=env.t('retainHistoryText'),popover-trigger='mouseenter',popover-placement='right')=env.t('retainHistory')
|
||||
|
|
@ -208,13 +209,13 @@ script(id='partials/options.settings.subscription.perks.html',type='text/ng-temp
|
|||
span.hint(popover=env.t('doubleDropsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('doubleDrops')
|
||||
tr
|
||||
td
|
||||
span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right')=env.t('mysteryItem')
|
||||
span.hint(popover=env.t('mysteryItemText'),popover-trigger='mouseenter',popover-placement='right') #{env.t('mysteryItem')}
|
||||
div(ng-show='_subscription.months>1')
|
||||
.badge.badge-success +{{Math.floor(_subscription.months/3)}} Mystic Hourglass
|
||||
.small.muted Mystic Hourglasses allow purchasing a previous month's Mystery Item set.
|
||||
tr
|
||||
td
|
||||
span.hint(popover=env.t('supportDevsText'),popover-trigger='mouseenter',popover-placement='right')=env.t('supportDevs')
|
||||
tr
|
||||
td.alert.alert-info $5
|
||||
=env.t('monthUSD')
|
||||
|
||||
script(id='partials/feature-matrix-check.html',type='text/ng-template')
|
||||
span.task-checker.action-yesno
|
||||
|
|
@ -222,38 +223,41 @@ script(id='partials/feature-matrix-check.html',type='text/ng-template')
|
|||
label
|
||||
|
||||
script(id='partials/options.settings.subscription.html',type='text/ng-template')
|
||||
.well(ng-init="p = user.purchased.plan")
|
||||
div(ng-if='p.customerId')
|
||||
p.alert.alert-warning(ng-if='p.dateTerminated')
|
||||
i.glyphicon.glyphicon-time
|
||||
| #{env.t('subCanceled')} <strong>{{moment(p.dateTerminated).format('MM/DD/YYYY')}}</strong>
|
||||
p.alert.alert-success(ng-if='!p.dateTerminated')=env.t('subscribed')
|
||||
p.alert.alert-success(ng-if='p.extraMonths')
|
||||
span.glyphicon.glyphicon-credit-card
|
||||
| You have {{p.extraMonths | number:2}} months of subscription credit.
|
||||
ul.alert.alert-success.list-unstyled(ng-if='p.consecutive.count || p.consecutive.offset')
|
||||
li: h4
|
||||
span.glyphicon.glyphicon-forward
|
||||
| Consecutive Subscription
|
||||
li You've been subscribed for {{p.consecutive.count}} consecutive months, plus {{p.consecutive.offset}} extra (gift / block-subscription).
|
||||
li Gem Cap Extra: {{p.consecutive.gemCapExtra}}
|
||||
li Time Trinkets: {{p.consecutive.trinkets}}
|
||||
//-h2=env.t('individualSub')
|
||||
.container-fluid(ng-init='_subscription={months:1}')
|
||||
.row
|
||||
.col-md-6
|
||||
h3 Benefits
|
||||
+subPerks()
|
||||
|
||||
h2=env.t('individualSub')
|
||||
div(ng-include="'partials/options.settings.subscription.perks.html'")
|
||||
.col-md-6
|
||||
div(ng-init="p = user.purchased.plan")
|
||||
table.table.alert.alert-info(ng-if='p.customerId')
|
||||
tr(ng-if='p.dateTerminated'): td.alert.alert-warning
|
||||
i.glyphicon.glyphicon-time
|
||||
| #{env.t('subCanceled')} <strong>{{moment(p.dateTerminated).format('MM/DD/YYYY')}}</strong>
|
||||
tr(ng-if='!p.dateTerminated'): td: h4=env.t('subscribed')
|
||||
tr(ng-if='p.extraMonths'): td
|
||||
span.glyphicon.glyphicon-credit-card
|
||||
| You have {{p.extraMonths | number:2}} months of subscription credit.
|
||||
tr(ng-if='p.consecutive.count || p.consecutive.offset'): td
|
||||
span.glyphicon.glyphicon-forward
|
||||
| Consecutive Subscription
|
||||
ul.list-unstyled
|
||||
li You've been subscribed for {{p.consecutive.count}} consecutive months, plus {{p.consecutive.offset}} extra (gift / block-subscription).
|
||||
li Gem Cap Extra: {{p.consecutive.gemCapExtra}}
|
||||
li Mystic Hourglasses: {{p.consecutive.trinkets}}
|
||||
div(ng-if='!p.customerId || (p.customerId && p.dateTerminated)')
|
||||
.form-group
|
||||
each block in env.Content.subscriptionBlocks
|
||||
.radio
|
||||
label
|
||||
input(type="radio", name="subRadio", value="#{block.months}", ng-model='_subscription.months')
|
||||
| #{block.months} Month(s) Recurring: $#{block.price} #{env.t('monthUSD')}
|
||||
|
||||
div(ng-if='!p.customerId || (p.customerId && p.dateTerminated)')
|
||||
|
||||
.form-group
|
||||
each block in env.Content.subscriptionBlocks
|
||||
.radio
|
||||
label
|
||||
input(type="radio", name="subRadio", value="#{block.months}", ng-model='subscription')
|
||||
| #{block.months} Month(s) Recurring: $#{block.price}
|
||||
|
||||
h3(ng-if='(p.customerId && p.dateTerminated)') Resubscribe
|
||||
a.btn.btn-primary(ng-click='showStripe({subscription:subscription})') Card
|
||||
a.btn.btn-warning(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{subscription}}') PayPal
|
||||
div(ng-if='p.customerId')
|
||||
.btn.btn-primary(ng-if='!p.dateTerminated && p.paymentMethod=="Stripe"', ng-click='showStripeEdit()') Update Card
|
||||
.btn.btn-sm.btn-danger(ng-if='!p.dateTerminated', ng-click='cancelSubscription()')=env.t('cancelSub')
|
||||
h3(ng-if='(p.customerId && p.dateTerminated)') Resubscribe
|
||||
button.btn.btn-primary(ng-click='showStripe({subscription:_subscription.months})', ng-disabled='!_subscription.months') Card
|
||||
button.btn.btn-warning(href='/paypal/subscribe?_id={{user._id}}&apiToken={{user.apiToken}}&sub={{_subscription.months}}', ng-disabled='!_subscription.months') PayPal
|
||||
div(ng-if='p.customerId')
|
||||
.btn.btn-primary(ng-if='!p.dateTerminated && p.paymentMethod=="Stripe"', ng-click='showStripeEdit()') Update Card
|
||||
.btn.btn-sm.btn-danger(ng-if='!p.dateTerminated', ng-click='cancelSubscription()')=env.t('cancelSub')
|
||||
Loading…
Reference in a new issue