From 8ea36b8a89c2a1df098009a59240f62ace3d0d8f Mon Sep 17 00:00:00 2001
From: Sylvain <sylvain@sbx.pm>
Date: Tue, 12 May 2020 15:16:26 +0200
Subject: [PATCH] [bug] the subscription page is not available

---
 CHANGELOG.md                                    | 2 ++
 app/assets/javascripts/controllers/plans.js.erb | 2 +-
 app/assets/templates/plans/index.html.erb       | 4 ++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ddf9845a..d3dbd7c67 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,7 @@
 # Changelog Fab-manager
 
+- Fix a bug: the subscription page is not available
+
 ## v4.4.0 2020 May 12
 
 - Manager: a new role between the member and the administrator
diff --git a/app/assets/javascripts/controllers/plans.js.erb b/app/assets/javascripts/controllers/plans.js.erb
index c19adf5fd..7f4fa4386 100644
--- a/app/assets/javascripts/controllers/plans.js.erb
+++ b/app/assets/javascripts/controllers/plans.js.erb
@@ -183,7 +183,7 @@ Application.Controllers.controller('PlansIndexController', ['$scope', '$rootScop
         for (let plan of plansPromise) {
           if (plan.group_id === group.id) {
             groupObj.plans.push(plan);
-            if (!plan.disabled) { groupplansClassifiedByGroupObj.actives++; }
+            if (!plan.disabled) { groupObj.actives++; }
           }
         }
         $scope.plansClassifiedByGroup.push(groupObj);
diff --git a/app/assets/templates/plans/index.html.erb b/app/assets/templates/plans/index.html.erb
index c6ba67b36..f92f4500c 100644
--- a/app/assets/templates/plans/index.html.erb
+++ b/app/assets/templates/plans/index.html.erb
@@ -41,7 +41,7 @@
                 </div>
               </div>
 
-              <div class="cta-button" ng-if="!ctrl.member || ctrl.member.role == 'member' || (ctrl.member.role == 'manager' && ctrl.member.id === currentUser.id)">
+              <div class="cta-button" ng-if="isAuthorized('member') || (isAuthorized('manager') && ctrl.member.id === currentUser.id)">
                 <button class="btn btn-default rounded" ng-click="selectPlan(plan)" ng-if="ctrl.member.subscribed_plan.id != plan.id" ng-disabled="ctrl.member.subscribed_plan" ng-class="{ 'bg-yellow': selectedPlan==plan }">
                   <span ng-if="ctrl.member" translate>{{ 'app.public.plans.i_choose_that_plan' }}</span>
                   <span ng-if="!ctrl.member" translate>{{ 'app.public.plans.i_subscribe_online' }}</span>
@@ -53,7 +53,7 @@
 
               </div>
 
-              <div class="cta-button" ng-if="isAuthorized('admin') || (ctrl.member.role == 'manager' && ctrl.member.id != currentUser.id)">
+              <div class="cta-button" ng-if="isAuthorized('admin') || (isAuthorized('manager') && ctrl.member.id != currentUser.id)">
                 <button class="btn btn-default rounded" ng-click="selectPlan(plan)" ng-class="{ 'bg-yellow': selectedPlan==plan }" ng-disabled="!ctrl.member">
                   <span translate>{{ 'app.public.plans.i_choose_that_plan' }}</span>
                 </button>