fix setting group plan

HabitRPG · Dec 2, 2024 · 4d4ae79 · 4d4ae79
1 parent 837e531
commit 4d4ae79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 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
@@ -445,7 +445,7 @@ export default {
     },
     beginGroupPlanConvert () {
       this.isConvertingToGroupPlan = true;
-      this.purchased.plan.owner = '';
+      this.hero.purchased.plan.owner = '';
     },
     saveClicked (e) {
       e.preventDefault();
@@ -454,7 +454,7 @@ export default {
           alert('Invalid group ID');
           return;
         }
-        this.hero.purchased.plan.convertToGroup = this.groupPlanID;
+        this.hero.purchased.plan.convertToGroupPlan = this.groupPlanID;
         this.saveHero({ hero: this.hero, msg: 'Group Plan Subscription' });
       } else {
         this.saveHero({ hero: this.hero, msg: 'Subscription Perks' });

diff --git a/website/server/controllers/api-v3/hall.js b/website/server/controllers/api-v3/hall.js
@@ -7,6 +7,7 @@ import { model as Group } from '../../models/group';
 import common from '../../../common';
 import {
   NotFound,
+  BadRequest,
 } from '../../libs/errors';
 import { apiError } from '../../libs/apiError';
 import {
@@ -333,13 +334,15 @@ api.updateHero = {
 
       if (plan.convertToGroupPlan) {
         const groupID = plan.convertToGroupPlan;
-        const group = await Group.getGroup({ hero, groupId: groupID });
+        const group = await Group.getGroup({ user: hero, groupId: groupID });
         if (!group) throw new NotFound(res.t('groupNotFound'));
-        hero.purchased.plan.customerId = null;
-        hero.purchased.plan.paymentMethod = null;
         if (group.hasNotCancelled()) {
+          hero.purchased.plan.customerId = null;
+          hero.purchased.plan.paymentMethod = null;
           await addSubToGroupUser(hero, group);
           await group.updateGroupPlan();
+        } else {
+          throw new BadRequest('Group does not have a plan');
         }
       }
     }