From fb780c9a2daa71545526537d990028813c351d5e Mon Sep 17 00:00:00 2001
From: SabreCat <sabe@habitica.com>
Date: Tue, 13 Sep 2022 15:52:03 -0500
Subject: [PATCH] fix(admin): reactivity with subscriptions

---
 .../user-support/subscriptionAndPerks.vue     | 27 ++++---------------
 website/server/controllers/api-v3/hall.js     |  3 +++
 2 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
index ae0f5a59aa..50c3c1b135 100644
--- a/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
+++ b/website/client/src/components/admin-panel/user-support/subscriptionAndPerks.vue
@@ -8,7 +8,7 @@
       Subscription, Monthly Perks
     </h3>
     <div v-if="expand">
-      <form @submit.prevent="saveSubscriptionData()">
+      <form @submit.prevent="saveHero({ hero, msg: 'Subscription Perks' })">
         <div v-if="hero.purchased.plan.paymentMethod">
           Payment method:
           <strong>{{ hero.purchased.plan.paymentMethod }}</strong>
@@ -34,7 +34,7 @@
           <label>
             Consecutive months:
             <input
-              v-model="consecutiveMonths"
+              v-model="hero.purchased.plan.consecutive.count"
               class="form-control"
               type="number"
               min="0"
@@ -115,7 +115,6 @@
 </template>
 
 <script>
-import clone from 'lodash/clone';
 import moment from 'moment';
 import saveHero from '../mixins/saveHero';
 import { getPlanContext } from '@/../../common/script/cron';
@@ -130,43 +129,27 @@ export default {
   },
   data () {
     return {
-      consecutiveMonths: 0,
       expand: false,
     };
   },
   computed: {
     nextHourglassDate () {
-      const pendingHero = clone(this.hero);
-      pendingHero.purchased.plan.consecutive.count = this.consecutiveMonths;
-      const currentPlanContext = getPlanContext(pendingHero, new Date());
+      const currentPlanContext = getPlanContext(this.hero, new Date());
 
       return currentPlanContext.nextHourglassDate.format('MMMM');
     },
   },
   watch: {
-    consecutiveMonths () {
+    'hero.purchased.plan.consecutive.count' () { // eslint-disable-line object-shorthand
       this.hero.purchased.plan.consecutive.gemCapExtra = Math.min(
-        Math.floor(this.consecutiveMonths / 3) * 5, 25,
+        Math.floor(this.hero.purchased.plan.consecutive.count / 3) * 5, 25,
       );
-      if (this.hero.purchased.plan.gemsBought
-        > this.hero.purchased.plan.consecutive.gemCapExtra + 25) {
-        this.hero.purchased.plan.gemsBought = this.hero.purchased.plan.consecutive.gemCapExtra + 25;
-      }
     },
   },
-  mounted () {
-    this.consecutiveMonths = clone(this.hero.purchased.plan.consecutive.count);
-  },
   methods: {
     dateFormat (date) {
       return moment(date).format('YYYY/MM/DD');
     },
-    saveSubscriptionData () {
-      if (this.consecutiveMonths !== this.hero.purchased.plan.consecutive.count) {
-        this.hero.purchased.plan.consecutive.count = this.consecutiveMonths;
-      }
-      this.saveHero({ hero: this.hero, msg: 'Subscription Perks' });
-    },
   },
 };
 </script>
diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
index 15183c686f..456c62a396 100644
--- a/website/server/controllers/api-v3/hall.js
+++ b/website/server/controllers/api-v3/hall.js
@@ -289,6 +289,9 @@ api.updateHero = {
         if (updateData.purchased.plan.consecutive.gemCapExtra) {
           hero.purchased.plan.consecutive.gemCapExtra = updateData.purchased.plan.consecutive.gemCapExtra; // eslint-disable-line max-len
         }
+        if (updateData.purchased.plan.consecutive.count) {
+          hero.purchased.plan.consecutive.count = updateData.purchased.plan.consecutive.count; // eslint-disable-line max-len
+        }
       }
     }