From aaa902cca9326412e0c95f81fb9bc26479ce025c Mon Sep 17 00:00:00 2001 From: Henry Oswald Date: Mon, 1 Jun 2015 14:38:09 +0100 Subject: [PATCH] fixed bug with subscriptions where if an old user had a subscription and was in a group they would get a confusing page --- .../web/app/views/subscriptions/dashboard.jade | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/services/web/app/views/subscriptions/dashboard.jade b/services/web/app/views/subscriptions/dashboard.jade index 5b85b1324b..c755a5c781 100644 --- a/services/web/app/views/subscriptions/dashboard.jade +++ b/services/web/app/views/subscriptions/dashboard.jade @@ -15,8 +15,7 @@ mixin printPlan(plan) tr(ng-controller="ChangePlanFormController") td(ng-init="plan=#{JSON.stringify(plan)}") strong #{plan.name} - td - {{refreshPrice(plan.planCode)}} + td {{refreshPrice(plan.planCode)}} -if (plan.annual) | {{prices[plan.planCode]}} / #{translate("year")} -else @@ -44,7 +43,10 @@ block content .card .page-header h1 #{translate("your_subscription")} - -if (subscription) + -if (groups.length != 0) + each groupSubscription in groups + p !{translate("member_of_group_subscription", {admin_email: "" + groupSubscription.admin_id.email + ""})} + - else if (subscription) case subscription.state when "free-trial" p !{translate("on_free_trial_expiring_at", {expiresAt:"" + subscription.expiresAt + ""})} @@ -102,11 +104,7 @@ block content mixin printPlans(plans.individualMonthlyPlans) mixin printPlans(plans.individualAnnualPlans) - -if (subscription && groups.length > 0) - hr - - each groupSubscription in groups - p !{translate("member_of_group_subscription", {admin_email: "" + groupSubscription.admin_id.email + ""})} + script(type="text/javascript"). $('#cancelSubscription').on("click", function() {