From 8ae3cf25b81c65783eafa708dbe88df4d30c845d Mon Sep 17 00:00:00 2001
From: Sylvain <bond.never.die@gmail.com>
Date: Thu, 11 Aug 2016 18:30:59 +0200
Subject: [PATCH] fix display success after admin subscribe plan

---
 app/assets/javascripts/controllers/plans.coffee.erb | 13 ++++++-------
 app/assets/templates/plans/index.html.erb           |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/app/assets/javascripts/controllers/plans.coffee.erb b/app/assets/javascripts/controllers/plans.coffee.erb
index 3e3966c79..adc69ee83 100644
--- a/app/assets/javascripts/controllers/plans.coffee.erb
+++ b/app/assets/javascripts/controllers/plans.coffee.erb
@@ -30,7 +30,8 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
       member_id: null
 
     ## already subscribed plan of the current user
-    $scope.paidPlan = null
+    $scope.paid =
+        plan: null
 
     ## plan to subscribe (shopping cart)
     $scope.selectedPlan = null
@@ -52,7 +53,7 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
     ##
     $scope.updateMember = ->
       $scope.selectedPlan = null
-      $scope.paidPlan = null
+      $scope.paid.plan = null
       $scope.group.change = false
       Member.get {id: $scope.ctrl.member.id}, (member) ->
         $scope.ctrl.member = member
@@ -156,7 +157,7 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
       if $scope.currentUser
         if $scope.currentUser.role isnt 'admin'
           $scope.ctrl.member = $scope.currentUser
-          $scope.paidPlan = $scope.currentUser.subscribed_plan
+          $scope.paid.plan = $scope.currentUser.subscribed_plan
           $scope.group.id = $scope.currentUser.group_id
 
       $scope.$on 'devise:new-session', (event, user)->
@@ -246,7 +247,7 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
       .result['finally'](null).then (subscription)->
         $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
         Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
-        $scope.paidPlan = angular.copy($scope.selectedPlan)
+        $scope.paid.plan = angular.copy($scope.selectedPlan)
         $scope.selectedPlan = null
 
 
@@ -325,10 +326,8 @@ Application.Controllers.controller "PlansIndexController", ["$scope", "$rootScop
       .result['finally'](null).then (reservation)->
         $scope.ctrl.member.subscribed_plan = angular.copy($scope.selectedPlan)
         Auth._currentUser.subscribed_plan = angular.copy($scope.selectedPlan)
-        index = $scope.members.indexOf($scope.ctrl.member)
-        $scope.members.splice(index, 1)
         $scope.ctrl.member = null
-        $scope.paidPlan = angular.copy($scope.selectedPlan)
+        $scope.paid.plan = angular.copy($scope.selectedPlan)
         $scope.selectedPlan = null
 
 
diff --git a/app/assets/templates/plans/index.html.erb b/app/assets/templates/plans/index.html.erb
index b9e2ba78d..362fb93a3 100644
--- a/app/assets/templates/plans/index.html.erb
+++ b/app/assets/templates/plans/index.html.erb
@@ -97,7 +97,7 @@
               </div>
               <button class="btn btn-default m-t"
                       ng-click="group.change = !group.change"
-                      ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paidPlan)"
+                      ng-show="(!selectedPlan && ctrl.member && !ctrl.member.subscribed_plan && ctrl.member.subscription) || (!paid.plan)"
                       translate
                       translate-values="{ROLE:currentUser.role}"
                       translate-interpolation="messageformat">{{ 'he_wants_to_change_group' }}</button>
@@ -150,7 +150,7 @@
     </section>
 
 
-    <section class="widget panel b-a m m-t-lg" ng-if="paidPlan">
+    <section class="widget panel b-a m m-t-lg" ng-if="paid.plan">
       <div class="panel-heading b-b">
         <h3 translate>{{ 'summary' }}</h3>
       </div>
@@ -159,8 +159,8 @@
        {{ 'you_ve_just_payed_the_' | translate }} <strong translate>{{ '_subscription' }}</strong> :
 
         <div class="well well-warning m-t-sm">
-          <i class="font-sbold">{{ paidPlan | humanReadablePlanName }}</i>
-          <div class="font-sbold">{{ 'subscription_price' | translate }} {{paidPlan.amount | currency}}</div>
+          <i class="font-sbold">{{ paid.plan | humanReadablePlanName }}</i>
+          <div class="font-sbold">{{ 'subscription_price' | translate }} {{paid.plan.amount | currency}}</div>
         </div>
 
         <div class="alert alert-success">{{ 'thank_you_your_subscription_is_successful' | translate }}<br>